[wasm] Support validation of asm.js modules with != 3 args.

src/builtins/ppc/builtins-ppc.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_PPC
 
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 1440 matching lines @@
 
 void Builtins::Generate_InstantiateAsmJs(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r3 : argument count (preserved for callee)
   //  -- r4 : new target (preserved for callee)
   //  -- r6 : target function (preserved for callee)
   // -----------------------------------
   Label failed;
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
+    // Preserve argument count for later compare.
+    __ Move(r5, r3);
     // Push a copy of the target function and the new target.
     // Push function as parameter to the runtime call.
     __ SmiTag(r3);
     __ Push(r3, r4, r6, r4);
 
     // Copy arguments from caller (stdlib, foreign, heap).
+    Label args_done;
+    __ cmpi(r5, Operand(0));
+    __ B(eq, &args_done);
+
+    Label args2;
+    __ cmpi(r5, Operand(1));
+    __ B(ne, &args2);
+    __ LoadP(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    0 * kPointerSize));
+    __ push(r5);
+    __ jmp(&args_done);
+
+    __ bind(&args2);
+    Label args3;
+    __ cmp(r5, Operand(2));
+    __ B(ne, &args3);
+    __ LoadP(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    1 * kPointerSize));
+    __ push(r5);
+    __ LoadP(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    0 * kPointerSize));
+    __ push(r5);
+    __ jmp(&args_done);
+
+    __ bind(&args3);
+    __ LoadP(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    2 * kPointerSize));
+    __ push(r5);
+    __ LoadP(r5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    1 * kPointerSize));
+    __ push(r5);
+    __ LoadP(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(r5, r5, Operand(1));
+    __ Move(r3, r5);
     for (int i = 2; i >= 0; --i) {
       __ LoadP(r4, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
                                       i * kPointerSize));
       __ push(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(r3, &failed);
     scope.GenerateLeaveFrame();
     __ Drop(4);
     __ Ret();
 
     __ bind(&failed);
     // Restore target function and new target.
     __ Pop(r3, r4, r6);
     __ SmiUntag(r3);
   }
   // On failure, tail call back to regular js.
-  GenerateTailCallToReturnedCode(masm, Runtime::kCompileLazy);
+  GenerateTailCallToReturnedCode(masm, Runtime::kCompileBaseline);
 }
 
 static void GenerateMakeCodeYoungAgainCommon(MacroAssembler* masm) {
   // For now, we are relying on the fact that make_code_young doesn't do any
   // garbage collection which allows us to save/restore the registers without
   // worrying about which of them contain pointers. We also don't build an
   // internal frame to make the code faster, since we shouldn't have to do stack
   // crawls in MakeCodeYoung. This seems a bit fragile.
 
   // Point r3 at the start of the PlatformCodeAge sequence.
@@ skipping 1505 matching lines @@
     __ CallRuntime(Runtime::kThrowStackOverflow);
     __ bkpt(0);
   }
 }
 
 #undef __
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC