Merge branch 'master' into feature/jsc-emscripten

wasmerio · Apr 30, 2019 · ce14046 · ce14046
2 parents e68f5e1 + 82cf572
commit ce14046
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/clif-backend/Cargo.toml b/lib/clif-backend/Cargo.toml
@@ -15,7 +15,7 @@ cranelift-entity = "0.30.0"
 cranelift-wasm = "0.30.0"
 hashbrown = "0.1"
 target-lexicon = "0.3.0"
-wasmparser = "0.23.0"
+wasmparser = "0.29.2"
 byteorder = "1"
 nix = "0.13.0"
 libc = "0.2.49"

diff --git a/lib/emscripten/src/process.rs b/lib/emscripten/src/process.rs
@@ -164,7 +164,7 @@ pub fn _system(_ctx: &mut Ctx, _one: i32) -> c_int {
     debug!("emscripten::_system");
     // TODO: May need to change this Em impl to a working version
     eprintln!("Can't call external programs");
-    return EAGAIN;
+    EAGAIN
 }
 
 pub fn _popen(_ctx: &mut Ctx, _one: i32, _two: i32) -> c_int {

diff --git a/lib/emscripten/src/time.rs b/lib/emscripten/src/time.rs
@@ -345,7 +345,7 @@ pub fn _strftime(
     // pad for null?
     let bytes = result_str.chars().count();
     if bytes as u32 > maxsize {
-        return 0;
+        0
     } else {
         // write output string
         for (i, c) in result_str.chars().enumerate() {

diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.3.0" }
 inkwell = { git = "https://github.com/wasmerio/inkwell", branch = "llvm7-0" }
-wasmparser = "0.28.0"
+wasmparser = "0.29.2"
 hashbrown = "0.1.8"
 smallvec = "0.6.8"
 goblin = "0.0.20"

diff --git a/lib/llvm-backend/src/code.rs b/lib/llvm-backend/src/code.rs
@@ -1468,7 +1468,7 @@ fn parse_function(
                     context,
                     &function,
                     -2147483904.0,
-                    2147483648.0,
+                    2_147_483_648.0,
                     v1,
                 );
                 let res =
@@ -1482,8 +1482,8 @@ fn parse_function(
                     intrinsics,
                     context,
                     &function,
-                    -2147483649.0,
-                    2147483648.0,
+                    -2_147_483_649.0,
+                    2_147_483_648.0,
                     v1,
                 );
                 let res =
@@ -1503,8 +1503,8 @@ fn parse_function(
                     intrinsics,
                     context,
                     &function,
-                    -9223373136366403584.0,
-                    9223372036854775808.0,
+                    -9_223_373_136_366_403_584.0,
+                    9_223_372_036_854_775_808.0,
                     v1,
                 );
                 let res =

diff --git a/lib/runtime-abi/Cargo.toml b/lib/runtime-abi/Cargo.toml
@@ -13,7 +13,7 @@ wasmer-runtime-core = { path = "../runtime-core" }
 hashbrown = "0.1"
 failure = "0.1"
 tar = "0.4"
-wasmparser = "0.23.0"
+wasmparser = "0.29.2"
 zstd = "0.4"
 
 [target.'cfg(unix)'.dependencies.zbox]

diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.3.0" }
-wasmparser = "0.28.0"
+wasmparser = "0.29.2"
 dynasm = "0.3.1"
 dynasmrt = "0.3.1"
 lazy_static = "1.2.0"

diff --git a/lib/singlepass-backend/src/protect_unix.rs b/lib/singlepass-backend/src/protect_unix.rs
@@ -11,7 +11,7 @@
 //!
 use libc::{c_int, c_void, siginfo_t};
 use nix::sys::signal::{
-    sigaction, SaFlags, SigAction, SigHandler, SigSet, Signal, SIGBUS, SIGFPE, SIGILL, SIGSEGV,
+    sigaction, SaFlags, SigAction, SigHandler, SigSet, SIGBUS, SIGFPE, SIGILL, SIGSEGV,
 };
 use std::any::Any;
 use std::cell::{Cell, UnsafeCell};

diff --git a/src/webassembly.rs b/src/webassembly.rs
@@ -1,13 +1,6 @@
 use std::panic;
 pub use wasmer_runtime::compile_with_config_with;
-use wasmer_runtime::{
-    self as runtime,
-    error::{CallResult, Result},
-    ImportObject, Instance, Module,
-};
-use wasmer_runtime_core::types::Value;
-
-use wasmer_emscripten::run_emscripten_instance;
+use wasmer_runtime::{self as runtime, error::Result, ImportObject, Instance, Module};
 
 pub struct ResultObject {
     /// A webassembly::Module object representing the compiled WebAssembly module.