Index: test/mjsunit/wasm/embenchen/memops.js |
diff --git a/test/mjsunit/asm/embenchen/memops.js b/test/mjsunit/wasm/embenchen/memops.js |
similarity index 99% |
copy from test/mjsunit/asm/embenchen/memops.js |
copy to test/mjsunit/wasm/embenchen/memops.js |
index e8e607cd72f56246bf26bd572272f996db6a95df..5b27604e518a3e540863c9ca3dc3aabc29ac68e5 100644 |
--- a/test/mjsunit/asm/embenchen/memops.js |
+++ b/test/mjsunit/wasm/embenchen/memops.js |
@@ -1,3 +1,8 @@ |
+// Modified embenchen to direct to asm-wasm. |
+// Flags: --expose-wasm |
+// TODO(mtrofin): Drop when verifier is fixed. |
+// Flags: --noturbo-verify-allocation |
+ |
var EXPECTED_OUTPUT = 'final: 840.\n'; |
var Module = { |
arguments: [1], |
@@ -5610,7 +5615,7 @@ function asmPrintFloat(x, y) { |
Module.print('float ' + x + ',' + y);// + ' ' + new Error().stack); |
} |
// EMSCRIPTEN_START_ASM |
-var asm = (function(global, env, buffer) { |
+var asm = _WASMEXP_.instantiateModuleFromAsm((function Module(global, env, buffer) { |
'use asm'; |
var HEAP8 = new global.Int8Array(buffer); |
var HEAP16 = new global.Int16Array(buffer); |
@@ -7874,9 +7879,10 @@ function stackSave() { |
return { _strlen: _strlen, _free: _free, _main: _main, _memset: _memset, _malloc: _malloc, _memcpy: _memcpy, runPostSets: runPostSets, stackAlloc: stackAlloc, stackSave: stackSave, stackRestore: stackRestore, setThrew: setThrew, setTempRet0: setTempRet0, setTempRet1: setTempRet1, setTempRet2: setTempRet2, setTempRet3: setTempRet3, setTempRet4: setTempRet4, setTempRet5: setTempRet5, setTempRet6: setTempRet6, setTempRet7: setTempRet7, setTempRet8: setTempRet8, setTempRet9: setTempRet9 }; |
-}) |
+}).toString(), |
// EMSCRIPTEN_END_ASM |
-({ "Math": Math, "Int8Array": Int8Array, "Int16Array": Int16Array, "Int32Array": Int32Array, "Uint8Array": Uint8Array, "Uint16Array": Uint16Array, "Uint32Array": Uint32Array, "Float32Array": Float32Array, "Float64Array": Float64Array }, { "abort": abort, "assert": assert, "asmPrintInt": asmPrintInt, "asmPrintFloat": asmPrintFloat, "min": Math_min, "_fflush": _fflush, "_emscripten_memcpy_big": _emscripten_memcpy_big, "_printf": _printf, "_send": _send, "_pwrite": _pwrite, "_abort": _abort, "___setErrNo": ___setErrNo, "_fwrite": _fwrite, "_sbrk": _sbrk, "_time": _time, "_mkport": _mkport, "__reallyNegative": __reallyNegative, "__formatString": __formatString, "_fileno": _fileno, "_write": _write, "_fprintf": _fprintf, "_sysconf": _sysconf, "___errno_location": ___errno_location, "STACKTOP": STACKTOP, "STACK_MAX": STACK_MAX, "tempDoublePtr": tempDoublePtr, "ABORT": ABORT, "NaN": NaN, "Infinity": Infinity }, buffer); |
+{ "Math": Math, "Int8Array": Int8Array, "Int16Array": Int16Array, "Int32Array": Int32Array, "Uint8Array": Uint8Array, "Uint16Array": Uint16Array, "Uint32Array": Uint32Array, "Float32Array": Float32Array, "Float64Array": Float64Array, "abort": abort, "assert": assert, "asmPrintInt": asmPrintInt, "asmPrintFloat": asmPrintFloat, "min": Math_min, "_fflush": _fflush, "_emscripten_memcpy_big": _emscripten_memcpy_big, "_printf": _printf, "_send": _send, "_pwrite": _pwrite, "_abort": _abort, "___setErrNo": ___setErrNo, "_fwrite": _fwrite, "_sbrk": _sbrk, "_time": _time, "_mkport": _mkport, "__reallyNegative": __reallyNegative, "__formatString": __formatString, "_fileno": _fileno, "_write": _write, "_fprintf": _fprintf, "_sysconf": _sysconf, "___errno_location": ___errno_location, "STACKTOP": STACKTOP, "STACK_MAX": STACK_MAX, "tempDoublePtr": tempDoublePtr, "ABORT": ABORT, "NaN": NaN, "Infinity": Infinity }, buffer); |
+asm.__init__(); |
var _strlen = Module["_strlen"] = asm["_strlen"]; |
var _free = Module["_free"] = asm["_free"]; |
var _main = Module["_main"] = asm["_main"]; |