Add spill slot locations.

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 1091 matching lines @@
   __ SmiUntag(temp);
   __ cvtsi2sd(result, temp);
   __ Bind(&done);
 }
 
 
 #undef __
 #define __ compiler_->assembler()->
 
 
+static Address ToAddress(Location loc) {

[srdjan, 2012/07/23 16:18:59]

The name is to generic: s/ToAddress/ToSpillAddress/

+  ASSERT(loc.IsSpillSlot());
+  const intptr_t offset =
+      (ParsedFunction::kFirstLocalSlotIndex - loc.spill_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();
 
-  ASSERT(destination.IsRegister());
   if (source.IsRegister()) {
-    __ movl(destination.reg(), source.reg());
+    if (destination.IsRegister()) {
+      __ movl(destination.reg(), source.reg());
+    } else {
+      ASSERT(destination.IsSpillSlot());
+      __ movl(ToAddress(destination), source.reg());
+    }
+  } else if (source.IsSpillSlot()) {
+    if (destination.IsRegister()) {
+      __ movl(destination.reg(), ToAddress(source));
+    } else {
+      ASSERT(destination.IsSpillSlot());
+      // TODO(vegorov): allocate temporary register for such moves.
+      __ pushl(EAX);
+      __ movl(EAX, ToAddress(source));
+      __ movl(ToAddress(destination), EAX);
+      __ popl(EAX);
+    }
   } else {
     ASSERT(source.IsConstant());
-    __ LoadObject(destination.reg(), source.constant());
+    if (destination.IsRegister()) {
+      __ LoadObject(destination.reg(), source.constant());
+    } else {
+      ASSERT(destination.IsSpillSlot());
+      // TODO(vegorov): allocate temporary register for such moves.
+      __ pushl(EAX);
+      __ LoadObject(EAX, source.constant());
+      __ movl(ToAddress(destination), EAX);
+      __ popl(EAX);
+    }
   }
+
   move->Eliminate();
 }
 
 
 void ParallelMoveResolver::EmitSwap(int index) {
   MoveOperands* move = moves_[index];
   const Location source = move->src();
   const Location destination = move->dest();
 
-  ASSERT(source.IsRegister() && destination.IsRegister());
-  __ xchgl(destination.reg(), source.reg());
+  if (source.IsRegister() && destination.IsRegister()) {
+    __ xchgl(destination.reg(), source.reg());
+  } else if (source.IsRegister() && destination.IsSpillSlot()) {
+    // TODO(vegorov): allocate temporary register for such moves.
+    Register scratch = (source.reg() == EAX) ? ECX : EAX;
+    __ pushl(scratch);
+    __ movl(scratch, ToAddress(destination));
+    __ xchgl(scratch, source.reg());
+    __ movl(ToAddress(destination), scratch);
+    __ popl(scratch);
+  } else if (source.IsSpillSlot() && destination.IsRegister()) {
+    // TODO(vegorov): allocate temporary register for such moves.
+    Register scratch = (destination.reg() == EAX) ? ECX : EAX;
+    __ pushl(scratch);
+    __ movl(scratch, ToAddress(source));
+    __ xchgl(scratch, destination.reg());
+    __ movl(ToAddress(source), scratch);
+    __ popl(scratch);
+  } else if (source.IsSpillSlot() && destination.IsSpillSlot()) {
+    // TODO(vegorov): allocate temporary registers for such moves.
+    __ pushl(EAX);
+    __ pushl(ECX);
+    __ movl(EAX, ToAddress(source));

[Kevin Millikin (Google), 2012/07/23 12:52:30]

This code would be much nicer if there were helpers as in the x64 macro
assembler.  Perhaps they belong to the ParallelMoveResolver and implemented on
all platforms.

[Vyacheslav Egorov (Google), 2012/07/23 14:06:10]

Done. But it looks a bit ugly because on x64 only assembler can use TMP so
helpers in Resolver just delegate to assembler helpers.

+    __ movl(ECX, ToAddress(destination));

[srdjan, 2012/07/23 16:18:59]

Please upload the latest CL once comments are addressed.

+    __ movl(ToAddress(source), ECX);
+    __ movl(ToAddress(destination), EAX);
+    __ popl(ECX);
+    __ popl(EAX);
+  } else {
+    UNREACHABLE();
+  }
 
   // The swap of source and destination has executed a move from source to
   // destination.
   move->Eliminate();
 
   // Any unperformed (including pending) move with a source of either
   // this move's source or destination needs to have their source
   // changed to reflect the state of affairs after the swap.
   for (int i = 0; i < moves_.length(); ++i) {
     const MoveOperands& other_move = *moves_[i];
     if (other_move.Blocks(source)) {
       moves_[i]->set_src(destination);
     } else if (other_move.Blocks(destination)) {
       moves_[i]->set_src(source);
     }
   }
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32