More coverage of load/stores in ARM integrated assembler.

src/DartARM32/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.
 //
 // This is forked from Dart revision df52deea9f25690eb8b66c5995da92b70f7ac1fe
 // Please update the (git) revision if we merge changes from Dart.
 // https://code.google.com/p/dart/wiki/GettingTheSource
 
 #ifndef VM_ASSEMBLER_ARM_H_
 #define VM_ASSEMBLER_ARM_H_
@@ skipping 324 matching lines @@
   Register rm() const {
     return ((kind() == IndexRegister) || (kind() == ScaledIndexRegister)) ?
         Instr::At(reinterpret_cast<uword>(&encoding_))->RmField() :
         kNoRegister;
   }
 
   Mode mode() const { return static_cast<Mode>(encoding() & kModeMask); }
 
   uint32_t encoding() const { return encoding_; }
 
+#if 0
+// Moved to encodeImmRegOffsetEnc3 in IceAssemblerARM32.cpp
   // Encoding for addressing mode 3.
   uint32_t encoding3() const;
+#endif
 
   // Encoding for vfp load/store addressing.
   uint32_t vencoding() const;
 
   OffsetKind kind() const { return kind_; }
 
   uint32_t encoding_;
 
   OffsetKind kind_;
 
@@ skipping 819 matching lines @@
 
   // Moved to ARM32::AssemblerARM32::emitType05()
   void EmitType5(Condition cond, int32_t offset, bool link);
 
   // Moved to ARM32::AssemberARM32::emitMemOp()
   void EmitMemOp(Condition cond,
                  bool load,
                  bool byte,
                  Register rd,
                  Address ad);
-#endif
 
+  // Moved to AssemblerARM32::emitMemOpEnc3();
   void EmitMemOpAddressMode3(Condition cond,
                              int32_t mode,
                              Register rd,
                              Address ad);
 
-#if 0
   // Moved to ARM32::AssemblerARM32::emitMultiMemOp()
   void EmitMultiMemOp(Condition cond,
                       BlockAddressMode am,
                       bool load,
                       Register base,
                       RegList regs);
 #endif
 
   void EmitShiftImmediate(Condition cond,
                           Shift opcode,
@@ skipping 111 matching lines @@
   // ARM32::AssemblerARM::uxt() (uxtb and uxth).
 #endif
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(Assembler);
 };
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_ARM_H_