commit bb6723f9fa8b038dea8bf1ecdb0d698b25bda5e9
author Ian Rogers <irogers@google.com> Fri Sep 21 09:49:06 2012 -0700
committer Ian Rogers <irogers@google.com> Fri Sep 21 09:49:06 2012 -0700
tree e14450036a02fe2a09cca4f9f67a96b826c17310
parent 30bce5a262c0d74a1a9fbc8fedc287312b21e35d

Dump native pcs rather than offsets, fix mac build.

Dump the native PC associated with live vregs rather than the offset
into the code.

Change-Id: I093e35d580774bca894472f9e8a218f76b7473ce

src/oatdump.cc

diff --git a/src/oatdump.cc b/src/oatdump.cc
index ee85782..d3bebfd 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -310,7 +310,7 @@
              oat_method.GetFpSpillMask());
     os << StringPrintf("\t\tgc_map: %p (offset=0x%08x)\n",
                        oat_method.GetNativeGcMap(), oat_method.GetNativeGcMapOffset());
-    DumpGcMap(os, oat_method.GetNativeGcMap());
+    DumpGcMap(os, oat_method.GetCode(), oat_method.GetNativeGcMap());
     os << StringPrintf("\t\tCODE: %p (offset=0x%08x size=%d)%s\n",
                        oat_method.GetCode(),
                        oat_method.GetCodeOffset(),
@@ -388,13 +388,15 @@
     os << "\n";
   }
 
-  void DumpGcMap(std::ostream& os, const uint8_t* gc_map_raw) {
+  void DumpGcMap(std::ostream& os, const void* code, const uint8_t* gc_map_raw) {
     if (gc_map_raw == NULL) {
       return;
     }
     NativePcOffsetToReferenceMap map(gc_map_raw);
     for (size_t entry = 0; entry < map.NumEntries(); entry++) {
-      os << StringPrintf("\t\t\t0x%04x", map.GetNativePcOffset(entry));
+      const uint8_t* native_pc = reinterpret_cast<const uint8_t*>(code) +
+                                 map.GetNativePcOffset(entry);
+      os << StringPrintf("\t\t\t%p", native_pc);
       size_t num_regs = map.RegWidth() * 8;
       const uint8_t* reg_bitmap = map.GetBitMap(entry);
       bool first = true;