[wasm] Use the JavaScript WasmModuleBuilder utility in JS tests.

test/mjsunit/wasm/divrem-trap.js

 // Copyright 2015 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.
 
 // Flags: --expose-wasm --expose-gc --allow-natives-syntax
 
 load("test/mjsunit/wasm/wasm-constants.js");
+load("test/mjsunit/wasm/wasm-module-builder.js");
 
 function assertTraps(code, msg) {
   var threwException = true;
   try {
     if (typeof code === 'function') {
       code();
     } else {
       eval(code);
     }
     threwException = false;
   } catch (e) {
     if (typeof type_opt === 'function') {
       assertInstanceof(e, type_opt);
     }
     if (arguments.length >= 3) {
       assertEquals(e.type, cause_opt);
     }
     // Success.
     return;
   }
   throw new MjsUnitAssertionError("Did not throw exception");
 }
 
 
-function makeDivRem(opcode) {
-  var kBodySize = 5;
-  var kNameMainOffset = kHeaderSize + 6 + 11 + kBodySize + 1;
+function makeBinop(opcode) {
+  var builder = new WasmModuleBuilder();
 
-  var data = bytesWithHeader(
-    // signatures
-    kDeclSignatures, 1,
-    2, kAstI32, kAstI32, kAstI32, // (int,int) -> int
-    // -- main function
-    kDeclFunctions, 1,
-    kDeclFunctionName | kDeclFunctionExport,
-    0, 0,
-    kNameMainOffset, 0, 0, 0,   // name offset
-    kBodySize, 0,
-    // main body
-    opcode,                     // --
-    kExprGetLocal, 0,           // --
-    kExprGetLocal, 1,           // --
-    // names
-    kDeclEnd,
-    'm', 'a', 'i', 'n', 0       //  --
-  );
+  builder.addFunction("main", [kAstI32, kAstI32, kAstI32])
+    .addBody([opcode, kExprGetLocal, 0, kExprGetLocal, 1])
+    .exportFunc();
 
-  var module = _WASMEXP_.instantiateModule(data);
-
-  assertEquals("function", typeof module.main);
-
-  return module.main;
+  return builder.instantiate().exports.main;
 }
 
-var divs = makeDivRem(kExprI32DivS);
-var divu = makeDivRem(kExprI32DivU);
+var divs = makeBinop(kExprI32DivS);
+var divu = makeBinop(kExprI32DivU);
 
 assertEquals( 33, divs( 333, 10));
 assertEquals(-33, divs(-336, 10));
 
 assertEquals(       44, divu( 445, 10));
 assertEquals(429496685, divu(-446, 10));
 
 assertTraps(kTrapDivByZero, "divs(100, 0);");
 assertTraps(kTrapDivByZero, "divs(-1009, 0);");
 
 assertTraps(kTrapDivByZero, "divu(200, 0);");
 assertTraps(kTrapDivByZero, "divu(-2009, 0);");
 
 assertTraps(kTrapDivUnrepresentable, "divs(0x80000000, -1)");
 assertEquals(0, divu(0x80000000, -1));
 
 
-var rems = makeDivRem(kExprI32RemS);
-var remu = makeDivRem(kExprI32RemU);
+var rems = makeBinop(kExprI32RemS);
+var remu = makeBinop(kExprI32RemU);
 
 assertEquals( 3, rems( 333, 10));
 assertEquals(-6, rems(-336, 10));
 
 assertEquals( 5, remu( 445, 10));
 assertEquals( 3, remu(-443, 10));
 
 assertTraps(kTrapRemByZero, "rems(100, 0);");
 assertTraps(kTrapRemByZero, "rems(-1009, 0);");
 
 assertTraps(kTrapRemByZero, "remu(200, 0);");
 assertTraps(kTrapRemByZero, "remu(-2009, 0);");
 
 assertEquals(-2147483648, remu(0x80000000, -1));
 assertEquals(0, rems(0x80000000, -1));