[builtins] Construct builtin frame in String/Number ctors

src/x64/builtins-x64.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_X64
 
 #include "src/code-factory.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 1305 matching lines @@
     __ Move(arg_reg_2, Smi::FromInt(field_index));
     __ CallCFunction(
         ExternalReference::get_date_field_function(masm->isolate()), 2);
   }
   __ ret(1 * kPointerSize);
 
   // 3. Raise a TypeError if the receiver is not a date.
   __ bind(&receiver_not_date);
   {
     FrameScope scope(masm, StackFrame::MANUAL);
-    __ Push(rbp);
-    __ Move(rbp, rsp);
-    __ Push(rsi);
-    __ Push(rdi);
-    __ Push(Immediate(0));
+    __ Move(rbx, Smi::FromInt(0));
+    __ EnterBuiltinFrame(rsi, rdi, rbx);
     __ CallRuntime(Runtime::kThrowNotDateError);
   }
 }
 
 // static
 void Builtins::Generate_FunctionPrototypeApply(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- rax     : argc
   //  -- rsp[0]  : return address
   //  -- rsp[8]  : argArray
@@ skipping 325 matching lines @@
   }
 
   __ movp(rdx, rdi);
   // Run the native code for the Array function called as a normal function.
   // tail call a stub
   __ LoadRoot(rbx, Heap::kUndefinedValueRootIndex);
   ArrayConstructorStub stub(masm->isolate());
   __ TailCallStub(&stub);
 }
 
