Expands the use of Immediate and Operand wrappers.

runtime/vm/assembler_x64.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_X64_H_
 #define VM_ASSEMBLER_X64_H_
 
 #ifndef VM_ASSEMBLER_H_
 #error Do not include assembler_x64.h directly; use assembler.h instead.
 #endif
@@ skipping 167 matching lines @@
       SetDisp8(disp);
     } else {
       SetModRM(2, base);
       if ((base & 7) == RSP) {
         SetSIB(TIMES_1, RSP, base);
       }
       SetDisp32(disp);
     }
   }
 
+  Address(Register base, Register r) {
+    UNREACHABLE();
+  }
+
   Address(Register index, ScaleFactor scale, int32_t disp) {
     ASSERT(index != RSP);  // Illegal addressing mode.
     SetModRM(0, RSP);
     SetSIB(scale, index, RBP);
     SetDisp32(disp);
   }
 
+  Address(Register index, ScaleFactor scale, Register r) {
+    UNREACHABLE();
+  }
+
   Address(Register base, Register index, ScaleFactor scale, int32_t disp) {
     ASSERT(index != RSP);  // Illegal addressing mode.
     if ((disp == 0) && ((base & 7) != RBP)) {
       SetModRM(0, RSP);
       SetSIB(scale, index, base);
     } else if (Utils::IsInt(8, disp)) {
       SetModRM(1, RSP);
       SetSIB(scale, index, base);
       SetDisp8(disp);
     } else {
       SetModRM(2, RSP);
       SetSIB(scale, index, base);
       SetDisp32(disp);
     }
   }
 
+  Address(Register base, Register index, ScaleFactor scale, Register r) {
+    UNREACHABLE();
+  }
+
   Address(const Address& other) : Operand(other) { }
 
   Address& operator=(const Address& other) {
     Operand::operator=(other);
     return *this;
   }
 
   static Address AddressBaseImm32(Register base, int32_t disp) {
     return Address(base, disp, true);
   }
 
+  static Address AddressBaseImm32(Register base, Register r) {
+    UNREACHABLE();
+    return Address(base, 0, true);
+  }
+
  private:
   Address(Register base, int32_t disp, bool fixed) {
     ASSERT(fixed);
     SetModRM(2, base);
     if ((base & 7) == RSP) {
       SetSIB(TIMES_1, RSP, base);
     }
     SetDisp32(disp);
   }
 };
 
 
 class FieldAddress : public Address {
  public:
   FieldAddress(Register base, int32_t disp)
       : Address(base, disp - kHeapObjectTag) { }
 
+  FieldAddress(Register base, Register r) : Address(base, 0) {
+    UNREACHABLE();
+  }
+
   FieldAddress(Register base, Register index, ScaleFactor scale, int32_t disp)
       : Address(base, index, scale, disp - kHeapObjectTag) { }
 
+  FieldAddress(Register base, Register index, ScaleFactor scale, Register r)
+      : Address(base, index, scale, 0) {
+    UNREACHABLE();
+  }
+
   FieldAddress(const FieldAddress& other) : Address(other) { }
 
   FieldAddress& operator=(const FieldAddress& other) {
     Address::operator=(other);
     return *this;
   }
 };
 
 
 class Label : public ValueObject {
@@ skipping 748 matching lines @@
   intptr_t FindObject(const Object& obj, Patchability patchable);
   intptr_t FindExternalLabel(const ExternalLabel* label,
                              Patchability patchable);
   intptr_t FindImmediate(int64_t imm);
   void LoadExternalLabel(Register dst,
                          const ExternalLabel* label,
                          Patchability patchable,
                          Register pp);
   bool CanLoadFromObjectPool(const Object& object);
   void LoadWordFromPoolOffset(Register dst, Register pp, int32_t offset);
+  void LoadWordFromPoolOffset(Register dst, Register pp, Register r) {
+    UNREACHABLE();
+  }
 
   inline void EmitUint8(uint8_t value);
   inline void EmitInt32(int32_t value);
   inline void EmitInt64(int64_t value);
 
   inline void EmitRegisterREX(Register reg, uint8_t rex);
   inline void EmitRegisterOperand(int rm, int reg);
   inline void EmitOperandREX(int rm, const Operand& operand, uint8_t rex);
   inline void EmitXmmRegisterOperand(int rm, XmmRegister reg);
   inline void EmitFixup(AssemblerFixup* fixup);
@@ skipping 107 matching lines @@
 }
 
 
 inline void Assembler::EmitOperandSizeOverride() {
   EmitUint8(0x66);
 }
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_X64_H_