Restructure to support recursive invocation of the CFG builder. Add...

src/ia32/cfg-ia32.cc

Index: src/ia32/cfg-ia32.cc
===================================================================
--- src/ia32/cfg-ia32.cc	(revision 2602)
+++ src/ia32/cfg-ia32.cc	(working copy)
@@ -59,9 +59,10 @@
     __ mov(ebp, esp);
     __ push(esi);
     __ push(edi);
-    if (local_count_ > 0) {
+    int count = CfgGlobals::current()->fun()->scope()->num_stack_slots();
+    if (count > 0) {
       __ Set(eax, Immediate(Factory::undefined_value()));
-      for (int i = 0; i < local_count_; i++) {
+      for (int i = 0; i < count; i++) {
         __ push(eax);
       }
     }
@@ -97,7 +98,8 @@
   __ RecordJSReturn();
   __ mov(esp, ebp);
   __ pop(ebp);
-  __ ret((parameter_count_ + 1) * kPointerSize);
+  int count = CfgGlobals::current()->fun()->scope()->num_parameters();
+  __ ret((count + 1) * kPointerSize);
 }
 
 
@@ -111,6 +113,25 @@
   __ mov(reg, Immediate(handle_));
 }
 
+
+void SlotLocation::ToRegister(MacroAssembler* masm, Register reg) {
+  switch (type_) {
+    case Slot::PARAMETER: {
+      int count = CfgGlobals::current()->fun()->scope()->num_parameters();
+      __ mov(reg, Operand(ebp, (1 + count - index_) * kPointerSize));
+      break;
+    }
+    case Slot::LOCAL: {
+      const int kOffset = JavaScriptFrameConstants::kLocal0Offset;
+      __ mov(reg, Operand(ebp, kOffset - index_ * kPointerSize));
+      break;
+    }
+    default:
+      UNREACHABLE();
+  }
+}
+
+
 #undef __
 
 } }  // namespace v8::internal