Chromium Code Reviews| Index: test/mjsunit/wasm/embenchen/copy.js |
| diff --git a/test/mjsunit/asm/embenchen/copy.js b/test/mjsunit/wasm/embenchen/copy.js |
| similarity index 99% |
| copy from test/mjsunit/asm/embenchen/copy.js |
| copy to test/mjsunit/wasm/embenchen/copy.js |
| index bf8d1777f3f925dbf845eae113b06f7743613b54..1c0923fdeceb03374d6ec6006d8bb8e6c28a3ffb 100644 |
| --- a/test/mjsunit/asm/embenchen/copy.js |
| +++ b/test/mjsunit/wasm/embenchen/copy.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 = 'sum:8930\n'; |
| var Module = { |
| arguments: [1], |
| @@ -5449,7 +5454,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); |
| @@ -5765,9 +5770,10 @@ function stackSave() { |
| return { _strlen: _strlen, _memcpy: _memcpy, _main: _main, _memset: _memset, 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, "_free": _free, "_emscripten_memcpy_big": _emscripten_memcpy_big, "_printf": _printf, "_send": _send, "_pwrite": _pwrite, "__reallyNegative": __reallyNegative, "_fwrite": _fwrite, "_malloc": _malloc, "_mkport": _mkport, "_fprintf": _fprintf, "___setErrNo": ___setErrNo, "__formatString": __formatString, "_fileno": _fileno, "_fflush": _fflush, "_write": _write, "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, "_free": _free, "_emscripten_memcpy_big": _emscripten_memcpy_big, "_printf": _printf, "_send": _send, "_pwrite": _pwrite, "__reallyNegative": __reallyNegative, "_fwrite": _fwrite, "_malloc": _malloc, "_mkport": _mkport, "_fprintf": _fprintf, "___setErrNo": ___setErrNo, "__formatString": __formatString, "_fileno": _fileno, "_fflush": _fflush, "_write": _write, "STACKTOP": STACKTOP, "STACK_MAX": STACK_MAX, "tempDoublePtr": tempDoublePtr, "ABORT": ABORT, "NaN": NaN, "Infinity": Infinity }, buffer); |
|
aseemgarg
2016/02/22 22:28:41
why are we passing stdlib stuff as ffi?
bradn
2016/02/23 05:56:02
Some of this is temporary, some is a quirk of embe
|
| +asm.__init__(); |
| var _strlen = Module["_strlen"] = asm["_strlen"]; |
| var _memcpy = Module["_memcpy"] = asm["_memcpy"]; |
| var _main = Module["_main"] = asm["_main"]; |