S390: [stubs] ToNumberStub --> ToNumber builtin.

src/s390/builtins-s390.cc

 // Copyright 2014 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_S390
 
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 148 matching lines @@
   {
     // Check if all parameters done.
     __ CmpLogicalP(r4, sp);
     __ ble(&done_loop);
 
     // Load the next parameter tagged value into r2.
     __ lay(r4, MemOperand(r4, -kPointerSize));
     __ LoadP(r2, MemOperand(r4));
 
     // Load the double value of the parameter into d2, maybe converting the
-    // parameter to a number first using the ToNumberStub if necessary.
+    // parameter to a number first using the ToNumber builtin if necessary.
     Label convert, convert_smi, convert_number, done_convert;
     __ bind(&convert);
     __ JumpIfSmi(r2, &convert_smi);
     __ LoadP(r6, FieldMemOperand(r2, HeapObject::kMapOffset));
     __ JumpIfRoot(r6, Heap::kHeapNumberMapRootIndex, &convert_number);
     {
-      // Parameter is not a Number, use the ToNumberStub to convert it.
+      // Parameter is not a Number, use the ToNumber builtin to convert it.
       FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
       __ SmiTag(r5);
       __ Push(r3, r4, r5);
-      ToNumberStub stub(masm->isolate());
-      __ CallStub(&stub);
+      __ Call(masm->isolate()->builtins()->ToNumber(), RelocInfo::CODE_TARGET);
       __ Pop(r3, r4, r5);
       __ SmiUntag(r5);
       {
         // Restore the double accumulator value (d1).
         Label done_restore;
         __ SmiToDouble(d1, r3);
         __ JumpIfSmi(r3, &done_restore);
         __ LoadDouble(d1, FieldMemOperand(r3, HeapNumber::kValueOffset));
         __ bind(&done_restore);
       }
@@ skipping 55 matching lines @@
     __ CmpP(r2, Operand::Zero());
     __ beq(&no_arguments);
     __ SubP(r2, r2, Operand(1));
     __ ShiftLeftP(r2, r2, Operand(kPointerSizeLog2));
     __ la(sp, MemOperand(sp, r2));
     __ LoadP(r2, MemOperand(sp));
     __ Drop(2);
   }
 
   // 2a. Convert the first argument to a number.
-  ToNumberStub stub(masm->isolate());
-  __ TailCallStub(&stub);
+  __ Jump(masm->isolate()->builtins()->ToNumber(), RelocInfo::CODE_TARGET);
 
   // 2b. No arguments, return +0.
   __ bind(&no_arguments);
   __ LoadSmiLiteral(r2, Smi::FromInt(0));
   __ Ret(1);
 }
 
 // static
 void Builtins::Generate_NumberConstructor_ConstructStub(MacroAssembler* masm) {
   // ----------- S t a t e -------------
@@ skipping 29 matching lines @@
   // 3. Make sure r4 is a number.
   {
     Label done_convert;
     __ JumpIfSmi(r4, &done_convert);
     __ CompareObjectType(r4, r6, r6, HEAP_NUMBER_TYPE);
     __ beq(&done_convert);
     {
       FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
       __ Push(r3, r5);
       __ LoadRR(r2, r4);
-      ToNumberStub stub(masm->isolate());
-      __ CallStub(&stub);
+      __ Call(masm->isolate()->builtins()->ToNumber(), RelocInfo::CODE_TARGET);
       __ LoadRR(r4, r2);
       __ Pop(r3, r5);
     }
     __ bind(&done_convert);
   }
 
   // 4. Check if new target and constructor differ.
   Label new_object;
   __ CmpP(r3, r5);
   __ bne(&new_object);
@@ skipping 2408 matching lines @@
   __ And(r0, r4, Operand(String::kContainsCachedArrayIndexMask));
   __ bne(&runtime);
   __ IndexFromHash(r4, r2);
   __ Ret();
 
   __ bind(&runtime);
   __ push(r2);  // Push argument.
   __ TailCallRuntime(Runtime::kStringToNumber);
 }
 
+// static
+void Builtins::Generate_ToNumber(MacroAssembler* masm) {
+  // The ToNumber stub takes one argument in r2.
+  STATIC_ASSERT(kSmiTag == 0);
+  __ TestIfSmi(r2);
+  __ Ret(eq);
+
+  __ CompareObjectType(r2, r3, r3, HEAP_NUMBER_TYPE);
+  // r2: receiver
+  // r3: receiver instance type
+  __ Ret(eq);
+
+  __ Jump(masm->isolate()->builtins()->NonNumberToNumber(),
+          RelocInfo::CODE_TARGET);
+}
+
+// static
+void Builtins::Generate_NonNumberToNumber(MacroAssembler* masm) {
+  // The NonNumberToNumber stub takes one argument in r2.
+  __ AssertNotNumber(r2);
+
+  __ CompareObjectType(r2, r3, r3, FIRST_NONSTRING_TYPE);
+  // r2: receiver
+  // r3: receiver instance type
+  __ Jump(masm->isolate()->builtins()->StringToNumber(), RelocInfo::CODE_TARGET,
+          lt);
+
+  Label not_oddball;
+  __ CmpP(r3, Operand(ODDBALL_TYPE));
+  __ bne(&not_oddball);
+  __ LoadP(r2, FieldMemOperand(r2, Oddball::kToNumberOffset));
+  __ Ret();
+  __ bind(&not_oddball);
+
+  __ push(r2);  // Push argument.
+  __ TailCallRuntime(Runtime::kToNumber);
+}
+
 void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r2 : actual number of arguments
   //  -- r3 : function (passed through to callee)
   //  -- r4 : expected number of arguments
   //  -- r5 : new target (passed through to callee)
   // -----------------------------------
 
   Label invoke, dont_adapt_arguments, stack_overflow;
 
@@ skipping 117 matching lines @@
     __ bkpt(0);
   }
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390