Fix emscripten imports

This commit is contained in:
Steve Akinyemi
2019-01-11 17:10:21 +01:00
parent b7b6e9e319
commit 76f6d3c33c
7 changed files with 1026 additions and 897 deletions

21
Cargo.lock generated
View File

@ -1097,16 +1097,16 @@ dependencies = [
"tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
"wabt 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmer-clif-backend 0.1.0", "wasmer-clif-backend 0.1.4",
"wasmer-emscripten 0.1.1", "wasmer-emscripten 0.1.4",
"wasmer-runtime 0.1.0", "wasmer-runtime 0.1.4",
"wasmparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "wasmer-clif-backend" name = "wasmer-clif-backend"
version = "0.1.0" version = "0.1.4"
dependencies = [ dependencies = [
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"cranelift-codegen 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-codegen 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1115,26 +1115,27 @@ dependencies = [
"cranelift-wasm 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-wasm 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hashbrown 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmer-runtime 0.1.0", "wasmer-runtime 0.1.4",
"wasmparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "wasmer-emscripten" name = "wasmer-emscripten"
version = "0.1.1" version = "0.1.4"
dependencies = [ dependencies = [
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"hashbrown 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.44 (git+https://github.com/rust-lang/libc)", "libc 0.2.44 (git+https://github.com/rust-lang/libc)",
"time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
"wabt 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmer-clif-backend 0.1.0", "wasmer-clif-backend 0.1.4",
"wasmer-runtime 0.1.0", "wasmer-runtime 0.1.4",
] ]
[[package]] [[package]]
name = "wasmer-runtime" name = "wasmer-runtime"
version = "0.1.0" version = "0.1.4"
dependencies = [ dependencies = [
"errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"field-offset 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "field-offset 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1143,7 +1144,7 @@ dependencies = [
"nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"page_size 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "page_size 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"wabt 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmer-clif-backend 0.1.0", "wasmer-clif-backend 0.1.4",
] ]
[[package]] [[package]]

View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-clif-backend" name = "wasmer-clif-backend"
version = "0.1.0" version = "0.1.4"
authors = [ authors = [
"Lachlan Sneff <lachlan.sneff@gmail.com>", "Lachlan Sneff <lachlan.sneff@gmail.com>",
"Steve Akinyemi <steve@wasmer.io>", "Steve Akinyemi <steve@wasmer.io>",

View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-emscripten" name = "wasmer-emscripten"
version = "0.1.1" version = "0.1.4"
authors = [ authors = [
"Lachlan Sneff <lachlan.sneff@gmail.com>", "Lachlan Sneff <lachlan.sneff@gmail.com>",
"Steve Akinyemi <steve@wasmer.io>", "Steve Akinyemi <steve@wasmer.io>",
@ -12,6 +12,7 @@ edition = "2018"
build = "build/mod.rs" build = "build/mod.rs"
[dependencies] [dependencies]
hashbrown = "0.1"
wasmer-runtime = { path = "../runtime" } wasmer-runtime = { path = "../runtime" }
libc = { git = "https://github.com/rust-lang/libc" } libc = { git = "https://github.com/rust-lang/libc" }
byteorder = "1" byteorder = "1"

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-runtime" name = "wasmer-runtime"
version = "0.1.0" version = "0.1.4"
authors = [ authors = [
"Lachlan Sneff <lachlan.sneff@gmail.com>", "Lachlan Sneff <lachlan.sneff@gmail.com>",
"Steve Akinyemi <steve@wasmer.io>", "Steve Akinyemi <steve@wasmer.io>",

View File

@ -9,7 +9,7 @@ pub mod backend;
mod backing; mod backing;
pub mod export; pub mod export;
pub mod import; pub mod import;
mod instance; pub mod instance;
pub mod memory; pub mod memory;
mod mmap; mod mmap;
pub mod module; pub mod module;

View File

@ -39,7 +39,7 @@ pub struct ModuleInner {
pub sig_registry: SigRegistry, pub sig_registry: SigRegistry,
} }
pub struct Module(Rc<ModuleInner>); pub struct Module(pub Rc<ModuleInner>);
impl Module { impl Module {
pub(crate) fn new(inner: Rc<ModuleInner>) -> Self { pub(crate) fn new(inner: Rc<ModuleInner>) -> Self {