[wasm] Add more extensive tests for asm->wasm translation.

test/mjsunit/wasm/asm-wasm.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
 
+function assertWasm(expected, func, ffi) {
+  print("Testing " + func.name + "...");
+  assertEquals(expected, Wasm.instantiateModuleFromAsm(
+      func.toString(), ffi).caller());
+}
+
 function EmptyTest() {
   "use asm";
   function caller() {
     empty();
     return 11;
   }
   function empty() {
   }
   return {caller: caller};
 }
 
-assertEquals(11, Wasm.instantiateModuleFromAsm(
-      EmptyTest.toString()).caller());
+assertWasm(11, EmptyTest);
 
 
 function IntTest() {
   "use asm";
   function sum(a, b) {
     a = a|0;
     b = b|0;
     var c = (b + 1)|0
     var d = 3.0;
     var e = ~~d;  // double conversion
     return (a + c + 1)|0;
   }
 
   function caller() {
     return sum(77,22) | 0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(101, Wasm.instantiateModuleFromAsm(
-      IntTest.toString()).caller());
+assertWasm(101,IntTest);
 
 
 function Float64Test() {
   "use asm";
   function sum(a, b) {
     a = +a;
     b = +b;
     return +(a + b);
   }
 
   function caller() {
     var a = +sum(70.1,10.2);
     var ret = 0|0;
     if (a == 80.3) {
       ret = 1|0;
     } else {
       ret = 0|0;
     }
     return ret|0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(1, Wasm.instantiateModuleFromAsm(
-      Float64Test.toString()).caller());
+assertWasm(1, Float64Test);
 
 
 function BadModule() {
   "use asm";
   function caller(a, b) {
     a = a|0;
     b = b+0;
     var c = (b + 1)|0
     return (a + c + 1)|0;
   }
@@ skipping 20 matching lines @@
           return 1;
         }
       }
     }
     return 0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(1, Wasm.instantiateModuleFromAsm(
-      TestReturnInBlock.toString()).caller());
+assertWasm(1, TestReturnInBlock);
+
+
+function TestAddSimple() {
+  "use asm";
+
+  function caller() {
+    var x = 0;
+    x = (x + 1)|0;
+    return x|0;
+  }
+
+  return {caller: caller};
+}
+
+assertWasm(1, TestAddSimple);
 
 
 function TestWhileSimple() {
   "use asm";
 
   function caller() {
     var x = 0;
     while(x < 5) {
       x = (x + 1)|0;
     }
     return x|0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(5, Wasm.instantiateModuleFromAsm(
-      TestWhileSimple.toString()).caller());
+assertWasm(5, TestWhileSimple);
 
 
 function TestWhileWithoutBraces() {
   "use asm";
 
   function caller() {
     var x = 0;
     while(x <= 3)
       x = (x + 1)|0;
     return x|0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(4, Wasm.instantiateModuleFromAsm(
-      TestWhileWithoutBraces.toString()).caller());
+assertWasm(4, TestWhileWithoutBraces);
 
 
 function TestReturnInWhile() {
   "use asm";
 
   function caller() {
     var x = 0;
     while(x < 10) {
       x = (x + 6)|0;
       return x|0;
     }
     return x|0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(6, Wasm.instantiateModuleFromAsm(
-      TestReturnInWhile.toString()).caller());
+assertWasm(6, TestReturnInWhile);
 
 
 function TestReturnInWhileWithoutBraces() {
   "use asm";
 
   function caller() {
     var x = 0;
     while(x < 5)
       return 7;
     return x|0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(
-    7, Wasm.instantiateModuleFromAsm(
-      TestReturnInWhileWithoutBraces.toString()).caller());
+assertWasm(7, TestReturnInWhileWithoutBraces);
 
 
 function TestBreakInWhile() {
   "use asm";
 
   function caller() {
     while(1) {
       break;
     }
     return 8;
   }
 
   return {caller: caller};
 }
 
-assertEquals(8, Wasm.instantiateModuleFromAsm(
-      TestBreakInWhile.toString()).caller());
+assertWasm(8, TestBreakInWhile);
 
 
 function TestBreakInNestedWhile() {
   "use asm";
 
   function caller() {
     var x = 1.0;
     while(x < 1.5) {
       while(1)
         break;
       x = +(x + 0.25);
     }
     var ret = 0;
     if (x == 1.5) {
       ret = 9;
     }
     return ret|0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(9, Wasm.instantiateModuleFromAsm(
-      TestBreakInNestedWhile.toString()).caller());
+assertWasm(9, TestBreakInNestedWhile);
 
 
 function TestBreakInBlock() {
   "use asm";
 
   function caller() {
     var x = 0;
     abc: {
       x = 10;
       if (x == 10) {
         break abc;
       }
       x = 20;
     }
     return x|0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(10, Wasm.instantiateModuleFromAsm(
-      TestBreakInBlock.toString()).caller());
+assertWasm(10, TestBreakInBlock);
 
 
 function TestBreakInNamedWhile() {
   "use asm";
 
   function caller() {
     var x = 0;
     outer: while (1) {
       x = (x + 1)|0;
       while (x == 11) {
         break outer;
       }
     }
     return x|0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(11, Wasm.instantiateModuleFromAsm(
-      TestBreakInNamedWhile.toString()).caller());
+assertWasm(11, TestBreakInNamedWhile);
 
 
 function TestContinue() {
   "use asm";
 
   function caller() {
     var x = 5;
     var ret = 0;
     while (x >= 0) {
       x = (x - 1)|0;
       if (x == 2) {
         continue;
       }
       ret = (ret - 1)|0;
     }
     return ret|0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(-5, Wasm.instantiateModuleFromAsm(
-      TestContinue.toString()).caller());
+assertWasm(-5, TestContinue);
 
 
 function TestContinueInNamedWhile() {
   "use asm";
 
   function caller() {
     var x = 5;
     var y = 0;
     var ret = 0;
     outer: while (x > 0) {
       x = (x - 1)|0;
       y = 0;
       while (y < 5) {
         if (x == 3) {
           continue outer;
         }
         ret = (ret + 1)|0;
         y = (y + 1)|0;
       }
     }
     return ret|0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(20, Wasm.instantiateModuleFromAsm(
-      TestContinueInNamedWhile.toString()).caller());
+assertWasm(20, TestContinueInNamedWhile);
 
 
 function TestNot() {
   "use asm";
 
   function caller() {
     var a = !(2 > 3);
     return a | 0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(1, Wasm.instantiateModuleFromAsm(
-      TestNot.toString()).caller());
+assertWasm(1, TestNot);
 
 
 function TestNotEquals() {
   "use asm";
 
   function caller() {
     var a = 3;
     if (a != 2) {
       return 21;
     }
     return 0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(21, Wasm.instantiateModuleFromAsm(
-      TestNotEquals.toString()).caller());
+assertWasm(21, TestNotEquals);
 
 
 function TestUnsignedComparison() {
   "use asm";
 
   function caller() {
     var a = 0xffffffff;
     if ((a>>>0) > (0>>>0)) {
       return 22;
     }
     return 0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(22, Wasm.instantiateModuleFromAsm(
-      TestUnsignedComparison.toString()).caller());
+assertWasm(22, TestUnsignedComparison);
 
 
 function TestMixedAdd() {
   "use asm";
 
   function caller() {
     var a = 0x80000000;
     var b = 0x7fffffff;
     var c = 0;
     c = ((a>>>0) + b)|0;
     if ((c >>> 0) > (0>>>0)) {
       if (c < 0) {
         return 23;
       }
     }
     return 0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(23, Wasm.instantiateModuleFromAsm(
-      TestMixedAdd.toString()).caller());
+assertWasm(23, TestMixedAdd);
 
 
 function TestInt32HeapAccess(stdlib, foreign, buffer) {
   "use asm";
 
   var m = new stdlib.Int32Array(buffer);
   function caller() {
     var i = 4;
 
     m[0] = (i + 1) | 0;
     m[i >> 2] = ((m[0]|0) + 1) | 0;
     m[2] = ((m[i >> 2]|0) + 1) | 0;
     return m[2] | 0;
   }
 
   return {caller: caller};
 }
 
-assertEquals(7, Wasm.instantiateModuleFromAsm(
-      TestInt32HeapAccess.toString()).caller());
+assertWasm(7, TestInt32HeapAccess);
 
 
 function TestInt32HeapAccessExternal() {
   var memory = new ArrayBuffer(1024);
   var memory_int32 = new Int32Array(memory);
   var module = Wasm.instantiateModuleFromAsm(
       TestInt32HeapAccess.toString(), null, memory);
   assertEquals(7, module.caller());
   assertEquals(7, memory_int32[2]);
 }
@@ skipping 71 matching lines @@
     var a = 1.5;
     if ((~~(a + a)) == 3) {
       return 24;
     }
     return 0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(24, Wasm.instantiateModuleFromAsm(
-      TestConvertI32.toString()).caller());
+assertWasm(24, TestConvertI32);
 
 
 function TestConvertF64FromInt() {
   "use asm";
 
   function caller() {
     var a = 1;
     if ((+(a + a)) > 1.5) {
       return 25;
     }
     return 0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(25, Wasm.instantiateModuleFromAsm(
-      TestConvertF64FromInt.toString()).caller());
+assertWasm(25, TestConvertF64FromInt);
 
 
 function TestConvertF64FromUnsigned() {
   "use asm";
 
   function caller() {
     var a = 0xffffffff;
     if ((+(a>>>0)) > 0.0) {
       if((+a) < 0.0) {
         return 26;
       }
     }
     return 0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(26, Wasm.instantiateModuleFromAsm(
-      TestConvertF64FromUnsigned.toString()).caller());
+assertWasm(26, TestConvertF64FromUnsigned);
 
 
 function TestModInt() {
   "use asm";
 
   function caller() {
     var a = -83;
     var b = 28;
     return ((a|0)%(b|0))|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(-27, Wasm.instantiateModuleFromAsm(
-      TestModInt.toString()).caller());
+assertWasm(-27,TestModInt);
 
 
 function TestModUnsignedInt() {
   "use asm";
 
   function caller() {
     var a = 0x80000000;  //2147483648
     var b = 10;
     return ((a>>>0)%(b>>>0))|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(8, Wasm.instantiateModuleFromAsm(
-      TestModUnsignedInt.toString()).caller());
+assertWasm(8, TestModUnsignedInt);
 
 
 function TestModDouble() {
   "use asm";
 
   function caller() {
     var a = 5.25;
     var b = 2.5;
     if (a%b == 0.25) {
       return 28;
     }
     return 0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(28, Wasm.instantiateModuleFromAsm(
-      TestModDouble.toString()).caller());
+assertWasm(28, TestModDouble);
 
 
 /*
 TODO: Fix parsing of negative doubles
       Fix code to use trunc instead of casts
 function TestModDoubleNegative() {
   "use asm";
 
   function caller() {
     var a = -34359738368.25;
     var b = 2.5;
     if (a%b == -0.75) {
       return 28;
     }
     return 0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(28, Wasm.instantiateModuleFromAsm(
-      TestModDoubleNegative.toString()).caller());
+assertWasm(28, TestModDoubleNegative);
 */
 
 
+(function () {
 function TestNamedFunctions() {
   "use asm";
 
   var a = 0.0;
   var b = 0.0;
 
   function add() {
     return +(a + b);
   }
 
   function init() {
     a = 43.25;
     b = 34.25;
   }
 
   return {init:init,
           add:add};
 }
 
 var module = Wasm.instantiateModuleFromAsm(TestNamedFunctions.toString());
 module.init();
 assertEquals(77.5, module.add());
+})();
 
-
+(function () {
 function TestGlobalsWithInit() {
   "use asm";
 
   var a = 43.25;
   var b = 34.25;
 
   function add() {
     return +(a + b);
   }
 
   return {add:add};
 }
 
 var module = Wasm.instantiateModuleFromAsm(TestGlobalsWithInit.toString());
 assertEquals(77.5, module.add());
-
+})();
 
 function TestForLoop() {
   "use asm"
 
   function caller() {
     var ret = 0;
     var i = 0;
     for (i = 2; i <= 10; i = (i+1)|0) {
       ret = (ret + i) | 0;
     }
     return ret|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(54, Wasm.instantiateModuleFromAsm(
-      TestForLoop.toString()).caller());
+assertWasm(54, TestForLoop);
 
 
 function TestForLoopWithoutInit() {
   "use asm"
 
   function caller() {
     var ret = 0;
     var i = 0;
     for (; i < 10; i = (i+1)|0) {
       ret = (ret + 10) | 0;
     }
     return ret|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(100, Wasm.instantiateModuleFromAsm(
-      TestForLoopWithoutInit.toString()).caller());
+assertWasm(100,TestForLoopWithoutInit);
 
 
 function TestForLoopWithoutCondition() {
   "use asm"
 
   function caller() {
     var ret = 0;
     var i = 0;
     for (i=1;; i = (i+1)|0) {
       ret = (ret + i) | 0;
       if (i == 11) {
         break;
       }
     }
     return ret|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(66, Wasm.instantiateModuleFromAsm(
-      TestForLoopWithoutCondition.toString()).caller());
+assertWasm(66, TestForLoopWithoutCondition);
 
 
 function TestForLoopWithoutNext() {
   "use asm"
 
   function caller() {
     var i = 0;
     for (i=1; i < 41;) {
       i = (i + 1) | 0;
     }
     return i|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(41, Wasm.instantiateModuleFromAsm(
-      TestForLoopWithoutNext.toString()).caller());
+assertWasm(41, TestForLoopWithoutNext);
 
 
 function TestForLoopWithoutBody() {
   "use asm"
 
   function caller() {
     var i = 0;
     for (i=1; i < 45 ; i = (i+1)|0) {
     }
     return i|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(45, Wasm.instantiateModuleFromAsm(
-      TestForLoopWithoutBody.toString()).caller());
+assertWasm(45, TestForLoopWithoutBody);
 
 
 function TestDoWhile() {
   "use asm"
 
   function caller() {
     var i = 0;
     var ret = 21;
     do {
       ret = (ret + ret)|0;
       i = (i + 1)|0;
     } while (i < 2);
     return ret|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(84, Wasm.instantiateModuleFromAsm(
-      TestDoWhile.toString()).caller());
+assertWasm(84, TestDoWhile);
 
 
 function TestConditional() {
   "use asm"
 
   function caller() {
     var x = 1;
     return ((x > 0) ? 41 : 71)|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(41, Wasm.instantiateModuleFromAsm(
-      TestConditional.toString()).caller());
+assertWasm(41, TestConditional);
 
 
 function TestSwitch() {
   "use asm"
 
   function caller() {
     var ret = 0;
     var x = 7;
     switch (x) {
       case 1: return 0;
       case 7: {
         ret = 12;
         break;
       }
       default: return 0;
     }
     switch (x) {
       case 1: return 0;
       case 8: return 0;
       default: ret = (ret + 11)|0;
     }
     return ret|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(23, Wasm.instantiateModuleFromAsm(
-      TestSwitch.toString()).caller());
+assertWasm(23, TestSwitch);
 
 
 function TestSwitchFallthrough() {
   "use asm"
 
   function caller() {
     var x = 17;
     var ret = 0;
     switch (x) {
       case 17:
       case 14: ret = 39;
       case 1: ret = (ret + 3)|0;
       case 4: break;
       default: ret = (ret + 1)|0;
     }
     return ret|0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(42, Wasm.instantiateModuleFromAsm(
-      TestSwitchFallthrough.toString()).caller());
+assertWasm(42, TestSwitchFallthrough);
 
 
 function TestNestedSwitch() {
   "use asm"
 
   function caller() {
     var x = 3;
     var y = -13;
     switch (x) {
       case 1: return 0;
       case 3: {
         switch (y) {
           case 2: return 0;
           case -13: return 43;
           default: return 0;
         }
       }
       default: return 0;
     }
     return 0;
   }
 
   return {caller:caller};
 }
 
-assertEquals(43, Wasm.instantiateModuleFromAsm(
-      TestNestedSwitch.toString()).caller());
+assertWasm(43, TestNestedSwitch);
 
 
+(function () {
 function TestInitFunctionWithNoGlobals() {
   "use asm";
   function caller() {
     return 51;
   }
   return {caller};
 }
 
 var module = Wasm.instantiateModuleFromAsm(
     TestInitFunctionWithNoGlobals.toString());
 assertEquals(51, module.caller());
+})();
 
-
+(function () {
 function TestExportNameDifferentFromFunctionName() {
   "use asm";
   function caller() {
     return 55;
   }
   return {alt_caller:caller};
 }
 
 var module = Wasm.instantiateModuleFromAsm(
     TestExportNameDifferentFromFunctionName.toString());
 assertEquals(55, module.alt_caller());
-
+})();
 
 function TestFunctionTableSingleFunction() {
   "use asm";
 
   function dummy() {
     return 71;
   }
 
   function caller() {
     return function_table[0&0]() | 0;
   }
 
   var function_table = [dummy]
 
   return {caller:caller};
 }
 
-assertEquals(71, Wasm.instantiateModuleFromAsm(
-      TestFunctionTableSingleFunction.toString()).caller());
+assertWasm(71, TestFunctionTableSingleFunction);
 
 
 function TestFunctionTableMultipleFunctions() {
   "use asm";
 
   function inc1(x) {
     x = x|0;
     return (x+1)|0;
   }
 
   function inc2(x) {
     x = x|0;
     return (x+2)|0;
   }
 
   function caller() {
     if (function_table[0&1](50) == 51) {
       if (function_table[1&1](60) == 62) {
         return 73;
       }
     }
     return 0;
   }
 
   var function_table = [inc1, inc2]
 
   return {caller:caller};
 }
 
-assertEquals(73, Wasm.instantiateModuleFromAsm(
-      TestFunctionTableMultipleFunctions.toString()).caller());
+assertWasm(73, TestFunctionTableMultipleFunctions);
 
 
+(function () {
 function TestFunctionTable() {
   "use asm";
 
   function add(a, b) {
     a = a|0;
     b = b|0;
     return (a+b)|0;
   }
 
   function sub(a, b) {
@@ skipping 26 matching lines @@
   return {caller:caller};
 }
 
 var module = Wasm.instantiateModuleFromAsm(TestFunctionTable.toString());
 assertEquals(55, module.caller(0, 0, 33, 22));
 assertEquals(11, module.caller(0, 1, 33, 22));
 assertEquals(9, module.caller(0, 2, 54, 45));
 assertEquals(99, module.caller(0, 3, 54, 45));
 assertEquals(23, module.caller(0, 4, 12, 11));
 assertEquals(31, module.caller(1, 0, 30, 11));
+})();
 
 
 function TestForeignFunctions() {
   function AsmModule(stdlib, foreign, buffer) {
     "use asm";
 
     var setVal = foreign.setVal;
     var getVal = foreign.getVal;
 
     function caller(initial_value, new_value) {
@@ skipping 95 matching lines @@
     }
 
     function getf2() {
       return +f2;
     }
 
     return {geti1:geti1, getf1:getf1, geti2:geti2, getf2:getf2};
   }
 
   function TestCase(env, i1, f1, i2, f2) {
+    print("Testing foreign variables...");
     var module = Wasm.instantiateModuleFromAsm(
         AsmModule.toString(), env);
     assertEquals(i1, module.geti1());
     assertEquals(f1, module.getf1());
     assertEquals(i2, module.geti2());
     assertEquals(f2, module.getf2());
   }
 
   // Check normal operation.
   TestCase({foo: 123, bar: 234.5, baz: 345.7}, 123, 234.5, 345, 345.7);
@@ skipping 89 matching lines @@
   m.storeb(22, 77);
   assertEquals(123, m.load(20));
   assertEquals(42, m.load(21));
   assertEquals(77, m.load(22));
   assertEquals(123, m.iload(0));
   assertEquals(42, m.iload(4));
   assertEquals(77, m.iload(8));
 })();
 
 
-(function TestGlobalBlock() {
-  function Module(stdlib, foreign, buffer) {
-    "use asm";
+function TestGlobalBlock(stdlib, foreign, buffer) {
+  "use asm";
 
-    var x = foreign.x | 0, y = foreign.y | 0;
+  var x = foreign.x | 0, y = foreign.y | 0;
 
-    function test() {
-      return (x + y) | 0;
-    }
-
-    return {test: test};
+  function test() {
+    return (x + y) | 0;
   }
 
-  var m = Wasm.instantiateModuleFromAsm(
-      Module.toString(), { x: 4, y: 11 });
-  assertEquals(15, m.test());
-})();
+  return {caller: test};
+}
 
+assertWasm(15, TestGlobalBlock, { x: 4, y: 11 });
 
 (function TestComma() {
   function CommaModule() {
     "use asm";
 
     function ifunc(a, b) {
       a = +a;
       b = b | 0;
       return (a, b) | 0;
     }
 
     function dfunc(a, b) {
       a = a | 0;
       b = +b;
       return +(a, b);
     }
 
     return {ifunc: ifunc, dfunc: dfunc};
   }
 
   var m = Wasm.instantiateModuleFromAsm(CommaModule.toString());
   assertEquals(123, m.ifunc(456.7, 123));
   assertEquals(123.4, m.dfunc(456, 123.4));
 })();
 
 
-(function TestFloatAsDouble() {
-  function Module(stdlib) {
-    "use asm";
-    var fround = stdlib.Math.fround;
-    function func() {
-      var x = fround(1.0);
-      return +fround(x);
-    }
-    return {func:func};
+function TestFloatAsDouble(stdlib) {
+  "use asm";
+  var fround = stdlib.Math.fround;
+  function func() {
+    var x = fround(1.0);
+    return +fround(x);
   }
-  var m = Wasm.instantiateModuleFromAsm(Module.toString());
-  assertEquals(1, m.func());
-})();
+  return {caller: func};
+}
+assertWasm(1, TestFloatAsDouble);
 
 
-(function TestOr() {
-  function Module() {
-    "use asm";
-    function func() {
-      var x = 1;
-      var y = 2;
-      return (x | y) | 0;
-    }
-    return {func: func};
+function TestOr() {
+  "use asm";
+  function func() {
+    var x = 1;
+    var y = 2;
+    return (x | y) | 0;
   }
+  return {caller: func};
+}
 
-  var m = Wasm.instantiateModuleFromAsm(Module.toString());
-  assertEquals(3, m.func());
-})();
+assertWasm(3, TestOr);
 
 
-(function TestAnd() {
-  function Module() {
-    "use asm";
-    function func() {
-      var x = 3;
-      var y = 2;
-      return (x & y) | 0;
-    }
-    return {func: func};
+function TestAnd() {
+  "use asm";
+  function func() {
+    var x = 3;
+    var y = 2;
+    return (x & y) | 0;
   }
+  return {caller: func};
+}
 
-  var m = Wasm.instantiateModuleFromAsm(Module.toString());
-  assertEquals(2, m.func());
-})();
+assertWasm(2, TestAnd);
 
 
-(function TestXor() {
-  function Module() {
-    "use asm";
-    function func() {
-      var x = 3;
-      var y = 2;
-      return (x ^ y) | 0;
-    }
-    return {func: func};
+function TestXor() {
+  "use asm";
+  function func() {
+    var x = 3;
+    var y = 2;
+    return (x ^ y) | 0;
   }
+  return {caller: func};
+}
 
-  var m = Wasm.instantiateModuleFromAsm(Module.toString());
-  assertEquals(1, m.func());
-})();
+assertWasm(1, TestXor);
 
 
 (function TestIntishAssignment() {
   function Module(stdlib, foreign, heap) {
     "use asm";
     var HEAP32 = new stdlib.Int32Array(heap);
     function func() {
       var a = 1;
       var b = 2;
       HEAP32[0] = a + b;
@@ skipping 148 matching lines @@
       var a = 0;
       f = 5616315000.000001;
       a = ~~f >>>0;
       return a | 0;
     }
     return { main : aaa };
   }
   var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
   assertEquals(1321347704, wasm.main());
 })();