-
 // static
 void Builtins::Generate_MathMaxMin(MacroAssembler* masm, MathMaxMinKind kind) {
   // ----------- S t a t e -------------
   //  -- rax                 : number of arguments
   //  -- rdi                 : function
   //  -- rsi                 : context
   //  -- rsp[0]              : return address
   //  -- rsp[(argc - n) * 8] : arg[n] (zero-based)
   //  -- rsp[(argc + 1) * 8] : receiver
   // -----------------------------------
@@ skipping 22 matching lines @@
     // Load the double value of the parameter into xmm1, maybe converting the
     // parameter to a number first using the ToNumber builtin if necessary.
     Label convert, convert_smi, convert_number, done_convert;
     __ bind(&convert);
     __ JumpIfSmi(rbx, &convert_smi);
     __ JumpIfRoot(FieldOperand(rbx, HeapObject::kMapOffset),
                   Heap::kHeapNumberMapRootIndex, &convert_number);
     {
       // Parameter is not a Number, use the ToNumber builtin to convert it.
       FrameScope scope(masm, StackFrame::MANUAL);
-      __ Push(rbp);
-      __ Move(rbp, rsp);
-      __ Push(rsi);
-      __ Push(rdi);
       __ Integer32ToSmi(rax, rax);
       __ Integer32ToSmi(rcx, rcx);
-      __ Push(rax);
+      __ EnterBuiltinFrame(rsi, rdi, rax);
       __ Push(rcx);
       __ Push(rdx);
       __ movp(rax, rbx);
       __ Call(masm->isolate()->builtins()->ToNumber(), RelocInfo::CODE_TARGET);
       __ movp(rbx, rax);
       __ Pop(rdx);
       __ Pop(rcx);
-      __ Pop(rax);
-      __ Pop(rdi);
-      __ Pop(rsi);
+      __ LeaveBuiltinFrame(rsi, rdi, rax);
+      __ SmiToInteger32(rcx, rcx);
+      __ SmiToInteger32(rax, rax);
       {
         // Restore the double accumulator value (xmm0).
         Label restore_smi, done_restore;
         __ JumpIfSmi(rdx, &restore_smi, Label::kNear);
         __ Movsd(xmm0, FieldOperand(rdx, HeapNumber::kValueOffset));
         __ jmp(&done_restore, Label::kNear);
         __ bind(&restore_smi);
         __ SmiToDouble(xmm0, rdx);
         __ bind(&done_restore);
       }
-      __ SmiToInteger32(rcx, rcx);
-      __ SmiToInteger32(rax, rax);
-      __ leave();
     }
     __ jmp(&convert);
     __ bind(&convert_number);
     __ Movsd(xmm1, FieldOperand(rbx, HeapNumber::kValueOffset));
     __ jmp(&done_convert, Label::kNear);
     __ bind(&convert_smi);
     __ SmiToDouble(xmm1, rbx);
     __ bind(&done_convert);
 
     // Perform the actual comparison with the accumulator value on the left hand
@@ skipping 33 matching lines @@
   __ PushReturnAddressFrom(rcx);
   __ movp(rax, rdx);
   __ Ret();
 }
 
 // static
 void Builtins::Generate_NumberConstructor(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- rax                 : number of arguments
   //  -- rdi                 : constructor function
+  //  -- rsi                 : context
   //  -- rsp[0]              : return address
   //  -- rsp[(argc - n) * 8] : arg[n] (zero-based)
   //  -- rsp[(argc + 1) * 8] : receiver
   // -----------------------------------
 
-  // 1. Load the first argument into rax and get rid of the rest (including the
-  // receiver).
+  // 1. Load the first argument into rbx.
   Label no_arguments;
   {
     StackArgumentsAccessor args(rsp, rax);
     __ testp(rax, rax);
     __ j(zero, &no_arguments, Label::kNear);
     __ movp(rbx, args.GetArgumentOperand(1));
-    __ PopReturnAddressTo(rcx);
-    __ leap(rsp, Operand(rsp, rax, times_pointer_size, kPointerSize));
-    __ PushReturnAddressFrom(rcx);
-    __ movp(rax, rbx);
   }
 
   // 2a. Convert the first argument to a number.
-  __ Jump(masm->isolate()->builtins()->ToNumber(), RelocInfo::CODE_TARGET);
+  {
+    FrameScope scope(masm, StackFrame::MANUAL);
+    __ Integer32ToSmi(rax, rax);
+    __ EnterBuiltinFrame(rsi, rdi, rax);
+    __ movp(rax, rbx);
+    __ Call(masm->isolate()->builtins()->ToNumber(), RelocInfo::CODE_TARGET);
+    __ LeaveBuiltinFrame(rsi, rdi, rbx);  // Argc popped to rbc.
+    __ SmiToInteger32(rbx, rbx);
+  }
+
+  __ PopReturnAddressTo(rcx);
+  __ leap(rsp, Operand(rsp, rbx, times_pointer_size, kPointerSize));
+  __ PushReturnAddressFrom(rcx);
+  __ Ret();
 
   // 2b. No arguments, return +0 (already in rax).
   __ bind(&no_arguments);
   __ ret(1 * kPointerSize);
 }
 
 
 // static
 void Builtins::Generate_NumberConstructor_ConstructStub(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- rax                 : number of arguments
   //  -- rdi                 : constructor function
+  //  -- rsi                 : context
   //  -- rdx                 : new target
   //  -- rsp[0]              : return address
   //  -- rsp[(argc - n) * 8] : arg[n] (zero-based)
   //  -- rsp[(argc + 1) * 8] : receiver
   // -----------------------------------
 
   // 1. Make sure we operate in the context of the called function.
   __ movp(rsi, FieldOperand(rdi, JSFunction::kContextOffset));
 
-  // 2. Load the first argument into rbx and get rid of the rest (including the
-  // receiver).
+  // 2. Load the first argument into rbx.
   {
     StackArgumentsAccessor args(rsp, rax);
     Label no_arguments, done;
     __ testp(rax, rax);
     __ j(zero, &no_arguments, Label::kNear);
     __ movp(rbx, args.GetArgumentOperand(1));
     __ jmp(&done, Label::kNear);
     __ bind(&no_arguments);
     __ Move(rbx, Smi::FromInt(0));
     __ bind(&done);
-    __ PopReturnAddressTo(rcx);
-    __ leap(rsp, Operand(rsp, rax, times_pointer_size, kPointerSize));
-    __ PushReturnAddressFrom(rcx);
   }
 
   // 3. Make sure rbx is a number.
   {
     Label done_convert;
     __ JumpIfSmi(rbx, &done_convert);
     __ CompareRoot(FieldOperand(rbx, HeapObject::kMapOffset),
                    Heap::kHeapNumberMapRootIndex);
     __ j(equal, &done_convert);
     {
-      FrameScope scope(masm, StackFrame::INTERNAL);
+      FrameScope scope(masm, StackFrame::MANUAL);
+      __ Integer32ToSmi(rax, rax);
+      __ EnterBuiltinFrame(rsi, rdi, rax);
       __ Push(rdx);
-      __ Push(rdi);
       __ Move(rax, rbx);
       __ Call(masm->isolate()->builtins()->ToNumber(), RelocInfo::CODE_TARGET);
       __ Move(rbx, rax);
-      __ Pop(rdi);
       __ Pop(rdx);
+      __ LeaveBuiltinFrame(rsi, rdi, rax);
+      __ SmiToInteger32(rax, rax);
     }
     __ bind(&done_convert);
+
+    // Drop all arguments including the receiver.
+    __ PopReturnAddressTo(rcx);
+    __ leap(rsp, Operand(rsp, rax, times_pointer_size, kPointerSize));
+    __ PushReturnAddressFrom(rcx);
   }
 
   // 4. Check if new target and constructor differ.
   Label new_object;
   __ cmpp(rdx, rdi);
   __ j(not_equal, &new_object);
 
   // 5. Allocate a JSValue wrapper for the number.
   __ AllocateJSValue(rax, rdi, rbx, rcx, &new_object);
   __ Ret();
 
   // 6. Fallback to the runtime to create new object.
   __ bind(&new_object);
   {
+    // TODO(jgruber): Is a builtin frame needed here?

[jgruber, 2016/07/04 13:25:45]

Just double-checking - do we want a builtin frame here?

[Benedikt Meurer, 2016/07/04 16:45:36]

Yes because of new.target this is actually observable.

[jgruber, 2016/07/07 11:50:52]

Done.

     FrameScope scope(masm, StackFrame::INTERNAL);
     __ Push(rbx);  // the first argument
     FastNewObjectStub stub(masm->isolate());
     __ CallStub(&stub);
     __ Pop(FieldOperand(rax, JSValue::kValueOffset));
   }
+
   __ Ret();
 }
 
 
 // static
 void Builtins::Generate_StringConstructor(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- rax                 : number of arguments
   //  -- rdi                 : constructor function
+  //  -- rsi                 : context
   //  -- rsp[0]              : return address
   //  -- rsp[(argc - n) * 8] : arg[n] (zero-based)
   //  -- rsp[(argc + 1) * 8] : receiver
   // -----------------------------------
 
   // 1. Load the first argument into rax and get rid of the rest (including the
   // receiver).
   Label no_arguments;
   {
     StackArgumentsAccessor args(rsp, rax);
+    __ movp(r8, rax);  // Store argc in r8.
     __ testp(rax, rax);
     __ j(zero, &no_arguments, Label::kNear);
-    __ movp(rbx, args.GetArgumentOperand(1));
-    __ PopReturnAddressTo(rcx);
-    __ leap(rsp, Operand(rsp, rax, times_pointer_size, kPointerSize));
-    __ PushReturnAddressFrom(rcx);
-    __ movp(rax, rbx);
+    __ movp(rax, args.GetArgumentOperand(1));
   }
 
   // 2a. At least one argument, return rax if it's a string, otherwise
   // dispatch to appropriate conversion.
-  Label to_string, symbol_descriptive_string;
+  Label done, to_string, symbol_descriptive_string;
   {
     __ JumpIfSmi(rax, &to_string, Label::kNear);
     STATIC_ASSERT(FIRST_NONSTRING_TYPE == SYMBOL_TYPE);
     __ CmpObjectType(rax, FIRST_NONSTRING_TYPE, rdx);
     __ j(above, &to_string, Label::kNear);
     __ j(equal, &symbol_descriptive_string, Label::kNear);
-    __ Ret();
+    __ jmp(&done, Label::kNear);
   }
 
   // 2b. No arguments, return the empty string (and pop the receiver).
   __ bind(&no_arguments);
   {
     __ LoadRoot(rax, Heap::kempty_stringRootIndex);
     __ ret(1 * kPointerSize);
   }
 
   // 3a. Convert rax to a string.
   __ bind(&to_string);
   {
+    FrameScope scope(masm, StackFrame::MANUAL);
     ToStringStub stub(masm->isolate());
-    __ TailCallStub(&stub);
+    __ Integer32ToSmi(r8, r8);
+    __ EnterBuiltinFrame(rsi, rdi, r8);
+    __ CallStub(&stub);
+    __ LeaveBuiltinFrame(rsi, rdi, r8);
+    __ SmiToInteger32(r8, r8);
   }
+  __ jmp(&done, Label::kNear);
 
   // 3b. Convert symbol in rax to a string.
   __ bind(&symbol_descriptive_string);
   {
     __ PopReturnAddressTo(rcx);
+    __ leap(rsp, Operand(rsp, r8, times_pointer_size, kPointerSize));
     __ Push(rax);
     __ PushReturnAddressFrom(rcx);
     __ TailCallRuntime(Runtime::kSymbolDescriptiveString);

[jgruber, 2016/07/04 13:25:44]

No builtin frame here because SymbolDescriptiveString only throws when arg is
not a symbol (and we check before the call).

[Benedikt Meurer, 2016/07/04 16:45:36]

Acknowledged.

   }
+
+  __ bind(&done);
+  {
+    __ PopReturnAddressTo(rcx);
+    __ leap(rsp, Operand(rsp, r8, times_pointer_size, kPointerSize));
+    __ PushReturnAddressFrom(rcx);
+    __ Ret();
+  }
 }
 
 
 // static
 void Builtins::Generate_StringConstructor_ConstructStub(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- rax                 : number of arguments
   //  -- rdi                 : constructor function
   //  -- rdx                 : new target
+  //  -- rsi                 : context
   //  -- rsp[0]              : return address
   //  -- rsp[(argc - n) * 8] : arg[n] (zero-based)
   //  -- rsp[(argc + 1) * 8] : receiver
   // -----------------------------------
 
   // 1. Make sure we operate in the context of the called function.
   __ movp(rsi, FieldOperand(rdi, JSFunction::kContextOffset));
 
-  // 2. Load the first argument into rbx and get rid of the rest (including the
-  // receiver).
+  // 2. Load the first argument into rbx.
   {
     StackArgumentsAccessor args(rsp, rax);
     Label no_arguments, done;
     __ testp(rax, rax);
     __ j(zero, &no_arguments, Label::kNear);
     __ movp(rbx, args.GetArgumentOperand(1));
     __ jmp(&done, Label::kNear);
     __ bind(&no_arguments);
     __ LoadRoot(rbx, Heap::kempty_stringRootIndex);
     __ bind(&done);
-    __ PopReturnAddressTo(rcx);
-    __ leap(rsp, Operand(rsp, rax, times_pointer_size, kPointerSize));
-    __ PushReturnAddressFrom(rcx);
   }
 
   // 3. Make sure rbx is a string.
   {
     Label convert, done_convert;
     __ JumpIfSmi(rbx, &convert, Label::kNear);
     __ CmpObjectType(rbx, FIRST_NONSTRING_TYPE, rcx);
     __ j(below, &done_convert);
     __ bind(&convert);
     {
-      FrameScope scope(masm, StackFrame::INTERNAL);
+      FrameScope scope(masm, StackFrame::MANUAL);
       ToStringStub stub(masm->isolate());
+      __ Integer32ToSmi(rax, rax);
+      __ EnterBuiltinFrame(rsi, rdi, rax);
       __ Push(rdx);
-      __ Push(rdi);
       __ Move(rax, rbx);
       __ CallStub(&stub);
       __ Move(rbx, rax);
-      __ Pop(rdi);
       __ Pop(rdx);
+      __ LeaveBuiltinFrame(rsi, rdi, rax);
+      __ SmiToInteger32(rax, rax);
     }
     __ bind(&done_convert);
+
+    // Drop all arguments including the receiver.
+    __ PopReturnAddressTo(rcx);
+    __ leap(rsp, Operand(rsp, rax, times_pointer_size, kPointerSize));
+    __ PushReturnAddressFrom(rcx);
   }
 
   // 4. Check if new target and constructor differ.
   Label new_object;
   __ cmpp(rdx, rdi);
   __ j(not_equal, &new_object);
 
   // 5. Allocate a JSValue wrapper for the string.
   __ AllocateJSValue(rax, rdi, rbx, rcx, &new_object);
   __ Ret();
 
   // 6. Fallback to the runtime to create new object.
   __ bind(&new_object);
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
     __ Push(rbx);  // the first argument

[jgruber, 2016/07/04 13:25:44]

As above.

[Benedikt Meurer, 2016/07/04 16:45:36]

Yes, this is observable (thx to new.target...)

[jgruber, 2016/07/07 11:50:52]

Done.

     FastNewObjectStub stub(masm->isolate());
     __ CallStub(&stub);
     __ Pop(FieldOperand(rax, JSValue::kValueOffset));
   }
   __ Ret();
 }
 
 
 static void ArgumentsAdaptorStackCheck(MacroAssembler* masm,
                                        Label* stack_overflow) {
@@ skipping 1044 matching lines @@
   __ ret(0);
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64