commit 0dd7ddaa36a2cf37490dc166ebc21818364130a7
author Brian Carlstrom <bdc@google.com> Tue Oct 25 15:47:53 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Oct 25 20:28:07 2011 -0700
tree e381ae0cc965d2135ad99f07826333ccd03dfe90
parent ed6d78ed93c9b5b1988af6ca502a7e2eee0f2aaf

Several fixes for proper creation and use of vmap tables

Change-Id: I7696115af4263df18ede0777ae14de7a3a7ada3b

src/oatdump.cc

diff --git a/src/oatdump.cc b/src/oatdump.cc
index 02aecfc..61f352e 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -84,10 +84,10 @@
     os << StringPrintf("%08x\n\n", oat_header.GetExecutableOffset());
 
     os << "BASE:\n";
-    os << oat_file.GetBase() << "\n\n";
+    os << reinterpret_cast<const void*>(oat_file.GetBase()) << "\n\n";
 
     os << "LIMIT:\n";
-    os << oat_file.GetLimit() << "\n\n";
+    os << reinterpret_cast<const void*>(oat_file.GetLimit()) << "\n\n";
 
     os << std::flush;
 
@@ -121,7 +121,7 @@
     for (size_t class_def_index = 0; class_def_index < dex_file->NumClassDefs(); class_def_index++) {
       const DexFile::ClassDef& class_def = dex_file->GetClassDef(class_def_index);
       const char* descriptor = dex_file->GetClassDescriptor(class_def);
-      os << StringPrintf("%d: %s (type_ide=%d)\n", class_def_index, descriptor, class_def.class_idx_);
+      os << StringPrintf("%d: %s (type_idx=%d)\n", class_def_index, descriptor, class_def.class_idx_);
       UniquePtr<const OatFile::OatClass> oat_class(oat_dex_file.GetOatClass(class_def_index));
       CHECK(oat_class.get() != NULL);
       DumpOatClass(os, oat_file, *oat_class.get(), *dex_file, class_def);