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_COPY_AND_ASSIGN(Immediate);

[srdjan, 2013/01/16 23:57:56]

Need to be fixed as discussed (Mac build complains).

[regis, 2013/01/17 01:02:09]

Done.

 };
 
 
-class Operand : public ValueObject {
+class Operand {
  public:
   uint8_t mod() const {
     return (encoding_at(0) >> 6) & 3;
   }
 
   Register rm() const {
     return static_cast<Register>(encoding_at(0) & 7);
   }
 
   ScaleFactor scale() const {
@@ skipping 11 matching lines @@
   int8_t disp8() const {
     ASSERT(length_ >= 2);
     return static_cast<int8_t>(encoding_[length_ - 1]);
   }
 
   int32_t disp32() const {
     ASSERT(length_ >= 5);
     return bit_copy<int32_t>(encoding_[length_ - 4]);
   }
 
-  bool IsRegister(Register reg) const {
-    return ((encoding_[0] & 0xF8) == 0xC0)  // Addressing mode is register only.
-        && ((encoding_[0] & 0x07) == reg);  // Register codes match.
+  Operand(const Operand& other) : length_(other.length_) {
+    memmove(&encoding_[0], &other.encoding_[0], other.length_);
+  }
+
+  Operand& operator=(const Operand& other) {
+    length_ = other.length_;
+    memmove(&encoding_[0], &other.encoding_[0], other.length_);
+    return *this;
   }
 
  protected:
-  // Operand can be sub classed (e.g: Address).
-  Operand() : length_(0) { }
+  Operand() : length_(0) { }  // Needed by subclass Address.
 
   void SetModRM(int mod, Register rm) {
     ASSERT((mod & ~3) == 0);
     encoding_[0] = (mod << 6) | rm;
     length_ = 1;
   }
 
   void SetSIB(ScaleFactor scale, Register index, Register base) {
     ASSERT(length_ == 1);
     ASSERT((scale & ~3) == 0);
@@ skipping 19 matching lines @@
   uint8_t padding_;
 
   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];
   }
 
+  // Returns whether or not this operand is really the given register in
+  // disguise. Used from the assembler to generate better encodings.
+  bool IsRegister(Register reg) const {
+    return ((encoding_[0] & 0xF8) == 0xC0)  // Addressing mode is register only.
+        && ((encoding_[0] & 0x07) == reg);  // Register codes match.
+  }
+
   friend class Assembler;
-
-  // TODO(5411081): Add DISALLOW_COPY_AND_ASSIGN(Operand) once the mac
-  // build issue is resolved.
 };
 
 
 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 23 matching lines @@
       SetModRM(1, ESP);
       SetSIB(scale, index, base);
       SetDisp8(disp);
     } else {
       SetModRM(2, ESP);
       SetSIB(scale, index, base);
       SetDisp32(disp);
     }
   }
 
+  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() {}
-
-  // TODO(5411081): Add DISALLOW_COPY_AND_ASSIGN(Address) once the mac
-  // build issue is resolved.
+  Address() { }  // Needed by Address::Absolute.
 };
 
 
 class FieldAddress : public Address {
  public:
   FieldAddress(Register base, int32_t disp)
-      : Address(base, disp - kHeapObjectTag) {}
+      : Address(base, disp - kHeapObjectTag) { }
+
   FieldAddress(Register base, Register index, ScaleFactor scale, int32_t disp)
-      : Address(base, index, scale, disp - kHeapObjectTag) {}
+      : Address(base, index, scale, disp - kHeapObjectTag) { }
+
+  FieldAddress(const FieldAddress& other) : Address(other) { }
+
+  FieldAddress& operator=(const FieldAddress& other) {
+    Address::operator=(other);
+    return *this;
+  }
 };
 
 
 class Label : public ValueObject {
  public:
   Label() : position_(0), unresolved_(0) {
 #ifdef DEBUG
     for (int i = 0; i < kMaxUnresolvedBranches; i++) {
       unresolved_near_positions_[i] = -1;
     }
@@ skipping 433 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(FpuRegister reg);
 
  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_