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

runtime/vm/locations.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_LOCATIONS_H_
 #define VM_LOCATIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/bitfield.h"
 
@@ skipping 44 matching lines @@
 
     // Spill slot allocated by the register allocator.  Payload contains
     // a spill index.
     kStackSlot = 3,
     kDoubleStackSlot = 4,
 
     // Register location represents a fixed register.  Payload contains
     // register code.
     kRegister = 6,
 
-    // XmmRegister location represents a fixed xmm register.  Payload contains
+    // FpuRegister location represents a fixed fpu register.  Payload contains
     // its code.
-    kXmmRegister = 7,
+    kFpuRegister = 7,
   };
 
   Location() : value_(kInvalidLocation) {
     ASSERT(IsInvalid());
   }
 
   bool IsInvalid() const {
     return value_ == kInvalidLocation;
   }
 
@@ skipping 12 matching lines @@
   const Object& constant() const {
     ASSERT(IsConstant());
     return *reinterpret_cast<const Object*>(value_ & ~kConstantMask);
   }
 
   // Unallocated locations.
   enum Policy {
     kAny,
     kPrefersRegister,
     kRequiresRegister,
-    kRequiresXmmRegister,
+    kRequiresFpuRegister,
     kWritableRegister,
     kSameAsFirstInput,
   };
 
   bool IsUnallocated() const {
     return kind() == kUnallocated;
   }
 
   bool IsRegisterBeneficial() {
     return !Equals(Any());
   }
 
   static Location UnallocatedLocation(Policy policy) {
     return Location(kUnallocated, PolicyField::encode(policy));
   }
 
   // Any free register is suitable to replace this unallocated location.
   static Location Any() {
     return UnallocatedLocation(kAny);
   }
 
   static Location PrefersRegister() {
     return UnallocatedLocation(kPrefersRegister);
   }
 
   static Location RequiresRegister() {
     return UnallocatedLocation(kRequiresRegister);
   }
 
