commit 4b8c13ee44c4c959d7b8de9adff7ce6df48c31d0
author Brian Carlstrom <bdc@google.com> Fri Aug 23 18:10:32 2013 -0700
committer Brian Carlstrom <bdc@google.com> Fri Aug 23 18:10:32 2013 -0700
tree b7638f8ac891fc09cbe7dd8a98b8af24ddd7acfa
parent a7e885013753df3f07bf038a8c4a187fb97c78e1

Fix sort order to make register promotion stable

Also some minor oatdump fixes

Change-Id: I5679835bf684b98d130b77ecf00bda5f6547d383

oatdump/oatdump.cc

diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index 8bc7877..0227381 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -506,7 +506,7 @@
       typedef MappingTable::PcToDexIterator It;
       for (It cur = table.PcToDexBegin(), end = table.PcToDexEnd(); cur != end; ++cur) {
         if (offset == cur.NativePcOffset()) {
-          os << "suspend point dex PC: 0x" << cur.DexPc() << "\n";
+          os << StringPrintf("suspend point dex PC: 0x%04x\n", cur.DexPc());
           return cur.DexPc();
         }
       }
@@ -514,7 +514,7 @@
       typedef MappingTable::DexToPcIterator It;
       for (It cur = table.DexToPcBegin(), end = table.DexToPcEnd(); cur != end; ++cur) {
         if (offset == cur.NativePcOffset()) {
-          os << "catch entry dex PC: 0x" << cur.DexPc() << "\n";
+          os << StringPrintf("catch entry dex PC: 0x%04x\n", cur.DexPc());
           return cur.DexPc();
         }
       }
@@ -917,10 +917,10 @@
       os << StringPrintf("%p: java.lang.Class \"%s\" (", obj, PrettyDescriptor(klass).c_str())
          << klass->GetStatus() << ")\n";
     } else if (obj->IsArtField()) {
-      os << StringPrintf("%p: java.lang.reflect.Field %s\n", obj,
+      os << StringPrintf("%p: java.lang.reflect.ArtField %s\n", obj,
                          PrettyField(obj->AsArtField()).c_str());
     } else if (obj->IsArtMethod()) {
-      os << StringPrintf("%p: java.lang.reflect.Method %s\n", obj,
+      os << StringPrintf("%p: java.lang.reflect.ArtMethod %s\n", obj,
                          PrettyMethod(obj->AsArtMethod()).c_str());
     } else if (obj_class->IsStringClass()) {
       os << StringPrintf("%p: java.lang.String %s\n", obj,