+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
+
+ 
- 
+ 
- 
+ 
diff --git a/lib/clif-backend/src/code.rs b/lib/clif-backend/src/code.rs
index f5e4b3b7a01..b2ccc66520a 100644
--- a/lib/clif-backend/src/code.rs
+++ b/lib/clif-backend/src/code.rs
@@ -1117,7 +1117,18 @@ impl FunctionCodeGenerator
+
+
-
+
- 
+ 
diff --git a/lib/llvm-backend/src/code.rs b/lib/llvm-backend/src/code.rs
index 2696d2896c6..8ac76fe269b 100644
--- a/lib/llvm-backend/src/code.rs
+++ b/lib/llvm-backend/src/code.rs
@@ -1176,7 +1176,11 @@ impl FunctionCodeGenerator
+
+
-
+
- 
+ 
diff --git a/lib/runtime-c-api/src/memory.rs b/lib/runtime-c-api/src/memory.rs
index 4628d8baa15..21f14bbf77c 100644
--- a/lib/runtime-c-api/src/memory.rs
+++ b/lib/runtime-c-api/src/memory.rs
@@ -1,6 +1,6 @@
//! Create, read, write, grow, destroy memory of an instance.
-use crate::{error::update_last_error, wasmer_limits_t, wasmer_result_t};
+use crate::{error::update_last_error, error::CApiError, wasmer_limits_t, wasmer_result_t};
use std::cell::Cell;
use wasmer_runtime::Memory;
use wasmer_runtime_core::{
@@ -31,12 +31,17 @@ pub unsafe extern "C" fn wasmer_memory_new(
} else {
None
};
- let desc = MemoryDescriptor {
- minimum: Pages(limits.min),
- maximum: max,
- shared: false,
+ let desc = MemoryDescriptor::new(Pages(limits.min), max, false);
+ let new_desc = match desc {
+ Ok(desc) => desc,
+ Err(error) => {
+ update_last_error(CApiError {
+ msg: error.to_string(),
+ });
+ return wasmer_result_t::WASMER_ERROR;
+ }
};
- let result = Memory::new(desc);
+ let result = Memory::new(new_desc);
let new_memory = match result {
Ok(memory) => memory,
Err(error) => {
diff --git a/lib/runtime-c-api/tests/test-exports.c b/lib/runtime-c-api/tests/test-exports.c
index 3af813d0e5c..893174908a5 100644
--- a/lib/runtime-c-api/tests/test-exports.c
+++ b/lib/runtime-c-api/tests/test-exports.c
@@ -242,7 +242,7 @@ int main()
wasmer_result_t call_result = wasmer_export_func_call(exported_function, inputs, inputs_arity, outputs, outputs_arity);
- printf("Result: %lld\n", outputs[0].value.I64);
+ printf("Result: %ld\n", outputs[0].value.I64);
assert(outputs[0].value.I64 == 7);
assert(call_result == WASMER_OK);
diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml
index 8ce52ebe048..8ebea6a77b2 100644
--- a/lib/runtime-core/Cargo.toml
+++ b/lib/runtime-core/Cargo.toml
@@ -8,47 +8,46 @@ repository = "https://github.com/wasmerio/wasmer"
edition = "2018"
[dependencies]
-nix = "0.15.0"
-page_size = "0.4.1"
-wasmparser = "0.35.1"
-parking_lot = "0.9.0"
-lazy_static = "1.4.0"
-errno = "0.2.4"
+nix = "0.15"
+page_size = "0.4"
+wasmparser = "0.37.0"
+parking_lot = "0.9"
+lazy_static = "1.4"
+errno = "0.2"
libc = "0.2.60"
-hex = "0.3.2"
-smallvec = "0.6.10"
+hex = "0.3"
+smallvec = "0.6"
bincode = "1.1"
-colored = "1.8"
[dependencies.indexmap]
-version = "1.2.0"
+version = "1.2"
features = ["serde-1"]
# Dependencies for caching.
[dependencies.serde]
-version = "1.0.99"
+version = "1.0"
# This feature is required for serde to support serializing/deserializing reference counted pointers (e.g. Rc and Arc).
features = ["rc"]
[dependencies.serde_derive]
-version = "1.0.98"
+version = "1.0"
[dependencies.serde_bytes]
-version = "0.11.2"
+version = "0.11"
[dependencies.serde-bench]
version = "0.0.7"
[dependencies.blake2b_simd]
-version = "0.5.8"
+version = "0.5"
[dependencies.digest]
-version = "0.8.1"
+version = "0.8"
[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.8", features = ["memoryapi"] }
+winapi = { version = "0.3", features = ["memoryapi"] }
[dev-dependencies]
-field-offset = "0.1.1"
+field-offset = "0.1"
[build-dependencies]
-blake2b_simd = "0.5.8"
-rustc_version = "0.2.3"
+blake2b_simd = "0.5"
+rustc_version = "0.2"
cc = "1.0"
[features]
diff --git a/lib/runtime-core/README.md b/lib/runtime-core/README.md
index 0bbb74379d3..d64a348bd8d 100644
--- a/lib/runtime-core/README.md
+++ b/lib/runtime-core/README.md
@@ -1,21 +1,21 @@
+
+
-
+
- 
+ 
diff --git a/lib/runtime-core/image-loading-linux-x86-64.s b/lib/runtime-core/image-loading-linux-x86-64.s
index 1d86bab0806..859f010f830 100644
--- a/lib/runtime-core/image-loading-linux-x86-64.s
+++ b/lib/runtime-core/image-loading-linux-x86-64.s
@@ -81,7 +81,7 @@ pushq %r8
pushq %r9
pushq %r10
-callq get_boundary_register_preservation
+callq get_boundary_register_preservation@PLT
# Keep this consistent with BoundaryRegisterPreservation
movq %r15, 0(%rax)
diff --git a/lib/runtime-core/src/backing.rs b/lib/runtime-core/src/backing.rs
index 710471d158f..fb9cb571484 100644
--- a/lib/runtime-core/src/backing.rs
+++ b/lib/runtime-core/src/backing.rs
@@ -54,6 +54,9 @@ pub struct LocalBacking {
pub(crate) internals: Internals,
}
+// Manually implemented because LocalBacking contains raw pointers directly
+unsafe impl Send for LocalBacking {}
+
impl LocalBacking {
pub(crate) fn new(
module: &ModuleInner,
@@ -481,6 +484,9 @@ pub struct ImportBacking {
pub(crate) vm_globals: BoxedMap
+
+
-
+
- 
+ 
diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml
index fd649456953..a78e037e157 100644
--- a/lib/singlepass-backend/Cargo.toml
+++ b/lib/singlepass-backend/Cargo.toml
@@ -10,12 +10,11 @@ readme = "README.md"
[dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.7.0" }
-wasmparser = "0.35.1"
+wasmparser = "0.37.0"
dynasm = "0.3.2"
dynasmrt = "0.3.1"
-lazy_static = "1.4.0"
-byteorder = "1.3.2"
-nix = "0.15.0"
+lazy_static = "1.4"
+byteorder = "1.3"
+nix = "0.15"
libc = "0.2.60"
-smallvec = "0.6.10"
-colored = "1.8"
+smallvec = "0.6"
diff --git a/lib/singlepass-backend/README.md b/lib/singlepass-backend/README.md
index bf477a3388b..4460dcd2707 100644
--- a/lib/singlepass-backend/README.md
+++ b/lib/singlepass-backend/README.md
@@ -1,21 +1,21 @@
+
+
-
+
- 
+ 
diff --git a/lib/spectests/Cargo.toml b/lib/spectests/Cargo.toml
index feab4eccbda..7b3e6adbea7 100644
--- a/lib/spectests/Cargo.toml
+++ b/lib/spectests/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/wasmerio/wasmer"
edition = "2018"
[dependencies]
-glob = "0.3.0"
+glob = "0.3"
wasmer-runtime-core = { path = "../runtime-core", version = "0.7.0" }
wasmer-clif-backend = { path = "../clif-backend", version = "0.7.0" }
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.7.0", optional = true }
diff --git a/lib/spectests/README.md b/lib/spectests/README.md
index 439b95887b0..da05683ea2c 100644
--- a/lib/spectests/README.md
+++ b/lib/spectests/README.md
@@ -1,21 +1,21 @@
+
+
-
+
- 
+ 
diff --git a/lib/spectests/examples/simple/main.rs b/lib/spectests/examples/simple/main.rs
index 357adb5f70d..e9309c3c295 100644
--- a/lib/spectests/examples/simple/main.rs
+++ b/lib/spectests/examples/simple/main.rs
@@ -42,12 +42,8 @@ fn main() -> error::Result<()> {
let inner_module = wasmer_runtime_core::compile_with(&wasm_binary, &get_compiler())?;
- let memory = Memory::new(MemoryDescriptor {
- minimum: Pages(1),
- maximum: Some(Pages(1)),
- shared: false,
- })
- .unwrap();
+ let memory_desc = MemoryDescriptor::new(Pages(1), Some(Pages(1)), false).unwrap();
+ let memory = Memory::new(memory_desc).unwrap();
let global = Global::new(Value::I32(42));
diff --git a/lib/spectests/tests/spectest.rs b/lib/spectests/tests/spectest.rs
index 9cd18d636a8..62bfc7d5381 100644
--- a/lib/spectests/tests/spectest.rs
+++ b/lib/spectests/tests/spectest.rs
@@ -18,7 +18,7 @@ mod tests {
// TODO Files could be run with multiple threads
// TODO Allow running WAST &str directly (E.g. for use outside of spectests)
- use std::rc::Rc;
+ use std::sync::{Arc, Mutex};
struct SpecFailure {
file: String,
@@ -119,6 +119,24 @@ mod tests {
"unknown"
}
+ fn with_instance
+
+
-
+
diff --git a/src/bin/wasmer.rs b/src/bin/wasmer.rs
index f9cffd1ae2e..cbbea3b6b64 100644
--- a/src/bin/wasmer.rs
+++ b/src/bin/wasmer.rs
@@ -512,7 +512,7 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
import_object.allow_missing_functions = true; // Import initialization might be left to the loader.
let instance = module
.instantiate(&import_object)
- .map_err(|e| format!("Can't instantiate module: {:?}", e))?;
+ .map_err(|e| format!("Can't instantiate loader module: {:?}", e))?;
let args: Vec