# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1291582867 -3600
# Node ID ace6e55373eb2ea735b905c91329e44df1882a08
# Parent  f5908cceac7da4ebefcce58145007cf8f9f58851
Sync with CRI/C1X changes.

diff -r f5908cceac7d -r ace6e55373eb c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRuntime.java
--- 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