Index: src/builtins/arm/builtins-arm.cc |
diff --git a/src/builtins/arm/builtins-arm.cc b/src/builtins/arm/builtins-arm.cc |
index e0bb922ecc57953b8efbaaf15f49bd7add337dc0..4604da39c2e943e34833c15e5bd0b4ca634265bb 100644 |
--- a/src/builtins/arm/builtins-arm.cc |
+++ b/src/builtins/arm/builtins-arm.cc |
@@ -1449,6 +1449,8 @@ void Builtins::Generate_InstantiateAsmJs(MacroAssembler* masm) { |
Label failed; |
{ |
FrameScope scope(masm, StackFrame::INTERNAL); |
+ // Preserve argument count for later compare. |
+ __ Move(r4, r0); |
// Push the number of arguments to the callee. |
__ SmiTag(r0); |
__ push(r0); |
@@ -1459,17 +1461,61 @@ void Builtins::Generate_InstantiateAsmJs(MacroAssembler* masm) { |
// The function. |
__ push(r1); |
// Copy arguments from caller (stdlib, foreign, heap). |
- for (int i = 2; i >= 0; --i) { |
- __ ldr(r4, MemOperand(fp, StandardFrameConstants::kCallerSPOffset + |
- i * kPointerSize)); |
- __ push(r4); |
- } |
+ Label args_done; |
+ __ cmp(r4, Operand(0)); |
+ __ b(eq, &args_done); |
+ |
+ Label args2; |
+ __ cmp(r4, Operand(1)); |
+ __ b(ne, &args2); |
+ __ ldr(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset + |
+ 0 * kPointerSize)); |
+ __ push(r5); |
+ __ jmp(&args_done); |
+ |
+ __ bind(&args2); |
+ Label args3; |
+ __ cmp(r4, Operand(2)); |
+ __ b(ne, &args3); |
+ __ ldr(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset + |
+ 1 * kPointerSize)); |
+ __ push(r5); |
+ __ ldr(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset + |
+ 0 * kPointerSize)); |
+ __ push(r5); |
+ __ jmp(&args_done); |
+ |
+ __ bind(&args3); |
+ __ ldr(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset + |
+ 2 * kPointerSize)); |
+ __ push(r5); |
+ __ ldr(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset + |
+ 1 * kPointerSize)); |
+ __ push(r5); |
+ __ ldr(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset + |
+ 0 * kPointerSize)); |
+ __ push(r5); |
+ __ bind(&args_done); |
+ |
+ // Increment and restore argument count to call runtime method |
+ // with function as extra argument. |
+ __ add(r4, r4, Operand(1)); |
+ __ Move(r0, r4); |
// Call runtime, on success unwind frame, and parent frame. |
- __ CallRuntime(Runtime::kInstantiateAsmJs, 4); |
+ __ CallRuntime(Runtime::kInstantiateAsmJs, -1); |
// A smi 0 is returned on failure, an object on success. |
__ JumpIfSmi(r0, &failed); |
+ |
+ __ pop(r4); |
+ __ pop(r4); |
+ __ pop(r4); |
+ __ SmiUntag(r4); |
scope.GenerateLeaveFrame(); |
- __ Drop(4); |
+ |
+ __ pop(r5); |
+ __ add(r4, r4, Operand(1)); |
+ __ add(sp, sp, Operand(r4, LSL, kPointerSizeLog2)); |
+ __ push(r5); |
__ Ret(); |
__ bind(&failed); |
@@ -1480,7 +1526,7 @@ void Builtins::Generate_InstantiateAsmJs(MacroAssembler* masm) { |
__ SmiUntag(r0); |
} |
// On failure, tail call back to regular js. |
- GenerateTailCallToReturnedCode(masm, Runtime::kCompileLazy); |
+ GenerateTailCallToReturnedCode(masm, Runtime::kCompileBaseline); |
} |
static void GenerateMakeCodeYoungAgainCommon(MacroAssembler* masm) { |