Fix ARM memory addressing mode 3 in assembler.

runtime/vm/assembler_arm.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/simulator.h"
 #include "vm/runtime_entry.h"
@@ skipping 82 matching lines @@
   // ldrex/strex register field encodings.
   kLdExRnShift = 16,
   kLdExRtShift = 12,
   kStrExRnShift = 16,
   kStrExRdShift = 12,
   kStrExRtShift = 0,
 };
 
 
 uint32_t Address::encoding3() const {
-  ASSERT(kind_ == Immediate);
-  uint32_t offset = encoding_ & kOffset12Mask;
-  ASSERT(offset < 256);
-  return (encoding_ & ~kOffset12Mask) | ((offset & 0xf0) << 4) | (offset & 0xf);
+  if (kind_ == Immediate) {
+    uint32_t offset = encoding_ & kOffset12Mask;
+    ASSERT(offset < 256);
+    return (encoding_ & ~kOffset12Mask) | B22 |
+           ((offset & 0xf0) << 4) | (offset & 0xf);
+  }
+  ASSERT(kind_ == IndexRegister);
+  return encoding_;
 }
 
 
 uint32_t Address::vencoding() const {
   ASSERT(kind_ == Immediate);
   uint32_t offset = encoding_ & kOffset12Mask;
   ASSERT(offset < (1 << 10));  // In the range 0 to +1020.
   ASSERT(Utils::IsAligned(offset, 4));  // Multiple of 4.
   int mode = encoding_ & ((8|4|1) << 21);
   ASSERT((mode == Offset) || (mode == NegOffset));
@@ skipping 68 matching lines @@
 }
 
 
 void Assembler::EmitMemOpAddressMode3(Condition cond,
                                       int32_t mode,
                                       Register rd,
                                       Address ad) {
   ASSERT(rd != kNoRegister);
   ASSERT(cond != kNoCondition);
   int32_t encoding = (static_cast<int32_t>(cond) << kConditionShift) |
-                     B22  |
                      mode |
                      (static_cast<int32_t>(rd) << kRdShift) |
                      ad.encoding3();
   Emit(encoding);
 }
 
 
 void Assembler::EmitMultiMemOp(Condition cond,
                                BlockAddressMode am,
                                bool load,
@@ skipping 1917 matching lines @@
 
 const char* Assembler::FpuRegisterName(FpuRegister reg) {
   ASSERT((0 <= reg) && (reg < kNumberOfFpuRegisters));
   return fpu_reg_names[reg];
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM