Support immediate and memory operands for PushArgumentInstr in optimized code.

runtime/vm/flow_graph_compiler_ia32.cc

 // Copyright (c) 2012, 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 1318 matching lines @@
     ASSERT(offset == (xmm_regs_count * kDoubleSize));
     __ addl(ESP, Immediate(offset));
   }
 }
 
 
 #undef __
 #define __ compiler_->assembler()->
 
 
-static Address ToStackSlotAddress(Location loc) {
-  const intptr_t index = loc.stack_index();
-  if (index < 0) {
-    const intptr_t offset = (1 - index)  * kWordSize;
-    return Address(EBP, offset);
-  } else {
-    const intptr_t offset =
-        (ParsedFunction::kFirstLocalSlotIndex - index) * kWordSize;
-    return Address(EBP, offset);
-  }
-}
-
-
 void ParallelMoveResolver::EmitMove(int index) {
   MoveOperands* move = moves_[index];
   const Location source = move->src();
   const Location destination = move->dest();
 
   if (source.IsRegister()) {
     if (destination.IsRegister()) {
       __ movl(destination.reg(), source.reg());
     } else {
       ASSERT(destination.IsStackSlot());
-      __ movl(ToStackSlotAddress(destination), source.reg());
+      __ movl(destination.ToStackSlotAddress(), source.reg());
     }
   } else if (source.IsStackSlot()) {
     if (destination.IsRegister()) {
-      __ movl(destination.reg(), ToStackSlotAddress(source));
+      __ movl(destination.reg(), source.ToStackSlotAddress());
     } else {
       ASSERT(destination.IsStackSlot());
-      MoveMemoryToMemory(ToStackSlotAddress(destination),
-                         ToStackSlotAddress(source));
+      MoveMemoryToMemory(destination.ToStackSlotAddress(),
+                         source.ToStackSlotAddress());
     }
   } else if (source.IsXmmRegister()) {
     if (destination.IsXmmRegister()) {
       // Optimization manual recommends using MOVAPS for register
       // to register moves.
       __ movaps(destination.xmm_reg(), source.xmm_reg());
     } else {
       ASSERT(destination.IsDoubleStackSlot());
-      __ movsd(ToStackSlotAddress(destination), source.xmm_reg());
+      __ movsd(destination.ToStackSlotAddress(), source.xmm_reg());
     }
   } else if (source.IsDoubleStackSlot()) {
     if (destination.IsXmmRegister()) {
-      __ movsd(destination.xmm_reg(), ToStackSlotAddress(source));
+      __ movsd(destination.xmm_reg(), source.ToStackSlotAddress());
     } else {
       ASSERT(destination.IsDoubleStackSlot());
-      __ movsd(XMM0, ToStackSlotAddress(source));
-      __ movsd(ToStackSlotAddress(destination), XMM0);
+      __ movsd(XMM0, source.ToStackSlotAddress());
+      __ movsd(destination.ToStackSlotAddress(), XMM0);
     }
   } else {
     ASSERT(source.IsConstant());
     if (destination.IsRegister()) {
       const Object& constant = source.constant();
       if (constant.IsSmi() && (Smi::Cast(constant).Value() == 0)) {
         __ xorl(destination.reg(), destination.reg());
       } else {
         __ LoadObject(destination.reg(), constant);
       }
     } else {
       ASSERT(destination.IsStackSlot());
-      StoreObject(ToStackSlotAddress(destination), source.constant());
+      StoreObject(destination.ToStackSlotAddress(), source.constant());
     }
   }
 
   move->Eliminate();
 }
 
 
 void ParallelMoveResolver::EmitSwap(int index) {
   MoveOperands* move = moves_[index];
   const Location source = move->src();
   const Location destination = move->dest();
 
   if (source.IsRegister() && destination.IsRegister()) {
     __ xchgl(destination.reg(), source.reg());
   } else if (source.IsRegister() && destination.IsStackSlot()) {
-    Exchange(source.reg(), ToStackSlotAddress(destination));
+    Exchange(source.reg(), destination.ToStackSlotAddress());
   } else if (source.IsStackSlot() && destination.IsRegister()) {
-    Exchange(destination.reg(), ToStackSlotAddress(source));
+    Exchange(destination.reg(), source.ToStackSlotAddress());
   } else if (source.IsStackSlot() && destination.IsStackSlot()) {
-    Exchange(ToStackSlotAddress(destination), ToStackSlotAddress(source));
+    Exchange(destination.ToStackSlotAddress(), source.ToStackSlotAddress());
   } else if (source.IsXmmRegister() && destination.IsXmmRegister()) {
     __ movaps(XMM0, source.xmm_reg());
     __ movaps(source.xmm_reg(), destination.xmm_reg());
     __ movaps(destination.xmm_reg(), XMM0);
   } else if (source.IsXmmRegister() || destination.IsXmmRegister()) {
     ASSERT(destination.IsDoubleStackSlot() || source.IsDoubleStackSlot());
     XmmRegister reg = source.IsXmmRegister() ? source.xmm_reg()
                                              : destination.xmm_reg();
-    Address slot_address =
-        ToStackSlotAddress(source.IsXmmRegister() ? destination : source);
+    Address slot_address = source.IsXmmRegister()
+        ? destination.ToStackSlotAddress()
+        : source.ToStackSlotAddress();
 
     __ movsd(XMM0, slot_address);
     __ movsd(slot_address, reg);
     __ movaps(reg, XMM0);
   } else {
     UNREACHABLE();
   }
 
   // The swap of source and destination has executed a move from source to
   // destination.
@@ skipping 58 matching lines @@
   __ popl(ECX);
   __ popl(EAX);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32