fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-14 15:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Update wasm.js loader to use new WebAssembly JS API

Browse Source
This commit is contained in:
Derek Schuff
2016-10-26 13:34:58 -07:00
parent 2a717f2d43
commit 39fde6042e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/wasm32/wasm.js
View File

@ -21,9 +21,9 @@
* both as a hobbling libc and a linker/loader, including dynamic linking. * both as a hobbling libc and a linker/loader, including dynamic linking.
*/ */
var HEAP_SIZE_BYTES = 1 << 24; var heap_size_bytes;
var heap = new ArrayBuffer(HEAP_SIZE_BYTES); var heap;
var heap_uint8 = new Uint8Array(heap); var heap_uint8;
// Heap access helpers. // Heap access helpers.
function charFromHeap(ptr) { return String.fromCharCode(heap_uint8[ptr]); } function charFromHeap(ptr) { return String.fromCharCode(heap_uint8[ptr]); }
@ -398,7 +398,7 @@ var stdlib = (function() {
free: NYI('free'), free: NYI('free'),
malloc: function(size) { malloc: function(size) {
if (size == 0) return 0; if (size == 0) return 0;
if (allocated_bytes > HEAP_SIZE_BYTES) return 0; if (allocated_bytes > heap_size_bytes) return 0;
allocated_bytes += size; allocated_bytes += size;
return allocated_bytes - size; return allocated_bytes - size;
}, },
@ -937,7 +937,11 @@ function load_wasm(file_path) {
// dependencies. That would make it easier to do lazy loading. We could do // dependencies. That would make it easier to do lazy loading. We could do
// this by catching load exceptions + adding to ffi and trying again, but // this by catching load exceptions + adding to ffi and trying again, but
// we're talking silly there: modules should just tell us what they want. // we're talking silly there: modules should just tell us what they want.
return Wasm.instantiateModule(readbuffer(file_path), ffi, heap); instance = new WebAssembly.Instance(new WebAssembly.Module(readbuffer(file_path)), ffi)
heap = instance.exports.memory.buffer;
heap_uint8 = new Uint8Array(heap);
heap_size_bytes = heap.byteLength;
return instance;
} }
// Load modules in reverse, adding their exports to the ffi object. // Load modules in reverse, adding their exports to the ffi object.