-  static Location RequiresXmmRegister() {
-    return UnallocatedLocation(kRequiresXmmRegister);
+  static Location RequiresFpuRegister() {
+    return UnallocatedLocation(kRequiresFpuRegister);
   }
 
   static Location WritableRegister() {
     return UnallocatedLocation(kWritableRegister);
   }
 
   // The location of the first input to the instruction will be
   // used to replace this unallocated location.
   static Location SameAsFirstInput() {
     return UnallocatedLocation(kSameAsFirstInput);
@@ skipping 19 matching lines @@
 
   bool IsRegister() const {
     return kind() == kRegister;
   }
 
   Register reg() const {
     ASSERT(IsRegister());
     return RegisterField::decode(payload());
   }
 
-  // XMM registers and double spill slots can contain either doubles
+  // FPU registers and double spill slots can contain either doubles
   // or 64-bit integers.
   enum Representation {
     kDouble,
     kMint
   };
 
   Representation representation() const {
-    ASSERT(IsXmmRegister() || IsDoubleStackSlot());
+    ASSERT(IsFpuRegister() || IsDoubleStackSlot());
     return RepresentationField::decode(payload());
   }
 
-  // XmmRegister locations.
-  static Location XmmRegisterLocation(XmmRegister reg, Representation rep) {
+  // FpuRegister locations.
+  static Location FpuRegisterLocation(FpuRegister reg, Representation rep) {
     uword payload =
-        XmmRegisterField::encode(reg) | RepresentationField::encode(rep);
-    return Location(kXmmRegister, payload);
+        FpuRegisterField::encode(reg) | RepresentationField::encode(rep);
+    return Location(kFpuRegister, payload);
   }
 
-  bool IsXmmRegister() const {
-    return kind() == kXmmRegister;
+  bool IsFpuRegister() const {
+    return kind() == kFpuRegister;
   }
 
-  XmmRegister xmm_reg() const {
-    ASSERT(IsXmmRegister());
-    return XmmRegisterField::decode(payload());
+  FpuRegister fpu_reg() const {
+    ASSERT(IsFpuRegister());
+    return FpuRegisterField::decode(payload());
   }
 
   static bool IsMachineRegisterKind(Kind kind) {
     return (kind & kMachineRegisterMask) == kMachineRegister;
   }
 
   static Location MachineRegisterLocation(Kind kind,
                                           intptr_t reg,
                                           Representation rep) {
     if (kind == kRegister) {
       return RegisterLocation(static_cast<Register>(reg));
     } else {
-      ASSERT(kind == kXmmRegister);
-      return XmmRegisterLocation(static_cast<XmmRegister>(reg), rep);
+      ASSERT(kind == kFpuRegister);
+      return FpuRegisterLocation(static_cast<FpuRegister>(reg), rep);
     }
   }
 
   bool IsMachineRegister() const {
     return IsMachineRegisterKind(kind());
   }
 
   intptr_t register_code() const {
     ASSERT(IsMachineRegister());
     return static_cast<intptr_t>(RegisterField::decode(payload()));
@@ skipping 75 matching lines @@
     return PayloadField::decode(value_);
   }
 
   typedef BitField<Kind, 0, kBitsForKind> KindField;
   typedef BitField<uword, kBitsForKind, kBitsForPayload> PayloadField;
 
   // Layout for kUnallocated locations payload.
   typedef BitField<Policy, 0, 3> PolicyField;
 
   // Layout for register locations payload. The representation bit is only used
-  // for XmmRegister and unused for Register.
+  // for FpuRegister and unused for Register.
   static const intptr_t kBitsForRepresentation = 1;
   static const intptr_t kBitsForRegister =
       kBitsForPayload - kBitsForRepresentation;
   typedef BitField<Representation,
                    0,
                    kBitsForRepresentation> RepresentationField;
   typedef BitField<Register,
                    kBitsForRepresentation,
                    kBitsForRegister> RegisterField;
-  typedef BitField<XmmRegister,
+  typedef BitField<FpuRegister,
                    kBitsForRepresentation,
-                   kBitsForRegister> XmmRegisterField;
+                   kBitsForRegister> FpuRegisterField;
 
   // Layout for stack slots. The representation bit is only used for
   // DoubleStackSlot and unused for StackSlot.
   static const intptr_t kBitsForIndex =
       kBitsForPayload - kBitsForRepresentation;
   typedef BitField<uword,
                    kBitsForRepresentation,
                    kBitsForIndex> IndexField;
   static const intptr_t kStackIndexBias =
       static_cast<intptr_t>(1) << (kBitsForIndex - 1);
 
   // Location either contains kind and payload fields or a tagged handle for
   // a constant locations. Values of enumeration Kind are selected in such a
   // way that none of them can be interpreted as a kConstant tag.
   uword value_;
 };
 
 
 class RegisterSet : public ValueObject {
  public:
-  RegisterSet() : cpu_registers_(0), xmm_registers_(0) {
+  RegisterSet() : cpu_registers_(0), fpu_registers_(0) {
     ASSERT(kNumberOfCpuRegisters < (kWordSize * kBitsPerByte));
-    ASSERT(kNumberOfXmmRegisters < (kWordSize * kBitsPerByte));
+    ASSERT(kNumberOfFpuRegisters < (kWordSize * kBitsPerByte));
   }
 
 
   void Add(Location loc) {
     if (loc.IsRegister()) {
       cpu_registers_ |= (1 << loc.reg());
-    } else if (loc.IsXmmRegister()) {
-      xmm_registers_ |= (1 << loc.xmm_reg());
+    } else if (loc.IsFpuRegister()) {
+      fpu_registers_ |= (1 << loc.fpu_reg());
     }
   }
 
   void Remove(Location loc) {
     if (loc.IsRegister()) {
       cpu_registers_ &= ~(1 << loc.reg());
-    } else if (loc.IsXmmRegister()) {
-      xmm_registers_ &= ~(1 << loc.xmm_reg());
+    } else if (loc.IsFpuRegister()) {
+      fpu_registers_ &= ~(1 << loc.fpu_reg());
     }
   }
 
   bool ContainsRegister(Register reg) {
     return (cpu_registers_ & (1 << reg)) != 0;
   }
 
-  bool ContainsXmmRegister(XmmRegister xmm_reg) {
-    return (xmm_registers_ & (1 << xmm_reg)) != 0;
+  bool ContainsFpuRegister(FpuRegister fpu_reg) {
+    return (fpu_registers_ & (1 << fpu_reg)) != 0;
   }
 
-  intptr_t xmm_regs_count() {
+  intptr_t fpu_regs_count() {
     intptr_t count = 0;
-    for (intptr_t reg_idx = 0; reg_idx < kNumberOfXmmRegisters; reg_idx++) {
-      if (ContainsXmmRegister(static_cast<XmmRegister>(reg_idx))) {
+    for (intptr_t reg_idx = 0; reg_idx < kNumberOfFpuRegisters; reg_idx++) {
+      if (ContainsFpuRegister(static_cast<FpuRegister>(reg_idx))) {
         count++;
       }
     }
     return count;
   }
 
  private:
   intptr_t cpu_registers_;
-  intptr_t xmm_registers_;
+  intptr_t fpu_registers_;
 
   DISALLOW_COPY_AND_ASSIGN(RegisterSet);
 };
 
 
 // Specification of locations for inputs and output.
 class LocationSummary : public ZoneAllocated {
  public:
   enum ContainsCall {
     kNoCall,
@@ skipping 85 matching lines @@
   BitmapBuilder* stack_bitmap_;
 
   const ContainsCall contains_call_;
   RegisterSet live_registers_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_LOCATIONS_H_