| | @@ -294,14 +294,12 @@ |
| 294 | 294 | } |
| 295 | 295 | } |
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | function abort(what) { |
| 299 | | - { |
| 300 | | - if (Module["onAbort"]) { |
| 301 | | - Module["onAbort"](what); |
| 302 | | - } |
| 299 | + if (Module["onAbort"]) { |
| 300 | + Module["onAbort"](what); |
| 303 | 301 | } |
| 304 | 302 | what = "Aborted(" + what + ")"; |
| 305 | 303 | err(what); |
| 306 | 304 | ABORT = true; |
| 307 | 305 | EXITSTATUS = 1; |
| | @@ -406,11 +404,11 @@ |
| 406 | 404 | try { |
| 407 | 405 | var exports = Module["instantiateWasm"](info, receiveInstance); |
| 408 | 406 | return exports; |
| 409 | 407 | } catch (e) { |
| 410 | 408 | err("Module.instantiateWasm callback failed with error: " + e); |
| 411 | | - return false; |
| 409 | + readyPromiseReject(e); |
| 412 | 410 | } |
| 413 | 411 | } |
| 414 | 412 | instantiateAsync().catch(readyPromiseReject); |
| 415 | 413 | return {}; |
| 416 | 414 | } |
| | @@ -503,14 +501,10 @@ |
| 503 | 501 | default: |
| 504 | 502 | abort("invalid type for setValue: " + type); |
| 505 | 503 | } |
| 506 | 504 | } |
| 507 | 505 | |
| 508 | | -function writeArrayToMemory(array, buffer) { |
| 509 | | - HEAP8.set(array, buffer); |
| 510 | | -} |
| 511 | | - |
| 512 | 506 | function ___assert_fail(condition, filename, line, func) { |
| 513 | 507 | abort("Assertion failed: " + UTF8ToString(condition) + ", at: " + [ filename ? UTF8ToString(filename) : "unknown filename", line, func ? UTF8ToString(func) : "unknown function" ]); |
| 514 | 508 | } |
| 515 | 509 | |
| 516 | 510 | function abortOnCannotGrowMemory(requestedSize) { |
| | @@ -554,10 +548,14 @@ |
| 554 | 548 | |
| 555 | 549 | function getCFunc(ident) { |
| 556 | 550 | var func = Module["_" + ident]; |
| 557 | 551 | return func; |
| 558 | 552 | } |
| 553 | + |
| 554 | +function writeArrayToMemory(array, buffer) { |
| 555 | + HEAP8.set(array, buffer); |
| 556 | +} |
| 559 | 557 | |
| 560 | 558 | function ccall(ident, returnType, argTypes, args, opts) { |
| 561 | 559 | var toC = { |
| 562 | 560 | "string": str => { |
| 563 | 561 | var ret = 0; |
| 564 | 562 | |