Mercurial > hg > truffle
changeset 1475:ace6e55373eb
Sync with CRI/C1X changes.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Sun, 05 Dec 2010 22:01:07 +0100 |
parents | f5908cceac7d |
children | 2a6ce81e3101 |
files | c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRuntime.java |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRuntime.java Fri Dec 03 18:00:07 2010 +0100 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRuntime.java Sun Dec 05 22:01:07 2010 +0100 @@ -56,14 +56,14 @@ } @Override - public String disassemble(byte[] code) { - return disassemble(code, new DisassemblyPrinter(false)); + public String disassemble(byte[] code, long address) { + return disassemble(code, new DisassemblyPrinter(false), address); } - private String disassemble(byte[] code, DisassemblyPrinter disassemblyPrinter) { + private String disassemble(byte[] code, DisassemblyPrinter disassemblyPrinter, long address) { final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); final ISA instructionSet = ISA.AMD64; - Disassembler.disassemble(byteArrayOutputStream, code, instructionSet, WordWidth.BITS_64, 0, null, disassemblyPrinter); + Disassembler.disassemble(byteArrayOutputStream, code, instructionSet, WordWidth.BITS_64, address, null, disassemblyPrinter); return byteArrayOutputStream.toString(); } @@ -120,7 +120,7 @@ } }; final byte[] code = Arrays.copyOf(targetMethod.targetCode(), targetMethod.targetCodeSize()); - return disassemble(code, disassemblyPrinter); + return disassemble(code, disassemblyPrinter, 0L); } @Override