commit 3101efb8f0e02fcfa70229c15631755cad758536
author buzbee <buzbee@google.com> Sun Sep 18 14:10:27 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 18 14:10:27 2011 -0700
tree ba568c88e0a2a0b9d4c92bdede1cd8274c191694
parent 93dd9660955f1c0f068c57199c1945fc51fb84a7
parent 3b80347bfb3affe6fe193de5390624d6fbd746c5

Merge "Assembler fix" into dalvik-dev

src/compiler/codegen/arm/Assemble.cc

diff --git a/src/compiler/codegen/arm/Assemble.cc b/src/compiler/codegen/arm/Assemble.cc
index 475f096..62706a7 100644
--- a/src/compiler/codegen/arm/Assemble.cc
+++ b/src/compiler/codegen/arm/Assemble.cc
@@ -1295,13 +1295,13 @@
             ArmLIR *addPCInst = (ArmLIR*)lir->operands[2];
             SwitchTable *tabRec = (SwitchTable*)lir->operands[3];
             lir->operands[1] = (tabRec->offset -
-                ((addPCInst->generic.offset + 4) & ~3)) & 0xffff;
+                (addPCInst->generic.offset + 4)) & 0xffff;
         } else if (lir->opcode == kThumb2MovImm16HST) {
             // operands[1] should hold disp, [2] has add, [3] has tabRec
             ArmLIR *addPCInst = (ArmLIR*)lir->operands[2];
             SwitchTable *tabRec = (SwitchTable*)lir->operands[3];
             lir->operands[1] = ((tabRec->offset -
-                ((addPCInst->generic.offset + 4) & ~3)) >> 16) & 0xffff;
+                (addPCInst->generic.offset + 4)) >> 16) & 0xffff;
         }
         ArmEncodingMap *encoder = &EncodingMap[lir->opcode];
         u4 bits = encoder->skeleton;