fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-29 06:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from WebAssembly/env_ffi

Browse Source 
Update wasm.js for v8's change to 2-level FFI namespace
This commit is contained in:
Derek Schuff
2016-03-08 15:36:59 -08:00
parent cd50df76d4 cff987a27b
commit 6ececfed67
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/wasm32/wasm.js
View File

@ -914,7 +914,7 @@ var syscall = (function() {
// Start with the stub implementations. Further module loads may shadow them. // Start with the stub implementations. Further module loads may shadow them.
var ffi = (function() { var ffi = (function() {
var functions = {}; var functions = {env:{}};
var libraries = [ var libraries = [
musl_hack, // Keep first, overriden later. musl_hack, // Keep first, overriden later.
builtins, ctype, math, runtime, stdio, stdlib, string, unix, builtins, ctype, math, runtime, stdio, stdlib, string, unix,
@ -923,7 +923,7 @@ var ffi = (function() {
for (var l in libraries) for (var l in libraries)
for (var f in libraries[l]) for (var f in libraries[l])
if (libraries[l].hasOwnProperty(f) && libraries[l][f] instanceof Function) if (libraries[l].hasOwnProperty(f) && libraries[l][f] instanceof Function)
functions[f] = libraries[l][f]; functions["env"][f] = libraries[l][f];
return functions; return functions;
})(); })();
@ -935,7 +935,7 @@ 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 _WASMEXP_.instantiateModule(readbuffer(file_path), ffi, heap); return Wasm.instantiateModule(readbuffer(file_path), ffi, heap);
} }
// Load modules in reverse, adding their exports to the ffi object. // Load modules in reverse, adding their exports to the ffi object.