commit 95ba0dc516531776813c426e85ce868ead564a7b
author Brian Carlstrom <bdc@google.com> Mon Mar 05 22:06:14 2012 -0800
committer Brian Carlstrom <bdc@google.com> Mon Mar 05 22:06:14 2012 -0800
tree 9d1de523e588210764373cdd1b44de8b04eb8468
parent f03c288c11ce3334fccab7fe31d8ebd14ad02157

Adjust Thumb2 code offsets

Change-Id: I2ec65c653bda3b47efa54d5496c96a3c7f343e5a

src/oatdump.cc

diff --git a/src/oatdump.cc b/src/oatdump.cc
index d2ceb5e..7333bc3 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -199,7 +199,11 @@
   }
 
   void AddOffsets(const OatFile::OatMethod& oat_method) {
-    offsets_.insert(oat_method.GetCodeOffset());
+    uint32_t code_offset = oat_method.GetCodeOffset();
+    if (oat_file_.GetOatHeader().GetInstructionSet() == kThumb2) {
+      code_offset &= ~0x1;
+    }
+    offsets_.insert(code_offset);
     offsets_.insert(oat_method.GetMappingTableOffset());
     offsets_.insert(oat_method.GetVmapTableOffset());
     offsets_.insert(oat_method.GetGcMapOffset());