[Liftoff] [cleanup] Move code out of platform dependent method

Before doing an indirect call, we always have to call {PrepareCall}.
Thus move this code out into platform-independent code. This also
slightly simplifies the API for {CallIndirect}.

R=ahaas@chromium.org

Bug: v8:6600
Change-Id: Id88ae5a9e73d1b6526131a5789205eda12b660de
Reviewed-on: https://chromium-review.googlesource.com/911369
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51230}

src/wasm/baseline/arm/liftoff-assembler-arm.h

@@ -201,8 +201,7 @@ void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
 
 void LiftoffAssembler::CallIndirect(wasm::FunctionSig* sig,
                                     compiler::CallDescriptor* call_descriptor,
-                                    Register target,
-                                    uint32_t* max_used_spill_slot) {
+                                    Register target) {
   UNIMPLEMENTED();
 }
 

src/wasm/baseline/arm64/liftoff-assembler-arm64.h

@@ -201,8 +201,7 @@ void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
 
 void LiftoffAssembler::CallIndirect(wasm::FunctionSig* sig,
                                     compiler::CallDescriptor* call_descriptor,
-                                    Register target,
-                                    uint32_t* max_used_spill_slot) {
+                                    Register target) {
   UNIMPLEMENTED();
 }
 

src/wasm/baseline/ia32/liftoff-assembler-ia32.h

@@ -734,9 +734,7 @@ void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
 
 void LiftoffAssembler::CallIndirect(wasm::FunctionSig* sig,
                                     compiler::CallDescriptor* call_descriptor,
-                                    Register target,
-                                    uint32_t* max_used_spill_slot) {
-  PrepareCall(sig, call_descriptor, max_used_spill_slot, &target);
+                                    Register target) {
   if (target == no_reg) {
     add(esp, Immediate(kPointerSize));
     call(Operand(esp, -4));

src/wasm/baseline/liftoff-assembler.h

@@ -409,11 +409,10 @@ class LiftoffAssembler : public TurboAssembler {
 
   inline void CallNativeWasmCode(Address addr);
   inline void CallRuntime(Zone* zone, Runtime::FunctionId fid);
-  // TODO(clemensh): Remove {max_used_spill_slot} once we support arbitrary
-  // stack sizes.
+  // Indirect call: If {target == no_reg}, then pop the target from the stack.
   inline void CallIndirect(wasm::FunctionSig* sig,
                            compiler::CallDescriptor* call_descriptor,
-                           Register target, uint32_t* max_used_spill_slot);
+                           Register target);
 
   // Reserve space in the current frame, store address to space in {addr}.
   inline void AllocateStackSlot(Register addr, uint32_t size);

src/wasm/baseline/liftoff-compiler.cc

@@ -1182,8 +1182,9 @@ class LiftoffCompiler {
         GetLoweredCallDescriptor(compilation_zone_, call_descriptor);
 
     uint32_t max_used_spill_slot = 0;
-    __ CallIndirect(operand.sig, call_descriptor, scratch.gp(),
-                    &max_used_spill_slot);
+    Register target = scratch.gp();
+    __ PrepareCall(operand.sig, call_descriptor, &max_used_spill_slot, &target);
+    __ CallIndirect(operand.sig, call_descriptor, target);
     if (max_used_spill_slot >
         __ num_locals() + LiftoffAssembler::kMaxValueStackHeight) {
       unsupported(decoder, "value stack grows too large in indirect call");

src/wasm/baseline/mips/liftoff-assembler-mips.h

@@ -246,8 +246,7 @@ void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
 
 void LiftoffAssembler::CallIndirect(wasm::FunctionSig* sig,
                                     compiler::CallDescriptor* call_descriptor,
-                                    Register target,
-                                    uint32_t* max_used_spill_slot) {
+                                    Register target) {
   UNIMPLEMENTED();
 }
 

src/wasm/baseline/mips64/liftoff-assembler-mips64.h

@@ -241,8 +241,7 @@ void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
 
 void LiftoffAssembler::CallIndirect(wasm::FunctionSig* sig,
                                     compiler::CallDescriptor* call_descriptor,
-                                    Register target,
-                                    uint32_t* max_used_spill_slot) {
+                                    Register target) {
   UNIMPLEMENTED();
 }
 

src/wasm/baseline/ppc/liftoff-assembler-ppc.h

@@ -201,8 +201,7 @@ void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
 
 void LiftoffAssembler::CallIndirect(wasm::FunctionSig* sig,
                                     compiler::CallDescriptor* call_descriptor,
-                                    Register target,
-                                    uint32_t* max_used_spill_slot) {
+                                    Register target) {
   UNIMPLEMENTED();
 }
 

src/wasm/baseline/s390/liftoff-assembler-s390.h

@@ -201,8 +201,7 @@ void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
 
 void LiftoffAssembler::CallIndirect(wasm::FunctionSig* sig,
                                     compiler::CallDescriptor* call_descriptor,
-                                    Register target,
-                                    uint32_t* max_used_spill_slot) {
+                                    Register target) {
   UNIMPLEMENTED();
 }
 

src/wasm/baseline/x64/liftoff-assembler-x64.h

@@ -649,9 +649,7 @@ void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
 
 void LiftoffAssembler::CallIndirect(wasm::FunctionSig* sig,
                                     compiler::CallDescriptor* call_descriptor,
-                                    Register target,
-                                    uint32_t* max_used_spill_slot) {
-  PrepareCall(sig, call_descriptor, max_used_spill_slot, &target);
+                                    Register target) {
   if (target == no_reg) {
     popq(kScratchRegister);
     target = kScratchRegister;