Fix vm code base so that it can be built for --arch=simarm (no snapshot yet).

runtime/vm/assembler_ia32.h

-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+// 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 11 matching lines @@
   explicit Immediate(int32_t value) : value_(value) { }
 
   int32_t value() const { return value_; }
 
   bool is_int8() const { return Utils::IsInt(8, value_); }
   bool is_uint8() const { return Utils::IsUint(8, value_); }
   bool is_uint16() const { return Utils::IsUint(16, value_); }
 
  private:
   const int32_t value_;
-
-  // TODO(5411081): Add DISALLOW_COPY_AND_ASSIGN(Immediate) once the mac
-  // build issue is resolved.
+  DISALLOW_ALLOCATION();
 };
 
 
 class Operand : public ValueObject {
  public:
   uint8_t mod() const {
     return (encoding_at(0) >> 6) & 3;
   }
 
   Register rm() const {
@@ skipping 63 matching lines @@
 
   explicit Operand(Register reg) { SetModRM(3, reg); }
 
   // Get the operand encoding byte at the given index.
   uint8_t encoding_at(int index) const {
     ASSERT(index >= 0 && index < length_);
     return encoding_[index];
   }
 
   friend class Assembler;
-
-  // TODO(5411081): Add DISALLOW_COPY_AND_ASSIGN(Operand) once the mac
-  // build issue is resolved.
+  DISALLOW_ALLOCATION();
 };
 
 
 class Address : public Operand {
  public:
   Address(Register base, int32_t disp) {
     if (disp == 0 && base != EBP) {
       SetModRM(0, base);
       if (base == ESP) SetSIB(TIMES_1, ESP, base);
     } else if (Utils::IsInt(8, disp)) {
@@ skipping 32 matching lines @@
 
   static Address Absolute(const uword addr) {
     Address result;
     result.SetModRM(0, EBP);
     result.SetDisp32(addr);
     return result;
   }
 
  private:
   Address() {}
-
-  // TODO(5411081): Add DISALLOW_COPY_AND_ASSIGN(Address) once the mac
-  // build issue is resolved.
+  DISALLOW_ALLOCATION();
 };
 
 
 class FieldAddress : public Address {
  public:
   FieldAddress(Register base, int32_t disp)
       : Address(base, disp - kHeapObjectTag) {}
   FieldAddress(Register base, Register index, ScaleFactor scale, int32_t disp)
       : Address(base, index, scale, disp - kHeapObjectTag) {}
 };
@@ skipping 442 matching lines @@
   void Unimplemented(const char* message);
   void Untested(const char* message);
   void Unreachable(const char* message);
 
   static void InitializeMemoryWithBreakpoints(uword data, int length);
 
   void Comment(const char* format, ...) PRINTF_ATTRIBUTE(2, 3);
   const Code::Comments& GetCodeComments() const;
 
   static const char* RegisterName(Register reg);
-  static const char* XmmRegisterName(XmmRegister reg);
+  static const char* FpuRegisterName(XmmRegister reg);

[Ivan Posva, 2013/01/16 01:17:56]

This looks very asymmetric. Either it should take a FpuRegister as a parameter
or be called XmmRegisterName.

[regis, 2013/01/16 01:55:07]

Renamed parameter type.

 
  private:
   AssemblerBuffer buffer_;
   int prologue_offset_;
 
   class CodeComment : public ZoneAllocated {
    public:
     CodeComment(intptr_t pc_offset, const String& comment)
         : pc_offset_(pc_offset), comment_(comment) { }
 
@@ skipping 59 matching lines @@
 }
 
 
 inline void Assembler::EmitOperandSizeOverride() {
   EmitUint8(0x66);
 }
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_IA32_H_