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

runtime/vm/flow_graph_compiler_ia32.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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 738 matching lines @@
     }
     AllocateRegistersLocally(instr);
   } else if (instr->MayThrow()  &&
              (CurrentTryIndex() != CatchClauseNode::kInvalidTryIndex)) {
     // Optimized try-block: Sync locals to fixed stack locations.
     EmitTrySync(instr, CurrentTryIndex());
   }
 }
 
 
-void FlowGraphCompiler::EmitTrySyncMove(Address dest,
+void FlowGraphCompiler::EmitTrySyncMove(intptr_t dest_offset,
                                         Location loc,
                                         bool* push_emitted) {
+  const Address dest(EBP, dest_offset);
   if (loc.IsConstant()) {
     if (!*push_emitted) {
       __ pushl(EAX);
       *push_emitted = true;
     }
     __ LoadObject(EAX, loc.constant());
     __ movl(dest, EAX);
   } else if (loc.IsRegister()) {
     if (*push_emitted && loc.reg() == EAX) {
       __ movl(EAX, Address(ESP, 0));
       __ movl(dest, EAX);
     } else {
       __ movl(dest, loc.reg());
     }
   } else {
     Address src = loc.ToStackSlotAddress();
     if (!src.Equals(dest)) {

[regis, 2013/07/17 18:46:45]

I guess Equals can remain on Intel, or you compare the offsets instead.

[zra, 2013/07/17 20:40:11]

I have left Equals here, but I think this is the only place it is used.

       if (!*push_emitted) {
         __ pushl(EAX);
         *push_emitted = true;
       }
       __ movl(EAX, src);
       __ movl(dest, EAX);
     }
   }
 }
 
 
 void FlowGraphCompiler::EmitTrySync(Instruction* instr, intptr_t try_index) {
   ASSERT(is_optimizing());
   Environment* env = instr->env();
   CatchBlockEntryInstr* catch_block =
       flow_graph().graph_entry()->GetCatchEntry(try_index);
   const GrowableArray<Definition*>* idefs = catch_block->initial_definitions();
   // Parameters.
   intptr_t i = 0;
   bool push_emitted = false;
   const intptr_t num_non_copied_params = flow_graph().num_non_copied_params();
   const intptr_t param_base =
       kParamEndSlotFromFp + num_non_copied_params;
   for (; i < num_non_copied_params; ++i) {
     if ((*idefs)[i]->IsConstant()) continue;  // Common constants
     Location loc = env->LocationAt(i);
-    Address dest(EBP, (param_base - i) * kWordSize);
-    EmitTrySyncMove(dest, loc, &push_emitted);
+    EmitTrySyncMove((param_base - i) * kWordSize, loc, &push_emitted);
   }
 
   // Process locals. Skip exception_var and stacktrace_var.
   CatchEntryInstr* catch_entry = catch_block->next()->AsCatchEntry();
   intptr_t local_base = kFirstLocalSlotFromFp + num_non_copied_params;
   intptr_t ex_idx = local_base - catch_entry->exception_var().index();
   intptr_t st_idx = local_base - catch_entry->stacktrace_var().index();
   for (; i < flow_graph().variable_count(); ++i) {
     if (i == ex_idx || i == st_idx) continue;
     if ((*idefs)[i]->IsConstant()) continue;
     Location loc = env->LocationAt(i);
-    Address dest(EBP, (local_base - i) * kWordSize);
-    EmitTrySyncMove(dest, loc, &push_emitted);
+    EmitTrySyncMove((local_base - i) * kWordSize, loc, &push_emitted);
     // Update safepoint bitmap to indicate that the target location
     // now contains a pointer.
     instr->locs()->stack_bitmap()->Set(i - num_non_copied_params, true);
   }
   if (push_emitted) {
     __ popl(EAX);
   }
 }
 
 
@@ skipping 1091 matching lines @@
   __ movups(reg, Address(ESP, 0));
   __ addl(ESP, Immediate(kFpuRegisterSize));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32