Expands the use of Immediate and Operand wrappers.

runtime/vm/assembler_ia32.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_IA32_H_
 #define VM_ASSEMBLER_IA32_H_
 
 #ifndef VM_ASSEMBLER_H_
 #error Do not include assembler_ia32.h directly; use assembler.h instead.
 #endif
@@ skipping 147 matching lines @@
     }
   }
 
   Address(Register index, ScaleFactor scale, int32_t disp) {
     ASSERT(index != ESP);  // Illegal addressing mode.
     SetModRM(0, ESP);
     SetSIB(scale, index, EBP);
     SetDisp32(disp);
   }
 
+  // This addressing mode does not exist.
+  Address(Register index, ScaleFactor scale, Register r);
+
   Address(Register base, Register index, ScaleFactor scale, int32_t disp) {
     ASSERT(index != ESP);  // Illegal addressing mode.
     if (disp == 0 && base != EBP) {
       SetModRM(0, ESP);
       SetSIB(scale, index, base);
     } else if (Utils::IsInt(8, disp)) {
       SetModRM(1, ESP);
       SetSIB(scale, index, base);
       SetDisp8(disp);
     } else {
       SetModRM(2, ESP);
       SetSIB(scale, index, base);
       SetDisp32(disp);
     }
   }
 
+  // This addressing mode does not exist.
+  Address(Register base, Register index, ScaleFactor scale, Register r);
+
   Address(const Address& other) : Operand(other) { }
 
   Address& operator=(const Address& other) {
     Operand::operator=(other);
     return *this;
   }
 
   static Address Absolute(const uword addr) {
     Address result;
     result.SetModRM(0, EBP);
     result.SetDisp32(addr);
     return result;
   }
 
  private:
   Address() { }  // Needed by Address::Absolute.
 };
 
 
 class FieldAddress : public Address {
  public:
   FieldAddress(Register base, int32_t disp)
       : Address(base, disp - kHeapObjectTag) { }
 
+  // This addressing mode does not exist.
+  FieldAddress(Register base, Register r) : Address(base, 0) {
+    UNREACHABLE();

[Florian Schneider, 2014/09/26 12:36:58]

Remove definition and just leave declaration here too, and all other places...

[zra, 2014/09/26 17:11:35]

Done.

+  }
+
   FieldAddress(Register base, Register index, ScaleFactor scale, int32_t disp)
       : Address(base, index, scale, disp - kHeapObjectTag) { }
 
+  // This addressing mode does not exist.
+  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 725 matching lines @@
 }
 
 
 inline void Assembler::EmitOperandSizeOverride() {
   EmitUint8(0x66);
 }
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_IA32_H_