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

src/x64/cfg-x64.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 42 matching lines @@
 void EntryNode::Compile(MacroAssembler* masm) {
   ASSERT(!is_marked());
   is_marked_ = true;
   Label deferred_enter, deferred_exit;
   {
     Comment cmnt(masm, "[ EntryNode");
     __ push(rbp);
     __ movq(rbp, rsp);
     __ push(rsi);
     __ push(rdi);
-    if (local_count_ > 0) {
+    int count = CfgGlobals::current()->fun()->scope()->num_stack_slots();
+    if (count > 0) {
       __ movq(kScratchRegister, Factory::undefined_value(),
               RelocInfo::EMBEDDED_OBJECT);
-      for (int i = 0; i < local_count_; i++) {
+      for (int i = 0; i < count; i++) {
         __ push(kScratchRegister);
       }
     }
     if (FLAG_trace) {
       __ CallRuntime(Runtime::kTraceEnter, 0);
     }
     if (FLAG_check_stack) {
       ExternalReference stack_limit =
           ExternalReference::address_of_stack_guard_limit();
       __ movq(kScratchRegister, stack_limit);
@@ skipping 17 matching lines @@
   is_marked_ = true;
 
   Comment cmnt(masm, "[ ExitNode");
   if (FLAG_trace) {
     __ push(rax);
     __ CallRuntime(Runtime::kTraceExit, 1);
   }
   __ RecordJSReturn();
   __ movq(rsp, rbp);
   __ pop(rbp);
-  __ ret((parameter_count_ + 1) * kPointerSize);
+  int count = CfgGlobals::current()->fun()->scope()->num_parameters();
+  __ ret((count + 1) * kPointerSize);
   // Add padding that will be overwritten by a debugger breakpoint.
   // "movq rsp, rbp; pop rbp" has length 5.  "ret k" has length 2.
   const int kPadding = Debug::kX64JSReturnSequenceLength - 5 - 2;
   for (int i = 0; i < kPadding; ++i) {
     __ int3();
   }
 }
 
 
 void ReturnInstr::Compile(MacroAssembler* masm) {
   Comment cmnt(masm, "[ ReturnInstr");
   value_->ToRegister(masm, rax);
 }
 
 
 void Constant::ToRegister(MacroAssembler* masm, Register reg) {
   __ Move(reg, handle_);
 }
 
+
+void SlotLocation::ToRegister(MacroAssembler* masm, Register reg) {
+  switch (type_) {
+    case Slot::PARAMETER: {
+      int count = CfgGlobals::current()->fun()->scope()->num_parameters();
+      __ movq(reg, Operand(rbp, (1 + count - index_) * kPointerSize));
+      break;
+    }
+    case Slot::LOCAL: {
+      const int kOffset = JavaScriptFrameConstants::kLocal0Offset;
+      __ movq(reg, Operand(rbp, kOffset - index_ * kPointerSize));
+      break;
+    }
+    default:
+      UNREACHABLE();
+  }
+}
+
 #undef __
 
 } }  // namespace v8::internal