Replaces Location::ToStackSlotAddress() with Location::ToStackSlotOffset()

runtime/vm/assembler_arm.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_ARM_H_
 #define VM_ASSEMBLER_ARM_H_
 
 #ifndef VM_ASSEMBLER_H_
 #error Do not include assembler_arm.h directly; use assembler.h instead.
 #endif
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/constants_arm.h"
+#include "vm/locations.h"

[srdjan, 2013/07/17 16:13:04]

I do not think that assembler should depend on optimizing's compiler structure
like Location. IMHO, the function ToStackSlotAddress() should be moved into
machine dependent source file.

 #include "vm/simulator.h"
 
 namespace dart {
 
 // Forward declarations.
 class RuntimeEntry;
+class Location;
 
 class Label : public ValueObject {
  public:
   Label() : position_(0) { }
 
   ~Label() {
     // Assert if label is being destroyed with unresolved branches pending.
     ASSERT(!IsLinked());
   }
 
@@ skipping 217 matching lines @@
     ShifterOperand so(rm, shift, shift_imm);
 
     if ((shift == LSL) && (shift_imm == 0)) {
       kind_ = IndexRegister;
     } else {
       kind_ = ScaledIndexRegister;
     }
     encoding_ = so.encoding() | am | (static_cast<uint32_t>(rn) << kRnShift);
   }
 
-  bool Equals(const Address& other) {
+  static Address StackSlotAddress(const Location& stack_slot);
+
+  bool Equals(const Address& other) const {
     return (encoding_ == other.encoding_) && (kind_ == other.kind_);
   }
 
   static bool CanHoldLoadOffset(OperandSize type,
                                 int32_t offset,
                                 int32_t* offset_mask);
   static bool CanHoldStoreOffset(OperandSize type,
                                  int32_t offset,
                                  int32_t* offset_mask);
 
@@ skipping 558 matching lines @@
                                   Register value,
                                   Label* no_update);
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(Assembler);
 };
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_ARM_H_