Revert of [Interpreter] Implements calls through CallICStub in the interpreter.

src/ia32/builtins-ia32.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_IA32
 
 #include "src/code-factory.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 527 matching lines @@
   Label loop_header, loop_check;
   __ jmp(&loop_check);
   __ bind(&loop_header);
   __ Push(Operand(ebx, 0));
   __ sub(ebx, Immediate(kPointerSize));
   __ bind(&loop_check);
   __ cmp(ebx, array_limit);
   __ j(greater, &loop_header, Label::kNear);
 }
 
-static void Generate_InterpreterComputeLastArgumentAddress(MacroAssembler* masm,
-                                                           Register r) {
-  // Find the address of the last argument.
-  // ----------- S t a t e -------------
-  //  input: eax : Number of arguments.
-  //  input: ebx : Address of the first argument.
-  //  output: Register |r|: Address of the last argument.
-  // -----------------------------------
-  __ mov(r, eax);
-  __ add(r, Immediate(1));  // Add one for receiver.
-  __ shl(r, kPointerSizeLog2);
-  __ neg(r);
-  __ add(r, ebx);
-}
 
 // static
-void Builtins::Generate_InterpreterPushArgsAndCallICImpl(
+void Builtins::Generate_InterpreterPushArgsAndCallImpl(
     MacroAssembler* masm, TailCallMode tail_call_mode) {
   // ----------- S t a t e -------------
   //  -- eax : the number of arguments (not including the receiver)
   //  -- ebx : the address of the first argument to be pushed. Subsequent
   //           arguments should be consecutive above this, in the same order as
   //           they are to be pushed onto the stack.
   //  -- edi : the target to call (can be any Object).
-  //  -- edx : feedback slot id.
-  //  -- ecx : type feedback vector.
-  // -----------------------------------
-
-  {
-    FrameScope scope(masm, StackFrame::INTERNAL);
-    // Store type feedback vector on the stack since we ran out of registers.
-    __ Push(ecx);
-
-    // computes the address of last argument in ecx.
-    // ecx = ebx - (eax + 1) * kPointerSize.
-    Generate_InterpreterComputeLastArgumentAddress(masm, ecx);
-    Generate_InterpreterPushArgs(masm, ecx);
-
-    // Restore feedback vector to ebx from the stack. It was pushed
-    // before the arguments were pushed, so compute the correct offset.
-    __ mov(ebx, Operand(esp, eax, times_pointer_size, 1 * kPointerSize));
-
-    // Call via the CallIC stub.
-    CallICState call_ic_state(0, ConvertReceiverMode::kAny, tail_call_mode,
-                              true);
-    CallICStub stub(masm->isolate(), call_ic_state);
-    // TODO(mythria): This should be replaced by a TailCallStub, when we
-    // update the code to find the target IC from jump instructions.
-    __ CallStub(&stub);
-  }
-  __ Ret();
-}
-
-// static
-void Builtins::Generate_InterpreterPushArgsAndCallImpl(
-    MacroAssembler* masm, TailCallMode tail_call_mode) {
-  // ----------- S t a t e -------------
-  //  -- eax : the number of arguments (not including the receiver)
-  //  -- ebx : the address of the first argument to be pushed. Subsequent
-  //           arguments should be consecutive above this, in the same order as
-  //           they are to be pushed onto the stack.
-  //  -- edi : the target to call (can be any Object).
   // -----------------------------------
 
   // Pop return address to allow tail-call after pushing arguments.
   __ Pop(edx);
 
-  // computes the address of last argument in ecx.
-  // ecx = ebx - (eax + 1) * kPointerSize.
-  Generate_InterpreterComputeLastArgumentAddress(masm, ecx);
+  // Find the address of the last argument.
+  __ mov(ecx, eax);
+  __ add(ecx, Immediate(1));  // Add one for receiver.
+  __ shl(ecx, kPointerSizeLog2);
+  __ neg(ecx);
+  __ add(ecx, ebx);
+
   Generate_InterpreterPushArgs(masm, ecx);
 
   // Call the target.
   __ Push(edx);  // Re-push return address.
   __ Jump(masm->isolate()->builtins()->Call(ConvertReceiverMode::kAny,
                                             tail_call_mode),
           RelocInfo::CODE_TARGET);
 }
 
+
 // static
 void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- eax : the number of arguments (not including the receiver)
   //  -- edx : the new target
   //  -- edi : the constructor
   //  -- ebx : the address of the first argument to be pushed. Subsequent
   //           arguments should be consecutive above this, in the same order as
   //           they are to be pushed onto the stack.
   // -----------------------------------
 
+  // Save number of arguments on the stack below where arguments are going
+  // to be pushed.
+  __ mov(ecx, eax);
+  __ neg(ecx);
+  __ mov(Operand(esp, ecx, times_pointer_size, -kPointerSize), eax);
+  __ mov(eax, ecx);
+
   // Pop return address to allow tail-call after pushing arguments.
   __ Pop(ecx);
 
-  // Push edi in the slot meant for receiver. We need an extra register so
-  // store edi temporarily on the stack.
-  __ Push(edi);
+  // Find the address of the last argument.
+  __ shl(eax, kPointerSizeLog2);
+  __ add(eax, ebx);
 
-  // Find the address of the last argument.
-  __ mov(edi, eax);
-  __ neg(edi);
-  __ shl(edi, kPointerSizeLog2);
-  __ add(edi, ebx);
+  // Push padding for receiver.
+  __ Push(Immediate(0));
 
-  Generate_InterpreterPushArgs(masm, edi);
+  Generate_InterpreterPushArgs(masm, eax);
 
-  // Restore number of arguments from slot on stack. edi was pushed at
-  // the slot meant for receiver.
-  __ mov(edi, Operand(esp, eax, times_pointer_size, 0));
+  // Restore number of arguments from slot on stack.
+  __ mov(eax, Operand(esp, -kPointerSize));
 
   // Re-push return address.
   __ Push(ecx);
 
   // Call the constructor with unmodified eax, edi, ebi values.
   __ Jump(masm->isolate()->builtins()->Construct(), RelocInfo::CODE_TARGET);
 }
 
 
 static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) {
@@ skipping 1230 matching lines @@
   Comment cmnt(masm, "[ PrepareForTailCall");
 
   // Prepare for tail call only if the debugger is not active.
   Label done;
   ExternalReference debug_is_active =
       ExternalReference::debug_is_active_address(masm->isolate());
   __ movzx_b(scratch1, Operand::StaticVariable(debug_is_active));
   __ cmp(scratch1, Immediate(0));
   __ j(not_equal, &done, Label::kNear);
 
-  // Drop possible internal frame pushed for calling CallICStub.
-  // TODO(mythria): when we tail call the CallICStub, remove this.
-  {
-    Label no_internal_callic_frame;
-    __ cmp(Operand(ebp, StandardFrameConstants::kMarkerOffset),
-           Immediate(Smi::FromInt(StackFrame::INTERNAL)));
-    __ j(not_equal, &no_internal_callic_frame, Label::kNear);
-    __ mov(ebp, Operand(ebp, StandardFrameConstants::kCallerFPOffset));
-    __ bind(&no_internal_callic_frame);
-  }
-
   // Drop possible interpreter handler/stub frame.
   {
     Label no_interpreter_frame;
     __ cmp(Operand(ebp, StandardFrameConstants::kMarkerOffset),
            Immediate(Smi::FromInt(StackFrame::STUB)));
     __ j(not_equal, &no_interpreter_frame, Label::kNear);
     __ mov(ebp, Operand(ebp, StandardFrameConstants::kCallerFPOffset));
     __ bind(&no_interpreter_frame);
   }
 
@@ skipping 777 matching lines @@
 
   __ bind(&ok);
   __ ret(0);
 }
 
 #undef __
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32