Generate better ARM code for indexed loads and stores.

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 150 matching lines @@
 enum OperandSize {
   kByte,
   kUnsignedByte,
   kHalfword,
   kUnsignedHalfword,
   kWord,
   kUnsignedWord,
   kWordPair,
   kSWord,
   kDWord,
+  kRegList,
 };
 
 
 // Load/store multiple addressing mode.
 enum BlockAddressMode {
   // bit encoding P U W
   DA           = (0|0|0) << 21,  // decrement after
   IA           = (0|4|0) << 21,  // increment after
   DB           = (8|0|0) << 21,  // decrement before
   IB           = (8|4|0) << 21,  // increment before
@@ skipping 26 matching lines @@
   Address(const Address& other)
       : ValueObject(), encoding_(other.encoding_), kind_(other.kind_) {
   }
 
   Address& operator=(const Address& other) {
     encoding_ = other.encoding_;
     kind_ = other.kind_;
     return *this;
   }
 
+  bool Equals(const Address& other) const {
+    return (encoding_ == other.encoding_) && (kind_ == other.kind_);
+  }
+
   explicit Address(Register rn, int32_t offset = 0, Mode am = Offset) {
     ASSERT(Utils::IsAbsoluteUint(12, offset));
     kind_ = Immediate;
     if (offset < 0) {
       encoding_ = (am ^ (1 << kUShift)) | -offset;  // Flip U to adjust sign.
     } 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);
 
     if ((shift == LSL) && (shift_imm == 0)) {
       kind_ = IndexRegister;
     } else {
       kind_ = ScaledIndexRegister;
     }
     encoding_ = so.encoding() | am | (static_cast<uint32_t>(rn) << kRnShift);
   }
 
-  static bool CanHoldLoadOffset(OperandSize type,
+  static OperandSize OperandSizeFor(intptr_t cid);
+
+  static bool CanHoldLoadOffset(OperandSize size,
                                 int32_t offset,
                                 int32_t* offset_mask);
-  static bool CanHoldStoreOffset(OperandSize type,
+  static bool CanHoldStoreOffset(OperandSize size,
                                  int32_t offset,
                                  int32_t* offset_mask);
 
  private:
   uint32_t encoding() const { return encoding_; }
 
   // Encoding for addressing mode 3.
   uint32_t encoding3() const;
 
   // Encoding for vfp load/store addressing.
@@ skipping 660 matching lines @@
                                   Register value,
                                   Label* no_update);
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(Assembler);
 };
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_ARM_H_