commit 50afc65c674fee10ed9a0380daaee7862cc79d5d
author buzbee <buzbee@google.com> Thu Sep 09 16:46:09 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 09 16:46:09 2010 -0700
tree 2dd523e3f4599740587720e5af8031e96ceab24d
parent 139bd97804a69634e7c4cecf06910a050a4ac093
parent 42feff164d6f4e2139e38f1557cf1455cb871771

Merge "JIT: Fix inconsistent handling of sub-word instance git/put" into gingerbread

vm/compiler/codegen/arm/CodegenDriver.c

diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c
index a04371e..0b6e433 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.c
+++ b/vm/compiler/codegen/arm/CodegenDriver.c
@@ -2328,24 +2328,20 @@
             // NOTE: intentional fallthrough
         case OP_IGET:
         case OP_IGET_OBJECT:
-            genIGet(cUnit, mir, kWord, fieldOffset, isVolatile);
-            break;
         case OP_IGET_BOOLEAN:
-            genIGet(cUnit, mir, kUnsignedByte, fieldOffset, isVolatile);
-            break;
         case OP_IGET_BYTE:
-            genIGet(cUnit, mir, kSignedByte, fieldOffset, isVolatile);
-            break;
         case OP_IGET_CHAR:
-            genIGet(cUnit, mir, kUnsignedHalf, fieldOffset, isVolatile);
-            break;
         case OP_IGET_SHORT:
-            genIGet(cUnit, mir, kSignedHalf, fieldOffset, isVolatile);
+            genIGet(cUnit, mir, kWord, fieldOffset, isVolatile);
             break;
         case OP_IPUT_WIDE:
             genIPutWide(cUnit, mir, fieldOffset);
             break;
         case OP_IPUT:
+        case OP_IPUT_SHORT:
+        case OP_IPUT_CHAR:
+        case OP_IPUT_BYTE:
+        case OP_IPUT_BOOLEAN:
             genIPut(cUnit, mir, kWord, fieldOffset, false, isVolatile);
             break;
         case OP_IPUT_VOLATILE:
@@ -2355,16 +2351,6 @@
         case OP_IPUT_OBJECT:
             genIPut(cUnit, mir, kWord, fieldOffset, true, isVolatile);
             break;
-        case OP_IPUT_SHORT:
-        case OP_IPUT_CHAR:
-            genIPut(cUnit, mir, kUnsignedHalf, fieldOffset, false, isVolatile);
-            break;
-        case OP_IPUT_BYTE:
-            genIPut(cUnit, mir, kSignedByte, fieldOffset, false, isVolatile);
-            break;
-        case OP_IPUT_BOOLEAN:
-            genIPut(cUnit, mir, kUnsignedByte, fieldOffset, false, isVolatile);
-            break;
         case OP_IGET_WIDE_VOLATILE:
         case OP_IPUT_WIDE_VOLATILE:
             genInterpSingleStep(cUnit, mir);