[wasm] WasmRunner can run tests with I64 parameters and return value.

test/cctest/wasm/wasm-run-utils.h

 // Copyright 2016 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.
 
 #ifndef WASM_RUN_UTILS_H
 #define WASM_RUN_UTILS_H
 
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 227 matching lines @@
   TreeResult result = BuildTFGraph(&builder, env, start, end);
   if (result.failed()) {
     ptrdiff_t pc = result.error_pc - result.start;
     ptrdiff_t pt = result.error_pt - result.start;
     std::ostringstream str;
     str << "Verification failed: " << result.error_code << " pc = +" << pc;
     if (result.error_pt) str << ", pt = +" << pt;
     str << ", msg = " << result.error_msg.get();
     FATAL(str.str().c_str());
   }
-  builder.Int64LoweringForTesting();
+  builder.Int64LoweringForTesting(env->sig);
   if (FLAG_trace_turbo_graph) {
     OFStream os(stdout);
     os << AsRPO(*jsgraph->graph());
   }
 }
 
 template <typename ReturnType>
 class WasmFunctionWrapper : public HandleAndZoneScope,
                             private GraphAndBuilders {
  public:
@@ skipping 85 matching lines @@
                              common()->HeapConstant(code_handle));
   }
 
   Handle<Code> GetWrapperCode() {
     if (code_.is_null()) {
       Isolate* isolate = CcTest::InitIsolateOnce();
 
       CallDescriptor* descriptor =
           Linkage::GetSimplifiedCDescriptor(zone(), signature_, true);
 
+#if !WASM_64

[titzer, 2016/02/18 12:06:22]

I don't understand what this signature is for. Seems bogus.

[ahaas, 2016/02/18 13:00:18]

I need the signature of the wrapper as Signature<MachineRepresentation> to
initialize the Int64Lowering. signature_, which stores more or less the same
data, has type Signature<MachineType>.

+
+      Signature<MachineRepresentation>::Builder rep_builder(zone(), 1, 4);

[ahaas, 2016/02/18 13:00:18]

I introduced a new #define for the maximum number of parameters of the
WasmRunner to replace the "4" here and at other places.

+
+      rep_builder.AddReturn(MachineRepresentation::kWord32);
+      for (int i = 0; i < 4; i++) {
+        rep_builder.AddParam(MachineRepresentation::kWord32);
+      }
+      Int64Lowering r(graph(), machine(), common(), zone(),
+                      rep_builder.Build());
+      r.LowerGraph();
+#endif
+
       CompilationInfo info("testing", isolate, graph()->zone());
       code_ =
           Pipeline::GenerateCodeForTesting(&info, descriptor, graph(), nullptr);
       CHECK(!code_.is_null());
 #ifdef ENABLE_DISASSEMBLER
       if (FLAG_print_opt_code) {
         OFStream os(stdout);
         code_->Disassemble("wasm wrapper", os);
       }
 #endif
@@ skipping 47 matching lines @@
   byte AllocateLocal(LocalType type) {
     int result = static_cast<int>(env.total_locals);
     env.AddLocals(type, 1);
     byte b = static_cast<byte>(result);
     CHECK_EQ(result, b);
     return b;
   }
 
   Handle<Code> Compile(ModuleEnv* module) {
     InitializeDescriptor();
+    CallDescriptor* desc = descriptor_;
+#if !WASM_64
+    desc = module->GetI32WasmCallDescriptor(this->zone(), desc);

[titzer, 2016/02/18 12:06:23]

Same here. You need to use kPointerSize == 4

[ahaas, 2016/02/18 13:00:18]

Done.

+#endif
     CompilationInfo info("wasm compile", this->isolate(), this->zone());
     Handle<Code> result =
-        Pipeline::GenerateCodeForTesting(&info, descriptor_, this->graph());
+        Pipeline::GenerateCodeForTesting(&info, desc, this->graph());
 #ifdef ENABLE_DISASSEMBLER
     if (!result.is_null() && FLAG_print_opt_code) {
       OFStream os(stdout);
       result->Disassemble("wasm code", os);
     }
 #endif
 
     return result;
   }
 
@@ skipping 107 matching lines @@
     if (p1 == MachineType::None()) return 1;
     if (p2 == MachineType::None()) return 2;
     if (p3 == MachineType::None()) return 3;
     return 4;
   }
 };
 
 }  // namespace
 
 #endif