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

runtime/vm/deopt_instructions.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_DEOPT_INSTRUCTIONS_H_
 #define VM_DEOPT_INSTRUCTIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/growable_array.h"
@@ skipping 33 matching lines @@
   void SetCallerFp(intptr_t callers_fp);
 
   RawObject* ObjectAt(intptr_t index) const {
     return object_table_.At(index);
   }
 
   intptr_t RegisterValue(Register reg) const {
     return registers_copy_[reg];
   }
 
-  double XmmRegisterValue(XmmRegister reg) const {
-    return xmm_registers_copy_[reg];
+  double FpuRegisterValue(FpuRegister reg) const {
+    return fpu_registers_copy_[reg];
   }
 
-  int64_t XmmRegisterValueAsInt64(XmmRegister reg) const {
-    return (reinterpret_cast<int64_t*>(xmm_registers_copy_))[reg];
+  int64_t FpuRegisterValueAsInt64(FpuRegister reg) const {
+    return (reinterpret_cast<int64_t*>(fpu_registers_copy_))[reg];
   }
 
   Isolate* isolate() const { return isolate_; }
 
   intptr_t from_frame_size() const { return from_frame_size_; }
 
   DeoptReasonId deopt_reason() const { return deopt_reason_; }
 
  private:
   const Array& object_table_;
   intptr_t* to_frame_;
   const intptr_t to_frame_size_;
   intptr_t* from_frame_;
   intptr_t from_frame_size_;
   intptr_t* registers_copy_;
-  double* xmm_registers_copy_;
+  double* fpu_registers_copy_;
   const intptr_t num_args_;
   const DeoptReasonId deopt_reason_;
   intptr_t caller_fp_;
   Isolate* isolate_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptimizationContext);
 };
 
 
 
 // Represents one deopt instruction, e.g, setup return address, store object,
 // store register, etc. The target is defined by instruction's position in
 // the deopt-info array.
 class DeoptInstr : public ZoneAllocated {
  public:
   enum Kind {
     kRetAfterAddress,
     kRetBeforeAddress,
     kConstant,
     kRegister,
-    kXmmRegister,
-    kInt64XmmRegister,
+    kFpuRegister,
+    kInt64FpuRegister,
     kStackSlot,
     kDoubleStackSlot,
     kInt64StackSlot,
     kPcMarker,
     kCallerFp,
     kCallerPc,
     kSuffix,
   };
 
   static DeoptInstr* Create(intptr_t kind_as_int, intptr_t from_index);
@@ skipping 108 matching lines @@
                        DeoptInfo* info,
                        Smi* reason);
 
  private:
   static const intptr_t kEntrySize = 3;
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_