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

runtime/vm/locations.cc

 // 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.
 
 #include "vm/locations.h"
 
 #include "vm/assembler.h"
 #include "vm/il_printer.h"
 #include "vm/intermediate_language.h"
 #include "vm/flow_graph_compiler.h"
@@ skipping 69 matching lines @@
 
 
 Location Location::AnyOrConstant(Value* value) {
   ConstantInstr* constant = value->definition()->AsConstant();
   return (constant != NULL)
       ? Location::Constant(constant->value())
       : Location::Any();
 }
 
 
-// TODO(regis): Remove all occurences of Address in the architecture independent
-// portion of the vm.
-Address Location::ToStackSlotAddress() const {
+intptr_t Location::ToStackSlotOffset() const {
   const intptr_t index = stack_index();
   if (index < 0) {
     const intptr_t offset = (kParamEndSlotFromFp - index)  * kWordSize;
-    return Address(FPREG, offset);
+    return offset;
   } else {
     const intptr_t offset = (kFirstLocalSlotFromFp - index) * kWordSize;
-    return Address(FPREG, offset);
+    return offset;
   }
 }
 
 
 const char* Location::Name() const {
   switch (kind()) {
     case kInvalid: return "?";
     case kRegister: return Assembler::RegisterName(reg());
     case kFpuRegister: return Assembler::FpuRegisterName(fpu_reg());
     case kStackSlot: return "S";
@@ skipping 64 matching lines @@
 
   if (!out().IsInvalid()) {
     f->Print(" => ");
     out().PrintTo(f);
   }
 
   if (always_calls()) f->Print(" C");
 }
 
 }  // namespace dart