Fix ARM memory addressing mode 3 in assembler.

runtime/vm/assembler_arm.h

 // 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.
 
 #ifndef VM_ASSEMBLER_ARM_H_
 #define VM_ASSEMBLER_ARM_H_
 
 #ifndef VM_ASSEMBLER_H_
 #error Do not include assembler_arm.h directly; use assembler.h instead.
 #endif
@@ skipping 198 matching lines @@
   IA_W         = (0|4|1) << 21,  // increment after with writeback to base
   DB_W         = (8|0|1) << 21,  // decrement before with writeback to base
   IB_W         = (8|4|1) << 21   // increment before with writeback to base
 };
 
 
 class Address : public ValueObject {
  public:
   enum OffsetKind {
     Immediate,
-    ShiftedRegister,
+    IndexRegister,
+    ScaledIndexRegister,
   };
 
   // Memory operand addressing mode
   enum Mode {
     // bit encoding P U W
     Offset       = (8|4|0) << 21,  // offset (w/o writeback to base)
     PreIndex     = (8|4|1) << 21,  // pre-indexed addressing with writeback
     PostIndex    = (0|4|0) << 21,  // post-indexed addressing with writeback
     NegOffset    = (8|0|0) << 21,  // negative offset (w/o writeback to base)
     NegPreIndex  = (8|0|1) << 21,  // negative pre-indexed with writeback
@@ skipping 18 matching lines @@
     } else {
       encoding_ = am | offset;
     }
     encoding_ |= static_cast<uint32_t>(rn) << kRnShift;
   }
 
   Address(Register rn, Register rm,
           Shift shift = LSL, uint32_t shift_imm = 0, Mode am = Offset) {
     ShifterOperand so(rm, shift, shift_imm);
 
-    kind_ = ShiftedRegister;
+    if ((shift == LSL) && (shift_imm == 0)) {
+      kind_ = IndexRegister;
+    } else {
+      kind_ = ScaledIndexRegister;
+    }
     encoding_ = so.encoding() | am | (static_cast<uint32_t>(rn) << kRnShift);
   }
 
   static bool CanHoldLoadOffset(LoadOperandType type,
                                 int32_t offset,
                                 int32_t* offset_mask);
   static bool CanHoldStoreOffset(StoreOperandType type,
                                  int32_t offset,
                                  int32_t* offset_mask);
 
@@ skipping 526 matching lines @@
                                   Register value,
                                   Label* no_update);
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(Assembler);
 };
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_ARM_H_