Fix ARM memory addressing mode 3 in assembler.

runtime/vm/assembler_arm_test.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/assembler.h"
 #include "vm/os.h"
 #include "vm/unit_test.h"
@@ skipping 771 matching lines @@
 
 
 ASSEMBLER_TEST_RUN(Rsb, test) {
   EXPECT(test != NULL);
   typedef int (*Rsb)();
   EXPECT_EQ(32, EXECUTE_TEST_CODE_INT32(Rsb, test->entry()));
 }
 
 
 ASSEMBLER_TEST_GENERATE(Ldrh, assembler) {
-  Label Test1;
-  Label Test2;
-  Label Done;
+  Label Test1, Test2, Test3, Done;
 
   __ mov(R1, ShifterOperand(0x11));
   __ mov(R2, ShifterOperand(SP));
   __ str(R1, Address(SP, (-kWordSize * 30), Address::PreIndex));
   __ ldrh(R0, Address(R2, (-kWordSize * 30)));
   __ cmp(R0, ShifterOperand(0x11));
   __ b(&Test1, EQ);
   __ mov(R0, ShifterOperand(1));
   __ b(&Done);
   __ Bind(&Test1);
 
-  __ mov(R0, ShifterOperand(0));
+  __ mov(R0, ShifterOperand(0x22));
   __ strh(R0, Address(R2, (-kWordSize * 30)));
   __ ldrh(R1, Address(R2, (-kWordSize * 30)));
-  __ cmp(R1, ShifterOperand(0));
+  __ cmp(R1, ShifterOperand(0x22));
   __ b(&Test2, EQ);
   __ mov(R0, ShifterOperand(1));
   __ b(&Done);
   __ Bind(&Test2);
 
   __ mov(R0, ShifterOperand(0));
+  __ AddImmediate(R2, (-kWordSize * 30));
+  __ strh(R0, Address(R2));
+  __ ldrh(R1, Address(R2));
+  __ cmp(R1, ShifterOperand(0));
+  __ b(&Test3, EQ);
+  __ mov(R0, ShifterOperand(1));
+  __ b(&Done);
+  __ Bind(&Test3);
+
+  __ mov(R0, ShifterOperand(0));
   __ Bind(&Done);
   __ ldr(R1, Address(SP, (kWordSize * 30), Address::PostIndex));
   __ mov(PC, ShifterOperand(LR));
 }
 
 
 ASSEMBLER_TEST_RUN(Ldrh, test) {
   EXPECT(test != NULL);
   typedef int (*Tst)();
   EXPECT_EQ(0, EXECUTE_TEST_CODE_INT32(Tst, test->entry()));
@@ skipping 736 matching lines @@
   __ StoreIntoObject(R2,
                      FieldAddress(R2, GrowableObjectArray::data_offset()),
                      R1);
   __ PopList((1 << CTX) | (1 << LR));
   __ Ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM