From 6cc31d3b49f1299b746125d81b88f589169239c3 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 25 Jul 2019 11:42:47 +0300 Subject: [PATCH 01/41] lib.rs - making `wasmer_byte_array` fields `public` --- lib/runtime-c-api/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/runtime-c-api/src/lib.rs b/lib/runtime-c-api/src/lib.rs index 51f23517c..52a80f3fc 100644 --- a/lib/runtime-c-api/src/lib.rs +++ b/lib/runtime-c-api/src/lib.rs @@ -118,6 +118,6 @@ pub struct wasmer_limit_option_t { #[repr(C)] pub struct wasmer_byte_array { - bytes: *const u8, - bytes_len: u32, + pub bytes: *const u8, + pub bytes_len: u32, } From 015616b5414dfe07b65d5d0ff557d56b227cc90f Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 25 Jul 2019 14:59:59 +0300 Subject: [PATCH 02/41] export.rs - changing `FuncPointer` `inner` visibility to `pub` --- lib/runtime-core/src/export.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/runtime-core/src/export.rs b/lib/runtime-core/src/export.rs index 81e0eae92..1be8cb283 100644 --- a/lib/runtime-core/src/export.rs +++ b/lib/runtime-core/src/export.rs @@ -34,7 +34,7 @@ impl FuncPointer { FuncPointer(f) } - pub(crate) fn inner(&self) -> *const vm::Func { + pub fn inner(&self) -> *const vm::Func { self.0 } } From f04d5523611748dabeeea03ce96a1746f0bfd8f9 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 25 Jul 2019 15:46:57 +0300 Subject: [PATCH 03/41] wasmer-c-api: * error.rs - changing `update_last_error` visibility to `pub`. * error.rs - changing `CApiError` `msg` field visibility to `pub`. --- lib/runtime-c-api/src/error.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/runtime-c-api/src/error.rs b/lib/runtime-c-api/src/error.rs index 1a9322df8..aea8691e9 100644 --- a/lib/runtime-c-api/src/error.rs +++ b/lib/runtime-c-api/src/error.rs @@ -11,7 +11,7 @@ thread_local! { static LAST_ERROR: RefCell>> = RefCell::new(None); } -pub(crate) fn update_last_error(err: E) { +pub fn update_last_error(err: E) { LAST_ERROR.with(|prev| { *prev.borrow_mut() = Some(Box::new(err)); }); @@ -89,8 +89,8 @@ pub unsafe extern "C" fn wasmer_last_error_message(buffer: *mut c_char, length: } #[derive(Debug)] -pub(crate) struct CApiError { - pub(crate) msg: String, +pub struct CApiError { + pub msg: String, } impl Display for CApiError { From 10fc660aadd899e46deddcf00239500dc19a82d2 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Mon, 29 Jul 2019 13:41:28 +0300 Subject: [PATCH 04/41] `wasmer_byte_array` visibility revert (see PR: "wasmer-c-api-changes: making `wasmer_byte_array` fields `public` #589") --- lib/runtime-c-api/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/runtime-c-api/src/lib.rs b/lib/runtime-c-api/src/lib.rs index 52a80f3fc..51f23517c 100644 --- a/lib/runtime-c-api/src/lib.rs +++ b/lib/runtime-c-api/src/lib.rs @@ -118,6 +118,6 @@ pub struct wasmer_limit_option_t { #[repr(C)] pub struct wasmer_byte_array { - pub bytes: *const u8, - pub bytes_len: u32, + bytes: *const u8, + bytes_len: u32, } From a8d2469689937d2965c92bd9504fa7da7c0a3185 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Mon, 29 Jul 2019 13:44:56 +0300 Subject: [PATCH 05/41] wasmer-c-api: returning back `pub(crate) fn inner` for `export.rs` --- lib/runtime-core/src/export.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/runtime-core/src/export.rs b/lib/runtime-core/src/export.rs index 1be8cb283..81e0eae92 100644 --- a/lib/runtime-core/src/export.rs +++ b/lib/runtime-core/src/export.rs @@ -34,7 +34,7 @@ impl FuncPointer { FuncPointer(f) } - pub fn inner(&self) -> *const vm::Func { + pub(crate) fn inner(&self) -> *const vm::Func { self.0 } } From 8408260eddf95251b30f70c318bbe246029b9fe8 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Mon, 29 Jul 2019 17:10:17 +0300 Subject: [PATCH 06/41] wasmer-c-api: adding `#[derive(Debug)]` for `wasmer_result_t` (so that we can do `assert_eq!`) --- lib/runtime-c-api/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/runtime-c-api/src/lib.rs b/lib/runtime-c-api/src/lib.rs index 51f23517c..b087cd356 100644 --- a/lib/runtime-c-api/src/lib.rs +++ b/lib/runtime-c-api/src/lib.rs @@ -97,6 +97,7 @@ pub mod table; pub mod trampoline; pub mod value; +#[derive(Debug)] #[allow(non_camel_case_types)] #[repr(C)] pub enum wasmer_result_t { From 784e65d587de60792e2cd99e95e086a45a9ef916 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Mon, 29 Jul 2019 17:24:43 +0300 Subject: [PATCH 07/41] making `wasmer_byte_array` fields `public` --- lib/runtime-c-api/src/lib.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/runtime-c-api/src/lib.rs b/lib/runtime-c-api/src/lib.rs index b087cd356..52a80f3fc 100644 --- a/lib/runtime-c-api/src/lib.rs +++ b/lib/runtime-c-api/src/lib.rs @@ -97,7 +97,6 @@ pub mod table; pub mod trampoline; pub mod value; -#[derive(Debug)] #[allow(non_camel_case_types)] #[repr(C)] pub enum wasmer_result_t { @@ -119,6 +118,6 @@ pub struct wasmer_limit_option_t { #[repr(C)] pub struct wasmer_byte_array { - bytes: *const u8, - bytes_len: u32, + pub bytes: *const u8, + pub bytes_len: u32, } From 847dd6f65ed7349ba748f8efd96f8627308bc4bd Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Wed, 31 Jul 2019 14:12:25 +0300 Subject: [PATCH 08/41] c-api: adding `wasmer_instance_context_get` (`instance.rs`) --- lib/runtime-c-api/src/instance.rs | 12 ++++ lib/runtime-c-api/tests/CMakeLists.txt | 5 ++ lib/runtime-c-api/tests/assets/inc.wasm | Bin 0 -> 72 bytes lib/runtime-c-api/tests/assets/inc.wast | 7 ++ lib/runtime-c-api/tests/test-context.c | 83 ++++++++++++++++++++++++ lib/runtime-c-api/wasmer.h | 2 + lib/runtime-c-api/wasmer.hh | 2 + 7 files changed, 111 insertions(+) create mode 100644 lib/runtime-c-api/tests/assets/inc.wasm create mode 100644 lib/runtime-c-api/tests/assets/inc.wast create mode 100644 lib/runtime-c-api/tests/test-context.c diff --git a/lib/runtime-c-api/src/instance.rs b/lib/runtime-c-api/src/instance.rs index 5a1f8719a..44b5ccafc 100644 --- a/lib/runtime-c-api/src/instance.rs +++ b/lib/runtime-c-api/src/instance.rs @@ -108,6 +108,18 @@ pub unsafe extern "C" fn wasmer_instantiate( wasmer_result_t::WASMER_OK } +#[allow(clippy::cast_ptr_alignment)] +#[no_mangle] +pub unsafe extern "C" fn wasmer_instance_context_get( + instance: *mut wasmer_instance_t, +) -> *const wasmer_instance_context_t { + let instance_ref = &*(instance as *const Instance); + + let ctx: *const Ctx = instance_ref.context() as *const _; + + ctx as *const wasmer_instance_context_t +} + /// Calls an instances exported function by `name` with the provided parameters. /// Results are set using the provided `results` pointer. /// diff --git a/lib/runtime-c-api/tests/CMakeLists.txt b/lib/runtime-c-api/tests/CMakeLists.txt index 6e636a6a0..c9e13dafc 100644 --- a/lib/runtime-c-api/tests/CMakeLists.txt +++ b/lib/runtime-c-api/tests/CMakeLists.txt @@ -14,6 +14,7 @@ add_executable(test-module-imports test-module-imports.c) add_executable(test-module-serialize test-module-serialize.c) add_executable(test-tables test-tables.c) add_executable(test-validate test-validate.c) +add_executable(test-context test-context.c) find_library( WASMER_LIB NAMES libwasmer_runtime_c_api.dylib libwasmer_runtime_c_api.so libwasmer_runtime_c_api.dll @@ -87,3 +88,7 @@ add_test(test-tables test-tables) target_link_libraries(test-validate general ${WASMER_LIB}) target_compile_options(test-validate PRIVATE ${COMPILER_OPTIONS}) add_test(test-validate test-validate) + +target_link_libraries(test-context general ${WASMER_LIB}) +target_compile_options(test-context PRIVATE ${COMPILER_OPTIONS}) +add_test(test-context test-context) diff --git a/lib/runtime-c-api/tests/assets/inc.wasm b/lib/runtime-c-api/tests/assets/inc.wasm new file mode 100644 index 0000000000000000000000000000000000000000..d7a66c10eded82be89a5cde77e4869e4b3a04e76 GIT binary patch literal 72 zcmW;AI}Uh*;vABhqvq;Y*flo$(XG`4QtPd6FLu?vv53>n=vnXBz`Tbtq6T2JIm T>PLmQQ)x^3(gv@NNK|+L(}N6~ literal 0 HcmV?d00001 diff --git a/lib/runtime-c-api/tests/assets/inc.wast b/lib/runtime-c-api/tests/assets/inc.wast new file mode 100644 index 000000000..4b5e58c9f --- /dev/null +++ b/lib/runtime-c-api/tests/assets/inc.wast @@ -0,0 +1,7 @@ +(module + (func $inc (import "env" "inc")) + (func $get (import "env" "get") (result i32)) + + (func (export "inc_and_get") (result i32) + call $inc + call $get)) diff --git a/lib/runtime-c-api/tests/test-context.c b/lib/runtime-c-api/tests/test-context.c new file mode 100644 index 000000000..cc8bfcef5 --- /dev/null +++ b/lib/runtime-c-api/tests/test-context.c @@ -0,0 +1,83 @@ +#include +#include "../wasmer.h" +#include +#include +#include + +typedef struct { + int32_t amount; + int32_t value; +} counter_data; + +void inc_counter(wasmer_instance_context_t *ctx) { + counter_data* data = (counter_data*)wasmer_instance_context_data_get(ctx); + data->value = data->value + data->amount; +} + +int32_t get_counter(wasmer_instance_context_t *ctx) { + counter_data* data = (counter_data*)wasmer_instance_context_data_get(ctx); + return data->value; +} + +wasmer_import_t create_import(char* module_name, char* import_name, wasmer_import_func_t *func) { + wasmer_import_t import; + wasmer_byte_array module_name_bytes; + wasmer_byte_array import_name_bytes; + + module_name_bytes.bytes = (const uint8_t *) module_name; + module_name_bytes.bytes_len = strlen(module_name); + + import_name_bytes.bytes = (const uint8_t *) import_name; + import_name_bytes.bytes_len = strlen(import_name); + + import.module_name = module_name_bytes; + import.import_name = import_name_bytes; + + import.tag = WASM_FUNCTION; + import.value.func = func; + + return import; +} + +int main() +{ + // Imports + wasmer_value_tag inc_params_sig[] = {}; + wasmer_value_tag inc_returns_sig[] = {}; + wasmer_import_func_t *inc_func = wasmer_import_func_new((void (*)(void *)) inc_counter, inc_params_sig, 0, inc_returns_sig, 0); + wasmer_import_t inc_import = create_import("env", "inc", inc_func); + + wasmer_value_tag get_params_sig[] = {}; + wasmer_value_tag get_returns_sig[] = {WASM_I32}; + wasmer_import_func_t *get_func = wasmer_import_func_new((void (*)(void *)) get_counter, get_params_sig, 0, get_returns_sig, 1); + wasmer_import_t get_import = create_import("env", "get", get_func); + + wasmer_import_t imports[] = {inc_import, get_import}; + + // Read the wasm file bytes + FILE *file = fopen("assets/inc.wasm", "r"); + fseek(file, 0, SEEK_END); + long len = ftell(file); + uint8_t *bytes = malloc(len); + fseek(file, 0, SEEK_SET); + fread(bytes, 1, len, file); + fclose(file); + + printf("Instantiating\n"); + wasmer_instance_t *instance = NULL; + wasmer_result_t compile_result = wasmer_instantiate(&instance, bytes, len, imports, 2); + printf("Compile result: %d\n", compile_result); + + counter_data* counter = malloc(sizeof(counter_data)); + counter->value = 0; + counter->amount = 5; + wasmer_instance_context_data_set(instance, counter); + + wasmer_result_t call1_result = wasmer_instance_call(instance, "inc_and_get", NULL, 0, NULL, 0); + printf("Call result: %d\n", call1_result); + + wasmer_result_t call2_result = wasmer_instance_call(instance, "inc_and_get", NULL, 0, NULL, 0); + printf("Call result: %d\n", call2_result); + + return 0; +} diff --git a/lib/runtime-c-api/wasmer.h b/lib/runtime-c-api/wasmer.h index 7c0f5249a..ad6259efe 100644 --- a/lib/runtime-c-api/wasmer.h +++ b/lib/runtime-c-api/wasmer.h @@ -417,6 +417,8 @@ void *wasmer_instance_context_data_get(const wasmer_instance_context_t *ctx); */ void wasmer_instance_context_data_set(wasmer_instance_t *instance, void *data_ptr); +const wasmer_instance_context_t *wasmer_instance_context_get(wasmer_instance_t *instance); + /** * Gets the memory within the context at the index `memory_idx`. * The index is always 0 until multiple memories are supported. diff --git a/lib/runtime-c-api/wasmer.hh b/lib/runtime-c-api/wasmer.hh index 1c00b74c3..a86a901f3 100644 --- a/lib/runtime-c-api/wasmer.hh +++ b/lib/runtime-c-api/wasmer.hh @@ -337,6 +337,8 @@ void *wasmer_instance_context_data_get(const wasmer_instance_context_t *ctx); /// passed to all imported function for instance. void wasmer_instance_context_data_set(wasmer_instance_t *instance, void *data_ptr); +const wasmer_instance_context_t *wasmer_instance_context_get(wasmer_instance_t *instance); + /// Gets the memory within the context at the index `memory_idx`. /// The index is always 0 until multiple memories are supported. const wasmer_memory_t *wasmer_instance_context_memory(const wasmer_instance_context_t *ctx, From 351977690b263f6cf2d2abf323f2b85d5e129db4 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Wed, 31 Jul 2019 14:15:16 +0300 Subject: [PATCH 09/41] adding a document for `wasmer_instance_context_get` --- lib/runtime-c-api/src/instance.rs | 1 + lib/runtime-c-api/wasmer.h | 3 +++ lib/runtime-c-api/wasmer.hh | 1 + 3 files changed, 5 insertions(+) diff --git a/lib/runtime-c-api/src/instance.rs b/lib/runtime-c-api/src/instance.rs index 44b5ccafc..f36c0503e 100644 --- a/lib/runtime-c-api/src/instance.rs +++ b/lib/runtime-c-api/src/instance.rs @@ -108,6 +108,7 @@ pub unsafe extern "C" fn wasmer_instantiate( wasmer_result_t::WASMER_OK } +/// Extracts the instance's context and returns it. #[allow(clippy::cast_ptr_alignment)] #[no_mangle] pub unsafe extern "C" fn wasmer_instance_context_get( diff --git a/lib/runtime-c-api/wasmer.h b/lib/runtime-c-api/wasmer.h index ad6259efe..b911ee1e6 100644 --- a/lib/runtime-c-api/wasmer.h +++ b/lib/runtime-c-api/wasmer.h @@ -417,6 +417,9 @@ void *wasmer_instance_context_data_get(const wasmer_instance_context_t *ctx); */ void wasmer_instance_context_data_set(wasmer_instance_t *instance, void *data_ptr); +/** + * Extracts the instance's context and returns it. + */ const wasmer_instance_context_t *wasmer_instance_context_get(wasmer_instance_t *instance); /** diff --git a/lib/runtime-c-api/wasmer.hh b/lib/runtime-c-api/wasmer.hh index a86a901f3..75a937690 100644 --- a/lib/runtime-c-api/wasmer.hh +++ b/lib/runtime-c-api/wasmer.hh @@ -337,6 +337,7 @@ void *wasmer_instance_context_data_get(const wasmer_instance_context_t *ctx); /// passed to all imported function for instance. void wasmer_instance_context_data_set(wasmer_instance_t *instance, void *data_ptr); +/// Extracts the instance's context and returns it. const wasmer_instance_context_t *wasmer_instance_context_get(wasmer_instance_t *instance); /// Gets the memory within the context at the index `memory_idx`. From f6b5f1ba1b7ec435a6237f0d389656f5677b1491 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Wed, 31 Jul 2019 14:32:38 +0300 Subject: [PATCH 10/41] wasmer-c-api: adding `asserts` to `tests/test-context.c` --- lib/runtime-c-api/tests/test-context.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/runtime-c-api/tests/test-context.c b/lib/runtime-c-api/tests/test-context.c index cc8bfcef5..5e792fa84 100644 --- a/lib/runtime-c-api/tests/test-context.c +++ b/lib/runtime-c-api/tests/test-context.c @@ -73,11 +73,21 @@ int main() counter->amount = 5; wasmer_instance_context_data_set(instance, counter); - wasmer_result_t call1_result = wasmer_instance_call(instance, "inc_and_get", NULL, 0, NULL, 0); - printf("Call result: %d\n", call1_result); + wasmer_value_t result_one; + wasmer_value_t params[] = {}; + wasmer_value_t results[] = {result_one}; - wasmer_result_t call2_result = wasmer_instance_call(instance, "inc_and_get", NULL, 0, NULL, 0); + wasmer_result_t call1_result = wasmer_instance_call(instance, "inc_and_get", params, 0, results, 1); + printf("Call result: %d\n", call1_result); + printf("Result: %d\n", results[0].value.I32); + assert(results[0].value.I32 == 5); + assert(call1_result == WASMER_OK); + + wasmer_result_t call2_result = wasmer_instance_call(instance, "inc_and_get", params, 0, results, 1); printf("Call result: %d\n", call2_result); + printf("Result: %d\n", results[0].value.I32); + assert(results[0].value.I32 == 10); + assert(call2_result == WASMER_OK); return 0; } From 0fb7eb1e1948dd853b5c284e6ef2374c604262ce Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Wed, 31 Jul 2019 14:48:22 +0300 Subject: [PATCH 11/41] tests/test-context.c - destroying resources in the end --- lib/runtime-c-api/tests/test-context | Bin 0 -> 13908 bytes lib/runtime-c-api/tests/test-context.c | 12 +++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100755 lib/runtime-c-api/tests/test-context diff --git a/lib/runtime-c-api/tests/test-context b/lib/runtime-c-api/tests/test-context new file mode 100755 index 0000000000000000000000000000000000000000..7b968acf6404940066f64987364d3dfc686b04f5 GIT binary patch literal 13908 zcmeHOZE#dq8NORUD1|2d()dx?VTwa7WD^Q4tzdWC#NL#ojfGAT#hYbwAuIb4cQ++; ziW5q2<;?A^Q3-?7Ka8Vet*tVSsWBQSLZ?Y_#-^DLFb?Bn+KLy&PFfv}%t(BmbIvZC z4N!mh!yord&UwGz^SxKD-5t?HdJy#iqaUJ@hd4}N_VPJ;wQFIgC zvRY&JH*RTs_#tv$R#s7v_hr7-cPFdmdhd<2I=xP!#4z$)s@+m%(Pp{ z%=WCLXRgP<66KF;&PKY@hmxp~>$(;u9R(_0X%>yl)rn#506f%Syn23 zrTA*X%HLsaLAu-@^ZkgH5wLFRy=rcHa6@B5Q}LastEd}jwoUp0qaVH0lD`!1tyICl zTowSXl@c{XK_7v^WW8Z@fW@_}L2p}S7#|1x)oQ%&kY5A56}`L_-@EcUl*@@%!~V8P zCg^L?!|039BVGAiB$eD2Y2Te{2hGO08OM?DAKZBBg4@Rq_zjP@edoO;2us=_Bsf_p zJ8@adIY&dE23}2>Zp)Fs%%{A#ka6B9I%Vb0Z#35#FLW@PUGaR{&RMyxOd*-Jt%Mct zOx7a8ea_TGzDhVco+!*!K;Ka#g|`N-~gE{k`r zP_Q%5Pi7*!vbmj+d^(~ch!oOh<&eAZ#}lXwra^!GKZ=q#w`24;2^AIADv~Q^;=CbWr{BJMu@sQJMb10!wsTwf-!(MiYO=jbcsI(KFwef0y<%e7{eU}tOgtd ztQm=g881j5&8|ltQtFVR zuL|o=1Wo{px_`j60AzC3Px^erIT-wG4cyj2!L@nVgS1C#0 z4NcL;TjMcZ@1|z~{NMZ=p%37^6rm%dmR?gF#~R7x#Yt1v+@zWCq5%G#Dl+2czTrC5 zKsps8CKk%=qpE)cb-eYfvlvnssp!IH)5lN|v|&Im9cR z72q5({B4qlI*d4{z=2zY)?el|CdN!}h_VK8G&aBlP-nV(6sE#?6R6wI5w0JCYdBpD z$skWO#Yy4ZLfx}`H-s}vHCKX>=v?|LQu6W#`EVl5GsUa^pP*Ae-t0B@n4WV4GWodS zSwms}DNcyKF!iy9!l?n)ESzcp|7lL=Is;M&Th|#@=>Fmq-kJes?)K5l_2{PAmBz7O z$R{ce7s7dw(teJ}j+IAt5lGyw{a}1sR$vjNVAp`XZ_obuv8n^dVm*JGj`h49idDV* zTQl*7x$iuDEr4FtQ@Cs4BD8aMZ;dMd;va$<+z5%^i^5{)=<@f;nmZ(gsNU1 z)qYAImMRZn2^R0A2i`CE4;DStzozQe$GTn2dl+%*9QQy~IL|}u_H#sBKZX>^Y=A`N z_!BUMGZ#{@SA&fl7a_-^v7Yyl<6F$}cqvB%dZh?^V2T{SCc)x=0StbD5x$5)=g3*F zkmF~Shjq%sI6Z8khp!YpAT91+{tv(a&KKW*PT_o#{Ff9yN}TnD&IIxMCBFWBI(F~D zWna{RL#&&ly!IZn!vaZE4!yBz-^$0>}>-px$_v5nKq?gH%X7)Cf}&mhN+w~3u5 zb`_U?@AT!4u_YuFQl~<#|0-n+!s%!W=bE{ zs?!QIXREUHnucAY(2E$vNrXrq|vHN8ezqF*Cbmx#Is=V&KuWqvd3`0 z%tjj90PdwixL2aJY$c?~D8g&?y>g9)OEp}f;T;-AHGDwBO&We#!wwB|8a|=n(;ANI z`|xoMPiuHa!$}R#YdBZi72^zGP=TNVK?Q;e1QiG>5L6(jKv0380zn0W3Ir7hD)7M- zxNd1p8;^Rfk6Qe6J)YQUB|3ImJG$bzcH{H8>fR_n+EpL5Z^L)v_^7?d$2pB`p%swUM&ZiO$`mIuwQTBT}89I`I*GVLPdAQ23@kr6%qPT^F_V zx4_ACXBJs(@4^vMI}UboS?O&5WmGcuF8b>&7s~^x1U@H5U=$v@q)?p~S?%#cT%J=w z@$d&K>SUh3lww)5M`p=+UdCF=7P4@hKF>;bSa!Fa=qlLwtwNm3`T!5k5?Oo>4dOwZ zo|TA=2`mg0Re6lf^4x4IPnzZ!6Du$rUWs9h!$hr`1^j3o&#S3b6;fYp^RS8El2-v4 z144S4rVneHpEpy^Gc3yQDbo19n{*>OAl=HwgWGc2uAsXs=$;Dt>lO5~74(4$ng__` z^L@91exZWq!DhMsUkx|EDNPl-Qc%bCrs+-t6^A)_m9heglD-DRe!+E!-$ IdoYau01yFqTL1t6 literal 0 HcmV?d00001 diff --git a/lib/runtime-c-api/tests/test-context.c b/lib/runtime-c-api/tests/test-context.c index 5e792fa84..db967be3c 100644 --- a/lib/runtime-c-api/tests/test-context.c +++ b/lib/runtime-c-api/tests/test-context.c @@ -69,7 +69,7 @@ int main() printf("Compile result: %d\n", compile_result); counter_data* counter = malloc(sizeof(counter_data)); - counter->value = 0; + counter->value = 2; counter->amount = 5; wasmer_instance_context_data_set(instance, counter); @@ -80,14 +80,20 @@ int main() wasmer_result_t call1_result = wasmer_instance_call(instance, "inc_and_get", params, 0, results, 1); printf("Call result: %d\n", call1_result); printf("Result: %d\n", results[0].value.I32); - assert(results[0].value.I32 == 5); + assert(results[0].value.I32 == 7); assert(call1_result == WASMER_OK); wasmer_result_t call2_result = wasmer_instance_call(instance, "inc_and_get", params, 0, results, 1); printf("Call result: %d\n", call2_result); printf("Result: %d\n", results[0].value.I32); - assert(results[0].value.I32 == 10); + assert(results[0].value.I32 == 12); assert(call2_result == WASMER_OK); + wasmer_import_func_destroy(inc_func); + wasmer_import_func_destroy(get_func); + wasmer_instance_destroy(instance); + free(counter); + free(bytes); + return 0; } From fccf68c734fcddc869cd21a5bcd751eb5b4e7970 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 10:28:45 -0700 Subject: [PATCH 12/41] Updated version to 0.6.0 --- Cargo.toml | 2 +- lib/clif-backend/Cargo.toml | 6 +++--- lib/dev-utils/Cargo.toml | 2 +- lib/emscripten-tests/Cargo.toml | 14 +++++++------- lib/emscripten/Cargo.toml | 4 ++-- lib/llvm-backend/Cargo.toml | 4 ++-- lib/middleware-common/Cargo.toml | 8 ++++---- lib/runtime-abi/Cargo.toml | 2 +- lib/runtime-c-api/Cargo.toml | 6 +++--- lib/runtime-core/Cargo.toml | 2 +- lib/runtime/Cargo.toml | 8 ++++---- lib/singlepass-backend/Cargo.toml | 4 ++-- lib/spectests/Cargo.toml | 10 +++++----- lib/wasi-tests/Cargo.toml | 14 +++++++------- lib/wasi/Cargo.toml | 4 ++-- lib/win-exception-handler/Cargo.toml | 4 ++-- scripts/update_version_numbers.sh | 4 ++-- 17 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index df444a5df..273f87f08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer" -version = "0.5.7" +version = "0.6.0" authors = ["The Wasmer Engineering Team "] edition = "2018" repository = "https://github.com/wasmerio/wasmer" diff --git a/lib/clif-backend/Cargo.toml b/lib/clif-backend/Cargo.toml index 0620fe806..4d443e359 100644 --- a/lib/clif-backend/Cargo.toml +++ b/lib/clif-backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-clif-backend" -version = "0.5.7" +version = "0.6.0" description = "Wasmer runtime Cranelift compiler backend" license = "MIT" authors = ["The Wasmer Engineering Team "] @@ -9,7 +9,7 @@ edition = "2018" readme = "README.md" [dependencies] -wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" } +wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } cranelift-native = { version = "0.31" } cranelift-codegen = { version = "0.31" } cranelift-entity = { version = "0.31" } @@ -35,7 +35,7 @@ version = "0.0.7" [target.'cfg(windows)'.dependencies] winapi = { version = "0.3", features = ["errhandlingapi", "minwindef", "minwinbase", "winnt"] } -wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.5.7" } +wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.6.0" } [features] debug = ["wasmer-runtime-core/debug"] diff --git a/lib/dev-utils/Cargo.toml b/lib/dev-utils/Cargo.toml index add06c9ac..0655a5b33 100644 --- a/lib/dev-utils/Cargo.toml +++ b/lib/dev-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-dev-utils" -version = "0.5.7" +version = "0.6.0" description = "Wasmer runtime core library" license = "MIT" authors = ["The Wasmer Engineering Team "] diff --git a/lib/emscripten-tests/Cargo.toml b/lib/emscripten-tests/Cargo.toml index 3928b7c05..f8a3aa52c 100644 --- a/lib/emscripten-tests/Cargo.toml +++ b/lib/emscripten-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-emscripten-tests" -version = "0.5.7" +version = "0.6.0" description = "Tests for our Emscripten implementation" license = "MIT" authors = ["The Wasmer Engineering Team "] @@ -9,15 +9,15 @@ publish = false build = "build/mod.rs" [dependencies] -wasmer-emscripten = { path = "../emscripten", version = "0.5.7" } -wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" } -wasmer-clif-backend = { path = "../clif-backend", version = "0.5.7" } -wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.7", optional = true } -wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true } +wasmer-emscripten = { path = "../emscripten", version = "0.6.0" } +wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } +wasmer-clif-backend = { path = "../clif-backend", version = "0.6.0" } +wasmer-llvm-backend = { path = "../llvm-backend", version = "0.6.0", optional = true } +wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true } [dev-dependencies] wabt = "0.9.0" -wasmer-dev-utils = { path = "../dev-utils", version = "0.5.7"} +wasmer-dev-utils = { path = "../dev-utils", version = "0.6.0"} [build-dependencies] glob = "0.2.11" diff --git a/lib/emscripten/Cargo.toml b/lib/emscripten/Cargo.toml index fc27ac59b..6e160b774 100644 --- a/lib/emscripten/Cargo.toml +++ b/lib/emscripten/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-emscripten" -version = "0.5.7" +version = "0.6.0" description = "Wasmer runtime emscripten implementation library" license = "MIT" authors = ["The Wasmer Engineering Team "] @@ -13,7 +13,7 @@ hashbrown = "0.1" lazy_static = "1.2.0" libc = "0.2.49" time = "0.1.41" -wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" } +wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } [target.'cfg(windows)'.dependencies] rand = "0.6" diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml index 64c3475fb..de720e51e 100644 --- a/lib/llvm-backend/Cargo.toml +++ b/lib/llvm-backend/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "wasmer-llvm-backend" -version = "0.5.7" +version = "0.6.0" authors = ["The Wasmer Engineering Team "] edition = "2018" readme = "README.md" [dependencies] -wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" } +wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } wasmparser = "0.34.0" hashbrown = "0.1.8" smallvec = "0.6.8" diff --git a/lib/middleware-common/Cargo.toml b/lib/middleware-common/Cargo.toml index d7aa7a2ef..b0e43f7ac 100644 --- a/lib/middleware-common/Cargo.toml +++ b/lib/middleware-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-middleware-common" -version = "0.5.7" +version = "0.6.0" repository = "https://github.com/wasmerio/wasmer" description = "Wasmer runtime common middlewares" license = "MIT" @@ -9,9 +9,9 @@ edition = "2018" [dependencies] wasmer-runtime-core = { path = "../runtime-core" } -wasmer-clif-backend = { path = "../clif-backend", version = "0.5.7" } -wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.7", optional = true } -wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true } +wasmer-clif-backend = { path = "../clif-backend", version = "0.6.0" } +wasmer-llvm-backend = { path = "../llvm-backend", version = "0.6.0", optional = true } +wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true } [dev-dependencies] wabt = "0.9.0" diff --git a/lib/runtime-abi/Cargo.toml b/lib/runtime-abi/Cargo.toml index 5809c72af..0d688a54f 100644 --- a/lib/runtime-abi/Cargo.toml +++ b/lib/runtime-abi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-runtime-abi" -version = "0.5.7" +version = "0.6.0" description = "Wasmer runtime core library" license = "MIT" authors = ["The Wasmer Engineering Team "] diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index 97a168912..cd004b39c 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-runtime-c-api" -version = "0.5.7" +version = "0.6.0" description = "Wasmer C API library" license = "MIT" authors = ["The Wasmer Engineering Team "] @@ -16,11 +16,11 @@ libc = "0.2" [dependencies.wasmer-runtime] path = "../runtime" -version = "0.5.7" +version = "0.6.0" [dependencies.wasmer-runtime-core] path = "../runtime-core" -version = "0.5.7" +version = "0.6.0" [features] debug = ["wasmer-runtime/debug"] diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml index ed5c54592..642cdd271 100644 --- a/lib/runtime-core/Cargo.toml +++ b/lib/runtime-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-runtime-core" -version = "0.5.7" +version = "0.6.0" description = "Wasmer runtime core library" license = "MIT" authors = ["The Wasmer Engineering Team "] diff --git a/lib/runtime/Cargo.toml b/lib/runtime/Cargo.toml index b4ac5c9d5..0ac13406d 100644 --- a/lib/runtime/Cargo.toml +++ b/lib/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-runtime" -version = "0.5.7" +version = "0.6.0" description = "Wasmer runtime library" license = "MIT" authors = ["The Wasmer Engineering Team "] @@ -9,17 +9,17 @@ edition = "2018" readme = "README.md" [dependencies] -wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true } +wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true } lazy_static = "1.2.0" memmap = "0.7.0" [dependencies.wasmer-runtime-core] path = "../runtime-core" -version = "0.5.7" +version = "0.6.0" [dependencies.wasmer-clif-backend] path = "../clif-backend" -version = "0.5.7" +version = "0.6.0" optional = true [dev-dependencies] diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml index fda6a36db..ac100cafc 100644 --- a/lib/singlepass-backend/Cargo.toml +++ b/lib/singlepass-backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-singlepass-backend" -version = "0.5.7" +version = "0.6.0" repository = "https://github.com/wasmerio/wasmer" description = "Wasmer runtime single pass compiler backend" license = "MIT" @@ -9,7 +9,7 @@ edition = "2018" readme = "README.md" [dependencies] -wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" } +wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } wasmparser = "0.34.0" dynasm = "0.3.2" dynasmrt = "0.3.1" diff --git a/lib/spectests/Cargo.toml b/lib/spectests/Cargo.toml index 343690e8a..85c3bbdea 100644 --- a/lib/spectests/Cargo.toml +++ b/lib/spectests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-spectests" -version = "0.5.7" +version = "0.6.0" description = "Wasmer spectests library" license = "MIT" authors = ["The Wasmer Engineering Team "] @@ -9,10 +9,10 @@ edition = "2018" build = "build/mod.rs" [dependencies] -wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" } -wasmer-clif-backend = { path = "../clif-backend", version = "0.5.7" } -wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.7", optional = true } -wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true } +wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } +wasmer-clif-backend = { path = "../clif-backend", version = "0.6.0" } +wasmer-llvm-backend = { path = "../llvm-backend", version = "0.6.0", optional = true } +wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true } [build-dependencies] wabt = "0.9.0" diff --git a/lib/wasi-tests/Cargo.toml b/lib/wasi-tests/Cargo.toml index f7790df10..f0e4d3451 100644 --- a/lib/wasi-tests/Cargo.toml +++ b/lib/wasi-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-wasi-tests" -version = "0.5.7" +version = "0.6.0" description = "Tests for our WASI implementation" license = "MIT" authors = ["The Wasmer Engineering Team "] @@ -9,19 +9,19 @@ publish = false build = "build/mod.rs" [dependencies] -wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" } -wasmer-wasi = { path = "../wasi", version = "0.5.7" } +wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } +wasmer-wasi = { path = "../wasi", version = "0.6.0" } # hack to get tests to work -wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true } -wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.7", optional = true } +wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true } +wasmer-llvm-backend = { path = "../llvm-backend", version = "0.6.0", optional = true } [build-dependencies] glob = "0.2.11" [dev-dependencies] -wasmer-clif-backend = { path = "../clif-backend", version = "0.5.7" } -wasmer-dev-utils = { path = "../dev-utils", version = "0.5.7"} +wasmer-clif-backend = { path = "../clif-backend", version = "0.6.0" } +wasmer-dev-utils = { path = "../dev-utils", version = "0.6.0"} [features] clif = [] diff --git a/lib/wasi/Cargo.toml b/lib/wasi/Cargo.toml index 8b8a83dca..ede343477 100644 --- a/lib/wasi/Cargo.toml +++ b/lib/wasi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-wasi" -version = "0.5.7" +version = "0.6.0" description = "Wasmer runtime WASI implementation library" license = "MIT" authors = ["The Wasmer Engineering Team "] @@ -8,7 +8,7 @@ repository = "https://github.com/wasmerio/wasmer" edition = "2018" [dependencies] -wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" } +wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } libc = "0.2.50" rand = "0.6.5" # wasmer-runtime-abi = { path = "../runtime-abi" } diff --git a/lib/win-exception-handler/Cargo.toml b/lib/win-exception-handler/Cargo.toml index 5fee918af..61fe120d7 100644 --- a/lib/win-exception-handler/Cargo.toml +++ b/lib/win-exception-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-win-exception-handler" -version = "0.5.7" +version = "0.6.0" description = "Wasmer runtime exception handling for Windows" license = "MIT" authors = ["The Wasmer Engineering Team "] @@ -8,7 +8,7 @@ repository = "https://github.com/wasmerio/wasmer" edition = "2018" [target.'cfg(windows)'.dependencies] -wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" } +wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } winapi = { version = "0.3", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] } libc = "0.2.49" diff --git a/scripts/update_version_numbers.sh b/scripts/update_version_numbers.sh index 0f39ec149..9108a3e31 100755 --- a/scripts/update_version_numbers.sh +++ b/scripts/update_version_numbers.sh @@ -1,5 +1,5 @@ -PREVIOUS_VERSION='0.5.6' -NEXT_VERSION='0.5.7' +PREVIOUS_VERSION='0.5.7' +NEXT_VERSION='0.6.0' # quick hack fd Cargo.toml --exec sed -i '' "s/version = \"$PREVIOUS_VERSION\"/version = \"$NEXT_VERSION\"/" From d95ef833319ccba343d214b5629a3e3cace32071 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 10:34:53 -0700 Subject: [PATCH 13/41] Updated wapm-cli to 0.3.7 --- wapm-cli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wapm-cli b/wapm-cli index 62ec59a53..b15715356 160000 --- a/wapm-cli +++ b/wapm-cli @@ -1 +1 @@ -Subproject commit 62ec59a53ca3df84019092a750aeb56e08b9d556 +Subproject commit b157153568fc45f0d01ba8443c54fc3c2ce0cb23 From fdda670b58fd5c3471eaebb6d1b04ca667242c91 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 10:35:45 -0700 Subject: [PATCH 14/41] Updated Changelog wrapping 0.6.0 version --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3460e4bf7..aee892153 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ All PRs to the Wasmer repository must add to this file. Blocks of changes will separated by version increments. ## **[Unreleased]** + +## 0.6.0 - 2019-07-31 +- [#603](https://github.com/wasmerio/wasmer/pull/603) Update Wapm-cli, bump version numbers - [#595](https://github.com/wasmerio/wasmer/pull/595) Add unstable public API for interfacing with the WASI file system in plugin-like usecases - [#598](https://github.com/wasmerio/wasmer/pull/598) LLVM Backend is now supported in Windows - [#599](https://github.com/wasmerio/wasmer/pull/599) Fix llvm backend failures in fat spec tests and simd_binaryen spec test. From 0e1fedceeffc64ac1531ddbd912e45405caa327d Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Wed, 31 Jul 2019 11:08:38 -0700 Subject: [PATCH 15/41] Fix build of metering_benchmark with the llvm backend. --- .../benches/metering_benchmark.rs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/middleware-common/benches/metering_benchmark.rs b/lib/middleware-common/benches/metering_benchmark.rs index 4c5f689f4..79796646a 100644 --- a/lib/middleware-common/benches/metering_benchmark.rs +++ b/lib/middleware-common/benches/metering_benchmark.rs @@ -135,16 +135,15 @@ static WAT_GAS: &'static str = r#" #[cfg(feature = "llvm")] fn get_compiler(limit: u64, metering: bool) -> impl Compiler { - use wasmer_llvm_backend::code::LLVMModuleCodeGenerator; + use wasmer_llvm_backend::ModuleCodeGenerator; use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler}; - let c: StreamingCompiler = - StreamingCompiler::new(move || { - let mut chain = MiddlewareChain::new(); - if metering { - chain.push(Metering::new(limit)); - } - chain - }); + let c: StreamingCompiler = StreamingCompiler::new(move || { + let mut chain = MiddlewareChain::new(); + if metering { + chain.push(Metering::new(limit)); + } + chain + }); c } From 931d556de1a3039025eda1cf3308b6434240199a Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Wed, 31 Jul 2019 13:10:51 -0700 Subject: [PATCH 16/41] Add support for internal fields. --- lib/llvm-backend/src/code.rs | 40 ++++++++++++++++++++++++------ lib/llvm-backend/src/intrinsics.rs | 29 +++++++++++++++++++++- 2 files changed, 60 insertions(+), 9 deletions(-) diff --git a/lib/llvm-backend/src/code.rs b/lib/llvm-backend/src/code.rs index df42e8f9a..07dbbacc4 100644 --- a/lib/llvm-backend/src/code.rs +++ b/lib/llvm-backend/src/code.rs @@ -594,14 +594,6 @@ impl FunctionCodeGenerator for LLVMFunctionCodeGenerator { } fn feed_event(&mut self, event: Event, module_info: &ModuleInfo) -> Result<(), CodegenError> { - let op = match event { - Event::Wasm(x) => x, - Event::Internal(_x) => { - return Ok(()); - } - Event::WasmOwned(ref x) => x, - }; - let mut state = &mut self.state; let builder = self.builder.as_ref().unwrap(); let context = self.context.as_ref().unwrap(); @@ -612,6 +604,38 @@ impl FunctionCodeGenerator for LLVMFunctionCodeGenerator { let signatures = &self.signatures; let mut ctx = self.ctx.as_mut().unwrap(); + let op = match event { + Event::Wasm(x) => x, + Event::WasmOwned(ref x) => x, + Event::Internal(x) => { + match x { + InternalEvent::FunctionBegin(_) | InternalEvent::FunctionEnd => { + return Ok(()); + } + InternalEvent::Breakpoint(_callback) => { + return Ok(()); + } + InternalEvent::GetInternal(idx) => { + if state.reachable { + let idx = idx as usize; + let field_ptr = ctx.internal_field(idx, intrinsics, builder); + let result = builder.build_load(field_ptr, "get_internal"); + state.push1(result); + } + } + InternalEvent::SetInternal(idx) => { + if state.reachable { + let idx = idx as usize; + let field_ptr = ctx.internal_field(idx, intrinsics, builder); + let v = state.pop1()?; + builder.build_store(field_ptr, v); + } + } + } + return Ok(()); + } + }; + if !state.reachable { match *op { Operator::Block { ty: _ } | Operator::Loop { ty: _ } | Operator::If { ty: _ } => { diff --git a/lib/llvm-backend/src/intrinsics.rs b/lib/llvm-backend/src/intrinsics.rs index 210fb15e6..778c09cb0 100644 --- a/lib/llvm-backend/src/intrinsics.rs +++ b/lib/llvm-backend/src/intrinsics.rs @@ -18,7 +18,7 @@ use wasmer_runtime_core::{ GlobalIndex, ImportedFuncIndex, LocalFuncIndex, LocalOrImport, MemoryIndex, SigIndex, TableIndex, Type, }, - vm::Ctx, + vm::{Ctx, INTERNALS_SIZE}, }; fn type_to_llvm_ptr(intrinsics: &Intrinsics, ty: Type) -> PointerType { @@ -942,4 +942,31 @@ impl<'a> CtxType<'a> { (imported_func_cache.func_ptr, imported_func_cache.ctx_ptr) } + + pub fn internal_field( + &mut self, + index: usize, + intrinsics: &Intrinsics, + builder: &Builder, + ) -> PointerValue { + assert!(index < INTERNALS_SIZE); + + let local_internals_ptr_ptr = unsafe { + builder.build_struct_gep( + self.ctx_ptr_value, + offset_to_index(Ctx::offset_internals()), + "local_internals_ptr_ptr", + ) + }; + let local_internals_ptr = builder + .build_load(local_internals_ptr_ptr, "local_internals_ptr") + .into_pointer_value(); + unsafe { + builder.build_in_bounds_gep( + local_internals_ptr, + &[intrinsics.i32_ty.const_int(index as u64, false)], + "local_internal_field_ptr", + ) + } + } } From 3100cef79826e923e3afa134099f373fce5f6c1b Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Wed, 31 Jul 2019 13:34:26 -0700 Subject: [PATCH 17/41] Updated Appveyor to publish .dll and a build with LLVM installed --- .appveyor.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 47eb1bd22..47a24f0bf 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -47,11 +47,12 @@ install: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: - - cargo build --release --verbose + - cargo build --release --verbose --features backend-llvm - git submodule init - git submodule update - - if %APPVEYOR_REPO_BRANCH%==master cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications" + - if not %APPVEYOR_PULL_REQUEST_HEAD_COMMIT% cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications" - cargo build --release --manifest-path lib/runtime-c-api/Cargo.toml + - appveyor PushArtifact target\release\wasmer_runtime_c_api.dll test_script: - cargo test --manifest-path lib/spectests/Cargo.toml --features clif @@ -74,4 +75,4 @@ deploy: provider: GitHub on: branch: master - appveyor_repo_tag: true + # appveyor_repo_tag: true From 5bf6a6b0bdfc73396005caf2a5c1d562e51b22c7 Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Wed, 31 Jul 2019 13:53:27 -0700 Subject: [PATCH 18/41] Trying to fix appveyor --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 47a24f0bf..8d8bce10b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -48,16 +48,16 @@ install: build_script: - cargo build --release --verbose --features backend-llvm - - git submodule init - - git submodule update - - if not %APPVEYOR_PULL_REQUEST_HEAD_COMMIT% cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications" - cargo build --release --manifest-path lib/runtime-c-api/Cargo.toml - - appveyor PushArtifact target\release\wasmer_runtime_c_api.dll test_script: - cargo test --manifest-path lib/spectests/Cargo.toml --features clif before_deploy: + - appveyor PushArtifact target\release\wasmer_runtime_c_api.dll + - git submodule init + - git submodule update + - cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications" - cd ./src/installer - iscc wasmer.iss - copy /y .\WasmerInstaller.exe ..\..\WasmerInstaller-%APPVEYOR_REPO_TAG_NAME%.exe From 253b2198fbda76a95b1397642350ec1f085ca64c Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 14:09:01 -0700 Subject: [PATCH 19/41] Improved Wasmer Installer in Windows --- .appveyor.yml | 2 +- scripts/update_version_numbers.sh | 3 +++ src/installer/wasmer.iss | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8d8bce10b..852c8f3f2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -75,4 +75,4 @@ deploy: provider: GitHub on: branch: master - # appveyor_repo_tag: true + appveyor_repo_tag: true diff --git a/scripts/update_version_numbers.sh b/scripts/update_version_numbers.sh index 9108a3e31..217784810 100755 --- a/scripts/update_version_numbers.sh +++ b/scripts/update_version_numbers.sh @@ -5,6 +5,9 @@ NEXT_VERSION='0.6.0' fd Cargo.toml --exec sed -i '' "s/version = \"$PREVIOUS_VERSION\"/version = \"$NEXT_VERSION\"/" echo "manually check changes to Cargo.toml" +fd wasmer.iss --exec sed -i '' "s/AppVersion=$PREVIOUS_VERSION/AppVersion=$NEXT_VERSION/" +echo "manually check changes to wasmer.iss" + # Order to upload packages in ## runtime-core ## win-exception-handler diff --git a/src/installer/wasmer.iss b/src/installer/wasmer.iss index 16a396593..98e0c858f 100644 --- a/src/installer/wasmer.iss +++ b/src/installer/wasmer.iss @@ -1,6 +1,6 @@ [Setup] AppName=Wasmer -AppVersion=0.4.0 +AppVersion=0.6.0 DefaultDirName={pf}\Wasmer DefaultGroupName=Wasmer Compression=lzma2 @@ -82,4 +82,4 @@ begin EnvRemovePath(ExpandConstant('{app}') +'\bin'); EnvAddPath(ExpandConstant('{%USERPROFILE}') +'\globals\wapm_packages\.bin'); end -end; \ No newline at end of file +end; From 89523e0186c62e29660cf437ca71effc77d5a894 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 14:48:48 -0700 Subject: [PATCH 20/41] Move media into installer dir --- {media => src/installer/media}/wizard_logo.ico | Bin {media => src/installer/media}/wizard_logo_2.bmp | Bin .../installer/media}/wizard_logo_small.bmp | Bin src/installer/wasmer.iss | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename {media => src/installer/media}/wizard_logo.ico (100%) rename {media => src/installer/media}/wizard_logo_2.bmp (100%) rename {media => src/installer/media}/wizard_logo_small.bmp (100%) diff --git a/media/wizard_logo.ico b/src/installer/media/wizard_logo.ico similarity index 100% rename from media/wizard_logo.ico rename to src/installer/media/wizard_logo.ico diff --git a/media/wizard_logo_2.bmp b/src/installer/media/wizard_logo_2.bmp similarity index 100% rename from media/wizard_logo_2.bmp rename to src/installer/media/wizard_logo_2.bmp diff --git a/media/wizard_logo_small.bmp b/src/installer/media/wizard_logo_small.bmp similarity index 100% rename from media/wizard_logo_small.bmp rename to src/installer/media/wizard_logo_small.bmp diff --git a/src/installer/wasmer.iss b/src/installer/wasmer.iss index 98e0c858f..c836fddc5 100644 --- a/src/installer/wasmer.iss +++ b/src/installer/wasmer.iss @@ -9,9 +9,9 @@ OutputDir=.\ DisableProgramGroupPage=yes ChangesEnvironment=yes OutputBaseFilename=WasmerInstaller -WizardImageFile=..\..\media\wizard_logo_2.bmp -WizardSmallImageFile=..\..\media\wizard_logo_small.bmp -SetupIconFile=..\..\media\wizard_logo.ico +WizardImageFile=media\wizard_logo_2.bmp +WizardSmallImageFile=media\wizard_logo_small.bmp +SetupIconFile=media\wizard_logo.ico DisableWelcomePage=no [Files] From 9bac6d8818b22b2833bb20a85479a81d3c801df9 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 18:05:04 -0700 Subject: [PATCH 21/41] Move fuzzer inside lib --- {fuzz => lib/fuzz}/.gitignore | 0 {fuzz => lib/fuzz}/Cargo.toml | 0 {fuzz => lib/fuzz}/README.md | 0 {fuzz => lib/fuzz}/fuzz_targets/simple_instantiate.rs | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {fuzz => lib/fuzz}/.gitignore (100%) rename {fuzz => lib/fuzz}/Cargo.toml (100%) rename {fuzz => lib/fuzz}/README.md (100%) rename {fuzz => lib/fuzz}/fuzz_targets/simple_instantiate.rs (100%) diff --git a/fuzz/.gitignore b/lib/fuzz/.gitignore similarity index 100% rename from fuzz/.gitignore rename to lib/fuzz/.gitignore diff --git a/fuzz/Cargo.toml b/lib/fuzz/Cargo.toml similarity index 100% rename from fuzz/Cargo.toml rename to lib/fuzz/Cargo.toml diff --git a/fuzz/README.md b/lib/fuzz/README.md similarity index 100% rename from fuzz/README.md rename to lib/fuzz/README.md diff --git a/fuzz/fuzz_targets/simple_instantiate.rs b/lib/fuzz/fuzz_targets/simple_instantiate.rs similarity index 100% rename from fuzz/fuzz_targets/simple_instantiate.rs rename to lib/fuzz/fuzz_targets/simple_instantiate.rs From 11e22f05368dcd2f1feb96c27aa6e243aa72cdf6 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 18:05:15 -0700 Subject: [PATCH 22/41] Move architecture into docs --- ARCHITECTURE.md => docs/architecture.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ARCHITECTURE.md => docs/architecture.md (100%) diff --git a/ARCHITECTURE.md b/docs/architecture.md similarity index 100% rename from ARCHITECTURE.md rename to docs/architecture.md From a7db7f11f48686ff55e08ba6d5b37ea10519b502 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 18:09:23 -0700 Subject: [PATCH 23/41] Improved README --- README.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 129b5452f..4b22c47af 100644 --- a/README.md +++ b/README.md @@ -29,10 +29,13 @@ Install Wasmer with: curl https://get.wasmer.io -sSfL | sh ``` +> Note: *Wasmer is also available on Windows. Download the [`WasmerInstaller.exe` from the Github Releases](https://github.com/wasmerio/wasmer/releases) page.* + Wasmer runtime can also be embedded in different languages, so you can use WebAssembly anywhere ✨: -* [🦀 **Rust**](https://github.com/wasmerio/wasmer-rust-example) -* [**C/C++**](https://github.com/wasmerio/wasmer-c-api) +* [**🦀 Rust**](https://github.com/wasmerio/wasmer-rust-example) +* [**𝐂 C/C++**](https://github.com/wasmerio/wasmer-c-api) +* [**#️⃣ C#**](https://github.com/wasmerio/wasmer-c-api) * [**🐘 PHP**](https://github.com/wasmerio/php-ext-wasm) * [**🐍 Python**](https://github.com/wasmerio/python-ext-wasm) * [**💎 Ruby**](https://github.com/wasmerio/ruby-ext-wasm) @@ -82,7 +85,7 @@ Wasmer is structured into different directories: Building Wasmer requires [rustup](https://rustup.rs/). -To build on Windows, download and run [`rustup-init.exe`](https://win.rustup.rs/) +To build Wasmer on Windows, download and run [`rustup-init.exe`](https://win.rustup.rs/) then follow the onscreen instructions. To build on other systems, run: @@ -146,8 +149,8 @@ pkg install cmake #### Windows (MSVC) -Windows support is _highly experimental_. Only simple Wasm programs may be run, and no syscalls are allowed. This means -nginx and Lua do not work on Windows. See [this issue](https://github.com/wasmerio/wasmer/issues/176) regarding Emscripten syscall polyfills for Windows. +Windows support is _experimental_. WASI is fully supported, but Emscripten support is on the works (this means +nginx and Lua do not work on Windows - you can track the progress on [this issue](https://github.com/wasmerio/wasmer/issues/176)). 1. Install [Visual Studio](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) @@ -240,7 +243,7 @@ Below are some of the goals of this project (in order of priority): ## Architecture -If you would like to know how Wasmer works under the hood, please see [ARCHITECTURE.md](./ARCHITECTURE.md). +If you would like to know how Wasmer works under the hood, please see [docs/architecture.md](./docs/architecture.md). ## License From 20e424c11ed39f054fbd74f318bf8996e96cd595 Mon Sep 17 00:00:00 2001 From: Mark McCaskey Date: Thu, 1 Aug 2019 10:12:00 +0900 Subject: [PATCH 24/41] update wasmparser and clif-fork dependencies --- Cargo.lock | 148 +++++++++++++++--------------- lib/clif-backend/Cargo.toml | 6 +- lib/llvm-backend/Cargo.toml | 2 +- lib/runtime-core/Cargo.toml | 2 +- lib/singlepass-backend/Cargo.toml | 2 +- 5 files changed, 80 insertions(+), 80 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca701633c..a95f8fec4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1390,7 +1390,7 @@ dependencies = [ [[package]] name = "wasmer" -version = "0.5.7" +version = "0.6.0" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1399,23 +1399,23 @@ dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-clif-backend 0.5.7", - "wasmer-dev-utils 0.5.7", - "wasmer-emscripten 0.5.7", - "wasmer-emscripten-tests 0.5.7", + "wasmer-clif-backend 0.6.0", + "wasmer-dev-utils 0.6.0", + "wasmer-emscripten 0.6.0", + "wasmer-emscripten-tests 0.6.0", "wasmer-kernel-loader 0.1.0", - "wasmer-llvm-backend 0.5.7", - "wasmer-middleware-common 0.5.7", - "wasmer-runtime 0.5.7", - "wasmer-runtime-core 0.5.7", - "wasmer-singlepass-backend 0.5.7", - "wasmer-wasi 0.5.7", - "wasmer-wasi-tests 0.5.7", + "wasmer-llvm-backend 0.6.0", + "wasmer-middleware-common 0.6.0", + "wasmer-runtime 0.6.0", + "wasmer-runtime-core 0.6.0", + "wasmer-singlepass-backend 0.6.0", + "wasmer-wasi 0.6.0", + "wasmer-wasi-tests 0.6.0", ] [[package]] name = "wasmer-clif-backend" -version = "0.5.7" +version = "0.6.0" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-codegen 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1430,17 +1430,17 @@ dependencies = [ "serde_bytes 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-clif-fork-frontend 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-clif-fork-wasm 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-runtime-core 0.5.7", - "wasmer-win-exception-handler 0.5.7", - "wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-clif-fork-frontend 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-clif-fork-wasm 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-runtime-core 0.6.0", + "wasmer-win-exception-handler 0.6.0", + "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmer-clif-fork-frontend" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cranelift-codegen 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1450,7 +1450,7 @@ dependencies = [ [[package]] name = "wasmer-clif-fork-wasm" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cranelift-codegen 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1458,20 +1458,20 @@ dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-clif-fork-frontend 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-clif-fork-frontend 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmer-dev-utils" -version = "0.5.7" +version = "0.6.0" dependencies = [ "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmer-emscripten" -version = "0.5.7" +version = "0.6.0" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1479,21 +1479,21 @@ dependencies = [ "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-runtime-core 0.5.7", + "wasmer-runtime-core 0.6.0", ] [[package]] name = "wasmer-emscripten-tests" -version = "0.5.7" +version = "0.6.0" dependencies = [ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-clif-backend 0.5.7", - "wasmer-dev-utils 0.5.7", - "wasmer-emscripten 0.5.7", - "wasmer-llvm-backend 0.5.7", - "wasmer-runtime-core 0.5.7", - "wasmer-singlepass-backend 0.5.7", + "wasmer-clif-backend 0.6.0", + "wasmer-dev-utils 0.6.0", + "wasmer-emscripten 0.6.0", + "wasmer-llvm-backend 0.6.0", + "wasmer-runtime-core 0.6.0", + "wasmer-singlepass-backend 0.6.0", ] [[package]] @@ -1501,12 +1501,12 @@ name = "wasmer-kernel-loader" version = "0.1.0" dependencies = [ "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-runtime-core 0.5.7", + "wasmer-runtime-core 0.6.0", ] [[package]] name = "wasmer-llvm-backend" -version = "0.5.7" +version = "0.6.0" dependencies = [ "capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1521,51 +1521,51 @@ dependencies = [ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-runtime-core 0.5.7", - "wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-runtime-core 0.6.0", + "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmer-middleware-common" -version = "0.5.7" +version = "0.6.0" dependencies = [ "criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-clif-backend 0.5.7", - "wasmer-llvm-backend 0.5.7", - "wasmer-runtime-core 0.5.7", - "wasmer-singlepass-backend 0.5.7", + "wasmer-clif-backend 0.6.0", + "wasmer-llvm-backend 0.6.0", + "wasmer-runtime-core 0.6.0", + "wasmer-singlepass-backend 0.6.0", ] [[package]] name = "wasmer-runtime" -version = "0.5.7" +version = "0.6.0" dependencies = [ "criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-clif-backend 0.5.7", - "wasmer-llvm-backend 0.5.7", - "wasmer-runtime-core 0.5.7", - "wasmer-singlepass-backend 0.5.7", + "wasmer-clif-backend 0.6.0", + "wasmer-llvm-backend 0.6.0", + "wasmer-runtime-core 0.6.0", + "wasmer-singlepass-backend 0.6.0", ] [[package]] name = "wasmer-runtime-c-api" -version = "0.5.7" +version = "0.6.0" dependencies = [ "cbindgen 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-runtime 0.5.7", - "wasmer-runtime-core 0.5.7", + "wasmer-runtime 0.6.0", + "wasmer-runtime-core 0.6.0", ] [[package]] name = "wasmer-runtime-core" -version = "0.5.7" +version = "0.6.0" dependencies = [ "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "blake2b_simd 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1588,13 +1588,13 @@ dependencies = [ "serde_bytes 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmer-singlepass-backend" -version = "0.5.7" +version = "0.6.0" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1605,24 +1605,24 @@ dependencies = [ "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-runtime-core 0.5.7", - "wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-runtime-core 0.6.0", + "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmer-spectests" -version = "0.5.7" +version = "0.6.0" dependencies = [ "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-clif-backend 0.5.7", - "wasmer-llvm-backend 0.5.7", - "wasmer-runtime-core 0.5.7", - "wasmer-singlepass-backend 0.5.7", + "wasmer-clif-backend 0.6.0", + "wasmer-llvm-backend 0.6.0", + "wasmer-runtime-core 0.6.0", + "wasmer-singlepass-backend 0.6.0", ] [[package]] name = "wasmer-wasi" -version = "0.5.7" +version = "0.6.0" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "generational-arena 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1630,38 +1630,38 @@ dependencies = [ "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-runtime-core 0.5.7", + "wasmer-runtime-core 0.6.0", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmer-wasi-tests" -version = "0.5.7" +version = "0.6.0" dependencies = [ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-clif-backend 0.5.7", - "wasmer-dev-utils 0.5.7", - "wasmer-llvm-backend 0.5.7", - "wasmer-runtime-core 0.5.7", - "wasmer-singlepass-backend 0.5.7", - "wasmer-wasi 0.5.7", + "wasmer-clif-backend 0.6.0", + "wasmer-dev-utils 0.6.0", + "wasmer-llvm-backend 0.6.0", + "wasmer-runtime-core 0.6.0", + "wasmer-singlepass-backend 0.6.0", + "wasmer-wasi 0.6.0", ] [[package]] name = "wasmer-win-exception-handler" -version = "0.5.7" +version = "0.6.0" dependencies = [ "bindgen 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmer-runtime-core 0.5.7", + "wasmer-runtime-core 0.6.0", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmparser" -version = "0.34.0" +version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1895,9 +1895,9 @@ dependencies = [ "checksum wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d07edd40d190ddcbd0113c2150ccb214f47a02ff36958630ba0e5b8138ece1c1" "checksum wabt-sys 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b064c81821100adb4b71923cecfc67fef083db21c3bbd454b0162c7ffe63eeaa" "checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1" -"checksum wasmer-clif-fork-frontend 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be2e38b16377f93ac485b6045fdc135dd3f165d25d4992e7b67c5cbc3ca8c760" -"checksum wasmer-clif-fork-wasm 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88becfcf874d7587750e1a1c30c47a16ed220f28c433c4b81db4c4626455a6a1" -"checksum wasmparser 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8030ec5a7c242a91941947fdb752e9a7c0929aced954ea23c54dad1cd2611850" +"checksum wasmer-clif-fork-frontend 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bd6bec1587a3b11222f4ff129fd119785713c41de413f54f99d3c03743812f4" +"checksum wasmer-clif-fork-wasm 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8f323e612fe2549391255a09f89c927d7feb0ec4bf0c2cad9e3c089bdca42fc" +"checksum wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)" = "29f51d6103c622680dc4e17fb8173371efda8e529d97a2ba10ddf847d07705f8" "checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" diff --git a/lib/clif-backend/Cargo.toml b/lib/clif-backend/Cargo.toml index 4d443e359..04cfa00d7 100644 --- a/lib/clif-backend/Cargo.toml +++ b/lib/clif-backend/Cargo.toml @@ -13,11 +13,11 @@ wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } cranelift-native = { version = "0.31" } cranelift-codegen = { version = "0.31" } cranelift-entity = { version = "0.31" } -cranelift-frontend = { package = "wasmer-clif-fork-frontend", version = "0.32" } -cranelift-wasm = { package = "wasmer-clif-fork-wasm", version = "0.32" } +cranelift-frontend = { package = "wasmer-clif-fork-frontend", version = "0.33" } +cranelift-wasm = { package = "wasmer-clif-fork-wasm", version = "0.33" } hashbrown = "0.1" target-lexicon = "0.4.0" -wasmparser = "0.34.0" +wasmparser = "0.35.1" byteorder = "1" nix = "0.14.0" libc = "0.2.49" diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml index de720e51e..7783e7e43 100644 --- a/lib/llvm-backend/Cargo.toml +++ b/lib/llvm-backend/Cargo.toml @@ -7,7 +7,7 @@ readme = "README.md" [dependencies] wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } -wasmparser = "0.34.0" +wasmparser = "0.35.1" hashbrown = "0.1.8" smallvec = "0.6.8" goblin = "0.0.20" diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml index 642cdd271..13263b6b2 100644 --- a/lib/runtime-core/Cargo.toml +++ b/lib/runtime-core/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dependencies] nix = "0.14.0" page_size = "0.4.1" -wasmparser = "0.34.0" +wasmparser = "0.35.1" parking_lot = "0.7.1" lazy_static = "1.2.0" indexmap = "1.0.2" diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml index ac100cafc..a6ab287f2 100644 --- a/lib/singlepass-backend/Cargo.toml +++ b/lib/singlepass-backend/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" [dependencies] wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } -wasmparser = "0.34.0" +wasmparser = "0.35.1" dynasm = "0.3.2" dynasmrt = "0.3.1" lazy_static = "1.2.0" From 6b66c024f03dfcdd515b69894cbb169f9b583a03 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 18:18:37 -0700 Subject: [PATCH 25/41] Improved C/C++ icon --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b22c47af..1f02dd738 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ curl https://get.wasmer.io -sSfL | sh Wasmer runtime can also be embedded in different languages, so you can use WebAssembly anywhere ✨: * [**🦀 Rust**](https://github.com/wasmerio/wasmer-rust-example) -* [**𝐂 C/C++**](https://github.com/wasmerio/wasmer-c-api) +* [**🔗 C/C++**](https://github.com/wasmerio/wasmer-c-api) * [**#️⃣ C#**](https://github.com/wasmerio/wasmer-c-api) * [**🐘 PHP**](https://github.com/wasmerio/php-ext-wasm) * [**🐍 Python**](https://github.com/wasmerio/python-ext-wasm) From 90d5dc6d620fe232c7b151893703c0d3a9feecde Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 18:19:42 -0700 Subject: [PATCH 26/41] Updated C# integration link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f02dd738..f98924cfa 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Wasmer runtime can also be embedded in different languages, so you can use WebAs * [**🦀 Rust**](https://github.com/wasmerio/wasmer-rust-example) * [**🔗 C/C++**](https://github.com/wasmerio/wasmer-c-api) -* [**#️⃣ C#**](https://github.com/wasmerio/wasmer-c-api) +* [**#️⃣ C#**](https://github.com/migueldeicaza/WasmerSharp) * [**🐘 PHP**](https://github.com/wasmerio/php-ext-wasm) * [**🐍 Python**](https://github.com/wasmerio/python-ext-wasm) * [**💎 Ruby**](https://github.com/wasmerio/ruby-ext-wasm) From 0d428d6c99dfbc44ba2c6bfb5e952f4f2d296aa0 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 21:02:20 -0700 Subject: [PATCH 27/41] Moved fuzz dir back to root --- {lib/fuzz => fuzz}/.gitignore | 0 {lib/fuzz => fuzz}/Cargo.toml | 0 {lib/fuzz => fuzz}/README.md | 0 {lib/fuzz => fuzz}/fuzz_targets/simple_instantiate.rs | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {lib/fuzz => fuzz}/.gitignore (100%) rename {lib/fuzz => fuzz}/Cargo.toml (100%) rename {lib/fuzz => fuzz}/README.md (100%) rename {lib/fuzz => fuzz}/fuzz_targets/simple_instantiate.rs (100%) diff --git a/lib/fuzz/.gitignore b/fuzz/.gitignore similarity index 100% rename from lib/fuzz/.gitignore rename to fuzz/.gitignore diff --git a/lib/fuzz/Cargo.toml b/fuzz/Cargo.toml similarity index 100% rename from lib/fuzz/Cargo.toml rename to fuzz/Cargo.toml diff --git a/lib/fuzz/README.md b/fuzz/README.md similarity index 100% rename from lib/fuzz/README.md rename to fuzz/README.md diff --git a/lib/fuzz/fuzz_targets/simple_instantiate.rs b/fuzz/fuzz_targets/simple_instantiate.rs similarity index 100% rename from lib/fuzz/fuzz_targets/simple_instantiate.rs rename to fuzz/fuzz_targets/simple_instantiate.rs From 6433a778a1c9bacfd13bb7c4f370c95d6c875a3f Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 21:11:29 -0700 Subject: [PATCH 28/41] Improved README. Simplified integration tests command --- .circleci/config.yml | 14 ++------------ Makefile | 4 ++-- README.md | 10 ++++++++-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3098187ed..373704d20 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,9 +75,6 @@ jobs: make cranelift make llvm make test-rest - - run: - name: Release - command: make release-fast - run: name: Integration Tests command: make integration-tests @@ -116,10 +113,8 @@ jobs: command: | make check make compile-bench-singlepass - # TODO: add compile-bench-llvm and compile-bench-clif when they work - - run: - name: Release - command: make release-fast + make compile-bench-llvm + # TODO: add compile-bench-clif when they work - run: name: Integration Tests command: make integration-tests @@ -195,11 +190,6 @@ jobs: export PATH="$HOME/.cargo/bin:$PATH" export LLVM_SYS_80_PREFIX="`pwd`/clang+llvm-8.0.0-x86_64-apple-darwin/" make check - - run: - name: Release - command: | - export PATH="$HOME/.cargo/bin:$PATH" - make release-fast - run: name: Integration Tests command: | diff --git a/Makefile b/Makefile index 4bb5df974..b84515d7d 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ test: spectests emtests middleware wasitests circleci-clean test-rest # Integration tests -integration-tests: release-fast +integration-tests: release-clif echo "Running Integration Tests" ./integration_tests/lua/test.sh ./integration_tests/nginx/test.sh @@ -130,7 +130,7 @@ release: cargo build --release --features backend-singlepass,backend-llvm,loader-kernel # Only one backend (cranelift) -release-fast: +release-clif: # If you are in OS-X, you will need mingw-w64 for cross compiling to windows # brew install mingw-w64 cargo build --release diff --git a/README.md b/README.md index f98924cfa..5b7e038b2 100644 --- a/README.md +++ b/README.md @@ -184,8 +184,14 @@ git clone https://github.com/wasmerio/wasmer.git cd wasmer # install tools -# make sure that `python` is accessible. -make install +make release-clif # To build with cranelift (default) + +make release-llvm # To build with llvm support + +make release-singlepass # To build with singlepass support + +# or +make release # To build with singlepass, cranelift and llvm support ``` ## Testing From 5e7a20ef940bdedd7c91b0d5ae2f37e45fcac765 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 21:20:39 -0700 Subject: [PATCH 29/41] Improved metering codebase --- .circleci/config.yml | 2 +- lib/middleware-common/src/metering.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 373704d20..f76c635b0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -114,7 +114,7 @@ jobs: make check make compile-bench-singlepass make compile-bench-llvm - # TODO: add compile-bench-clif when they work + # TODO: add compile-bench-clif when it works - run: name: Integration Tests command: make integration-tests diff --git a/lib/middleware-common/src/metering.rs b/lib/middleware-common/src/metering.rs index e0d392cb6..88eb69c06 100644 --- a/lib/middleware-common/src/metering.rs +++ b/lib/middleware-common/src/metering.rs @@ -138,9 +138,9 @@ mod tests { #[cfg(feature = "llvm")] fn get_compiler(limit: u64) -> impl Compiler { - use wasmer_llvm_backend::code::LLVMModuleCodeGenerator; use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler}; - let c: StreamingCompiler = + use wasmer_llvm_backend::ModuleCodeGenerator as LLVMMCG; + let c: StreamingCompiler = StreamingCompiler::new(move || { let mut chain = MiddlewareChain::new(); chain.push(Metering::new(limit)); From a83b6eccfa4d9cf9bcdaa330c328c99d8c21396b Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 21:24:46 -0700 Subject: [PATCH 30/41] Fixed middleware linting --- lib/middleware-common/src/metering.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/middleware-common/src/metering.rs b/lib/middleware-common/src/metering.rs index 88eb69c06..75e2f6ef0 100644 --- a/lib/middleware-common/src/metering.rs +++ b/lib/middleware-common/src/metering.rs @@ -134,24 +134,22 @@ mod tests { use super::*; use wabt::wat2wasm; + use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler}; use wasmer_runtime_core::{backend::Compiler, compile_with, imports, Func}; #[cfg(feature = "llvm")] fn get_compiler(limit: u64) -> impl Compiler { - use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler}; use wasmer_llvm_backend::ModuleCodeGenerator as LLVMMCG; - let c: StreamingCompiler = - StreamingCompiler::new(move || { - let mut chain = MiddlewareChain::new(); - chain.push(Metering::new(limit)); - chain - }); + let c: StreamingCompiler = StreamingCompiler::new(move || { + let mut chain = MiddlewareChain::new(); + chain.push(Metering::new(limit)); + chain + }); c } #[cfg(feature = "singlepass")] fn get_compiler(limit: u64) -> impl Compiler { - use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler}; use wasmer_singlepass_backend::ModuleCodeGenerator as SinglePassMCG; let c: StreamingCompiler = StreamingCompiler::new(move || { let mut chain = MiddlewareChain::new(); From dd91a8208ae1a5af7474519f858e8cbe51d788ef Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 1 Aug 2019 08:48:20 +0300 Subject: [PATCH 31/41] changes after PR review https://github.com/wasmerio/wasmer/pull/602#pullrequestreview-269368270 --- lib/runtime-c-api/tests/.gitignore | 3 +- lib/runtime-c-api/tests/test-context | Bin 13908 -> 14164 bytes lib/runtime-c-api/tests/test-context.c | 97 ++++++++++++++++--------- 3 files changed, 64 insertions(+), 36 deletions(-) diff --git a/lib/runtime-c-api/tests/.gitignore b/lib/runtime-c-api/tests/.gitignore index ed3b6ed6e..267572c94 100644 --- a/lib/runtime-c-api/tests/.gitignore +++ b/lib/runtime-c-api/tests/.gitignore @@ -22,4 +22,5 @@ test-module-exports test-module-imports test-module-serialize test-tables -test-validate \ No newline at end of file +test-validate +test-context diff --git a/lib/runtime-c-api/tests/test-context b/lib/runtime-c-api/tests/test-context index 7b968acf6404940066f64987364d3dfc686b04f5..782fbe97b9db7c85821fb2445bb136adc35599bd 100755 GIT binary patch literal 14164 zcmeHOZEPGz8J^2Wo2Cutwh4qnn^T3WfD)gb)*}6I@uj|Yqxz_6Vo?P}o6FrgKIMEq z?jvz3LY+E?vf3OnYFr|q5J5pvDl?#QY^+t0_JP_q)xAJ$0^!Jq8oHh{`f}u) z;`Z0^X$%IU^Vd0Y;sr`qk_Do_8tQsBm*1MLG`aoVbGzg3+e)L1%La>-Kh+)Lqd&dd zNT!Vpl-&M~D1Yaa17haAQs%@L%jPnP)HbEy_V?@^PJFk?Bnm-XU21$opzHb6&O|D% zCsJL#64%bh@CwHt=bVMu?Zc5cHRp9L`quTf(8f@eB;fdwFBF@BW#J2k!g<9zCm&*6 zPbKy2uAZ&ENj;s*e4;;PF8$HIT$ul5WdN${+j^^BlR5tC0#1C3lnt@l-)EGJMAwti zYsI%5_MC#lR7N4L_Q&xqr$80v%~@CN>%aPFxNUuTO*Fdl2F$XN4p2zgPr2NQbt_d+ zaV(2K*OrB#t-up7s9WR2#<^r1 zr|<;u+=M5X&t`(j#MWSZS27OF@;N+=YBk;>+bL@Kzm zH?uvM?FsITW_yfGFc-~iGjhRY02hm*_F{m>x|h8ZfHF)^gYE zcWqU_zKiFv{rIlr0J|p>s4(ZrD_#b?40svvGT>#v%Yc^w zF9Ti%ybO35@G{_Kz{`M_f&ZrrbZX|GwSfyAnz`H7EIh^LAkLBO-{F8xGs9D8n`(N) z9DkXIGMae`ZIfo?toVO#vH7h@9b)L0<;wYo76H1Y(&R{VYHukR&bL_uTZQnY_q^v)}!!`3YbN3}PKdYH<+wb9&8zIkF`Af35 z^a2Y4_S?u>bv-EU_gv_Qb<=2j5eY3uMw;Gjx0bAf$B1=9yBUGM-IHeiEZmx>+RgAm z&5R71;r;eg?8AzT0wb4^aZpauBqnLUOjPHf71`fzg%5^aVn*#G49xHmD}O{Qw&bBQ zEbLaaS$Rxs3o~to_n~bS+amV;k+UKHfs>*B4@;r`bH0%O*cmPMjy7-+YJ2^AdEN-K zN7+@ed4nWNegN|Fz3lAgI4GM2BL;RK@%ayo-c$O5&wp%Od8nA*9FWdkHZO>Rg$mZAWKjO5~f1`gzn<&2@SPz&L&UELDlXcEgWKudX zcVkB0MzkaLG%Q2rXq#Lqm~}HejuFh*?^N0+FbJB##0PdtGedkmF_)n_&=M?!W*w)I zW=VI}kRvZrzs)KT*&k5NEcBJAR+OZ8Tq7zrzr@)rE;|NdKSw{sg*z~gaMP$(EVfFW zp*E1v%h15C@Y`_HyKUxs>&o()-L@)vD z=p&6Xbc`r6sF`Q9;!!zx^F2-GykCY<>|^iGb1JO@d2L{{5jl`f&C?nt${M1o-7lxR z#iIXB7deE&taLFXWB@IDAi+A0OFeXXx-bJdrye7cs+Lp@nG;&^IAv|-$F@wtwvKjMzRVdDY8ldxIn5=#0crkU{99;r7@M1}<$6ZtuH%rkR?t2%DhkAR`iKJ0Ga?FwVJRX*6 ziuXY9t{c~J@@dAsG7B+ZnwxM3Rfk8F3R7-y)1~TO`3^-_D!N9|2NZo+(GEp7DH>Na zrD&g`Pb<1#(J^%&{+6PXik?&Sf}$TQDwN$~Mcr|G*vo*I0WSky2D}V-8SpaTWx&gT zmjN#WUIx4jco~?Rft&AKzJ=dS-_ok{)AeXZZ{vhU7T=)AESHw*5GIpL3A6=V-nycRB->Y_y(^aN%^F0FM7?Q4nye+r7|}Q- ztqzb{8u_eYY^R`uAZH|{wvJ8&9rVRu0}oDK#dE%%D2#sU<6+f&F@Yn+ zd9jMQ=}TPk^$dQH(%%53QC2gohJ&c4))3x}Z`xN4`&t`Yhv)NT7KJYTK7Kjvd>@aa zFkl>Nqt`AP?hlnUf?w@i zSug-qD+XI3))r2pYZfUs^{TD8W{a1ba!re~>6dqCwKuC>nZyukCsuoKdG{^vyQJKt z%6n~jm%Y~ZdNmpM)k=HKhB~*^y^~&BLq=EL>?@v?5AL0F%*&f*t-#qW=lo}sua6M_ E26vyM!vFvP literal 13908 zcmeHOZE#dq8NORUD1|2d()dx?VTwa7WD^Q4tzdWC#NL#ojfGAT#hYbwAuIb4cQ++; ziW5q2<;?A^Q3-?7Ka8Vet*tVSsWBQSLZ?Y_#-^DLFb?Bn+KLy&PFfv}%t(BmbIvZC z4N!mh!yord&UwGz^SxKD-5t?HdJy#iqaUJ@hd4}N_VPJ;wQFIgC zvRY&JH*RTs_#tv$R#s7v_hr7-cPFdmdhd<2I=xP!#4z$)s@+m%(Pp{ z%=WCLXRgP<66KF;&PKY@hmxp~>$(;u9R(_0X%>yl)rn#506f%Syn23 zrTA*X%HLsaLAu-@^ZkgH5wLFRy=rcHa6@B5Q}LastEd}jwoUp0qaVH0lD`!1tyICl zTowSXl@c{XK_7v^WW8Z@fW@_}L2p}S7#|1x)oQ%&kY5A56}`L_-@EcUl*@@%!~V8P zCg^L?!|039BVGAiB$eD2Y2Te{2hGO08OM?DAKZBBg4@Rq_zjP@edoO;2us=_Bsf_p zJ8@adIY&dE23}2>Zp)Fs%%{A#ka6B9I%Vb0Z#35#FLW@PUGaR{&RMyxOd*-Jt%Mct zOx7a8ea_TGzDhVco+!*!K;Ka#g|`N-~gE{k`r zP_Q%5Pi7*!vbmj+d^(~ch!oOh<&eAZ#}lXwra^!GKZ=q#w`24;2^AIADv~Q^;=CbWr{BJMu@sQJMb10!wsTwf-!(MiYO=jbcsI(KFwef0y<%e7{eU}tOgtd ztQm=g881j5&8|ltQtFVR zuL|o=1Wo{px_`j60AzC3Px^erIT-wG4cyj2!L@nVgS1C#0 z4NcL;TjMcZ@1|z~{NMZ=p%37^6rm%dmR?gF#~R7x#Yt1v+@zWCq5%G#Dl+2czTrC5 zKsps8CKk%=qpE)cb-eYfvlvnssp!IH)5lN|v|&Im9cR z72q5({B4qlI*d4{z=2zY)?el|CdN!}h_VK8G&aBlP-nV(6sE#?6R6wI5w0JCYdBpD z$skWO#Yy4ZLfx}`H-s}vHCKX>=v?|LQu6W#`EVl5GsUa^pP*Ae-t0B@n4WV4GWodS zSwms}DNcyKF!iy9!l?n)ESzcp|7lL=Is;M&Th|#@=>Fmq-kJes?)K5l_2{PAmBz7O z$R{ce7s7dw(teJ}j+IAt5lGyw{a}1sR$vjNVAp`XZ_obuv8n^dVm*JGj`h49idDV* zTQl*7x$iuDEr4FtQ@Cs4BD8aMZ;dMd;va$<+z5%^i^5{)=<@f;nmZ(gsNU1 z)qYAImMRZn2^R0A2i`CE4;DStzozQe$GTn2dl+%*9QQy~IL|}u_H#sBKZX>^Y=A`N z_!BUMGZ#{@SA&fl7a_-^v7Yyl<6F$}cqvB%dZh?^V2T{SCc)x=0StbD5x$5)=g3*F zkmF~Shjq%sI6Z8khp!YpAT91+{tv(a&KKW*PT_o#{Ff9yN}TnD&IIxMCBFWBI(F~D zWna{RL#&&ly!IZn!vaZE4!yBz-^$0>}>-px$_v5nKq?gH%X7)Cf}&mhN+w~3u5 zb`_U?@AT!4u_YuFQl~<#|0-n+!s%!W=bE{ zs?!QIXREUHnucAY(2E$vNrXrq|vHN8ezqF*Cbmx#Is=V&KuWqvd3`0 z%tjj90PdwixL2aJY$c?~D8g&?y>g9)OEp}f;T;-AHGDwBO&We#!wwB|8a|=n(;ANI z`|xoMPiuHa!$}R#YdBZi72^zGP=TNVK?Q;e1QiG>5L6(jKv0380zn0W3Ir7hD)7M- zxNd1p8;^Rfk6Qe6J)YQUB|3ImJG$bzcH{H8>fR_n+EpL5Z^L)v_^7?d$2pB`p%swUM&ZiO$`mIuwQTBT}89I`I*GVLPdAQ23@kr6%qPT^F_V zx4_ACXBJs(@4^vMI}UboS?O&5WmGcuF8b>&7s~^x1U@H5U=$v@q)?p~S?%#cT%J=w z@$d&K>SUh3lww)5M`p=+UdCF=7P4@hKF>;bSa!Fa=qlLwtwNm3`T!5k5?Oo>4dOwZ zo|TA=2`mg0Re6lf^4x4IPnzZ!6Du$rUWs9h!$hr`1^j3o&#S3b6;fYp^RS8El2-v4 z144S4rVneHpEpy^Gc3yQDbo19n{*>OAl=HwgWGc2uAsXs=$;Dt>lO5~74(4$ng__` z^L@91exZWq!DhMsUkx|EDNPl-Qc%bCrs+-t6^A)_m9heglD-DRe!+E!-$ IdoYau01yFqTL1t6 diff --git a/lib/runtime-c-api/tests/test-context.c b/lib/runtime-c-api/tests/test-context.c index db967be3c..32bfcc21f 100644 --- a/lib/runtime-c-api/tests/test-context.c +++ b/lib/runtime-c-api/tests/test-context.c @@ -5,18 +5,61 @@ #include typedef struct { - int32_t amount; - int32_t value; + int32_t amount; + int32_t value; } counter_data; +typedef struct { + uint8_t* bytes; + long bytes_len; +} wasm_file_t; + +wasm_file_t read_wasm_file(const char* file_name) { + wasm_file_t wasm_file; + + FILE *file = fopen(file_name, "r"); + fseek(file, 0, SEEK_END); + wasm_file.bytes_len = ftell(file); + + wasm_file.bytes = malloc(wasm_file.bytes_len); + fseek(file, 0, SEEK_SET); + fread(wasm_file.bytes, 1, wasm_file.bytes_len, file); + fclose(file); + + return wasm_file; +} + void inc_counter(wasmer_instance_context_t *ctx) { - counter_data* data = (counter_data*)wasmer_instance_context_data_get(ctx); - data->value = data->value + data->amount; + counter_data* data = (counter_data*)wasmer_instance_context_data_get(ctx); + data->value = data->value + data->amount; } int32_t get_counter(wasmer_instance_context_t *ctx) { - counter_data* data = (counter_data*)wasmer_instance_context_data_get(ctx); - return data->value; + counter_data* data = (counter_data*)wasmer_instance_context_data_get(ctx); + return data->value; +} + +counter_data *init_counter(int32_t value, int32_t amount) { + counter_data* counter = malloc(sizeof(counter_data)); + counter->value = value; + counter->amount = amount; + return counter; +} + +void assert_counter(wasmer_instance_t *instance, int32_t expected) { + wasmer_value_t result_one; + wasmer_value_t params[] = {}; + wasmer_value_t results[] = {result_one}; + + wasmer_result_t call1_result = wasmer_instance_call(instance, "inc_and_get", params, 0, results, 1); + printf("Call result: %d\n", call1_result); + printf("Result: %d\n", results[0].value.I32); + assert(results[0].value.I32 == expected); + assert(call1_result == WASMER_OK); + + const wasmer_instance_context_t *ctx = wasmer_instance_context_get(instance); + counter_data *cd = (counter_data*)wasmer_instance_context_data_get(ctx); + assert(cd->value == expected); } wasmer_import_t create_import(char* module_name, char* import_name, wasmer_import_func_t *func) { @@ -41,7 +84,7 @@ wasmer_import_t create_import(char* module_name, char* import_name, wasmer_impor int main() { - // Imports + // Prepare Imports wasmer_value_tag inc_params_sig[] = {}; wasmer_value_tag inc_returns_sig[] = {}; wasmer_import_func_t *inc_func = wasmer_import_func_new((void (*)(void *)) inc_counter, inc_params_sig, 0, inc_returns_sig, 0); @@ -54,46 +97,30 @@ int main() wasmer_import_t imports[] = {inc_import, get_import}; - // Read the wasm file bytes - FILE *file = fopen("assets/inc.wasm", "r"); - fseek(file, 0, SEEK_END); - long len = ftell(file); - uint8_t *bytes = malloc(len); - fseek(file, 0, SEEK_SET); - fread(bytes, 1, len, file); - fclose(file); + // Read the wasm file + wasm_file_t wasm_file = read_wasm_file("assets/inc.wasm"); + // Instantiate instance printf("Instantiating\n"); wasmer_instance_t *instance = NULL; - wasmer_result_t compile_result = wasmer_instantiate(&instance, bytes, len, imports, 2); + wasmer_result_t compile_result = wasmer_instantiate(&instance, wasm_file.bytes, wasm_file.bytes_len, imports, 2); printf("Compile result: %d\n", compile_result); - counter_data* counter = malloc(sizeof(counter_data)); - counter->value = 2; - counter->amount = 5; + // Init counter + counter_data *counter = init_counter(2, 5); wasmer_instance_context_data_set(instance, counter); - wasmer_value_t result_one; - wasmer_value_t params[] = {}; - wasmer_value_t results[] = {result_one}; - - wasmer_result_t call1_result = wasmer_instance_call(instance, "inc_and_get", params, 0, results, 1); - printf("Call result: %d\n", call1_result); - printf("Result: %d\n", results[0].value.I32); - assert(results[0].value.I32 == 7); - assert(call1_result == WASMER_OK); - - wasmer_result_t call2_result = wasmer_instance_call(instance, "inc_and_get", params, 0, results, 1); - printf("Call result: %d\n", call2_result); - printf("Result: %d\n", results[0].value.I32); - assert(results[0].value.I32 == 12); - assert(call2_result == WASMER_OK); + // Run `instance.inc_and_get` and assert + assert_counter(instance, 7); + assert_counter(instance, 12); + assert_counter(instance, 17); + // Clear resources wasmer_import_func_destroy(inc_func); wasmer_import_func_destroy(get_func); wasmer_instance_destroy(instance); free(counter); - free(bytes); + free(wasm_file.bytes); return 0; } From 6245daaa843dc5f51a02b96d036796974c08d685 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 23:03:52 -0700 Subject: [PATCH 32/41] Update dependencies to latest versions --- Cargo.lock | 274 ++++++++++++++++++--------- Cargo.toml | 4 +- lib/clif-backend/Cargo.toml | 8 +- lib/dev-utils/Cargo.toml | 2 +- lib/emscripten/Cargo.toml | 6 +- lib/kernel-loader/Cargo.toml | 2 +- lib/llvm-backend/Cargo.toml | 4 +- lib/runtime-abi/Cargo.toml | 2 +- lib/runtime-c-api/Cargo.toml | 2 +- lib/runtime-core/Cargo.toml | 4 +- lib/singlepass-backend/Cargo.toml | 6 +- lib/wasi/Cargo.toml | 8 +- lib/win-exception-handler/Cargo.toml | 2 +- 13 files changed, 205 insertions(+), 119 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a95f8fec4..3ccf0d27c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,7 +39,7 @@ name = "atty" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -57,7 +57,7 @@ dependencies = [ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -67,7 +67,7 @@ version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -76,7 +76,7 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -93,7 +93,7 @@ dependencies = [ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -113,15 +113,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "byteorder" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "c2-chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "capstone" version = "0.5.0" @@ -159,7 +168,7 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", @@ -204,7 +213,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -270,7 +279,7 @@ dependencies = [ "cranelift-entity 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -309,13 +318,13 @@ dependencies = [ "csv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", @@ -328,40 +337,48 @@ name = "criterion-plot" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-deque" -version = "0.2.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-epoch" -version = "0.3.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "crossbeam-queue" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-utils" -version = "0.2.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -397,7 +414,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", @@ -410,7 +427,7 @@ name = "dynasmrt" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -436,7 +453,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -447,7 +464,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -457,7 +474,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -511,6 +528,15 @@ dependencies = [ "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "getrandom" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "glob" version = "0.2.11" @@ -521,7 +547,7 @@ name = "goblin" version = "0.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -531,7 +557,7 @@ name = "hashbrown" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -570,7 +596,7 @@ dependencies = [ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "enum-methods 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "inkwell_internal_macros 0.1.0 (git+https://github.com/wasmerio/inkwell?branch=llvm8-0)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "llvm-sys 80.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -619,7 +645,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.57" +version = "0.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -638,7 +664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -654,7 +680,7 @@ dependencies = [ [[package]] name = "log" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -665,7 +691,7 @@ name = "memchr" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -673,7 +699,7 @@ name = "memmap" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -682,14 +708,17 @@ name = "memmap" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "memoffset" -version = "0.2.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "nix" @@ -699,7 +728,7 @@ dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -738,7 +767,7 @@ name = "num_cpus" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -768,7 +797,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -786,7 +815,7 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -807,6 +836,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "plugin-for-example" version = "0.1.0" +[[package]] +name = "ppv-lite86" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "proc-macro2" version = "0.4.30" @@ -839,7 +873,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -851,7 +885,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -863,6 +897,18 @@ dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand_chacha" version = "0.1.1" @@ -872,6 +918,15 @@ dependencies = [ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rand_chacha" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand_core" version = "0.3.1" @@ -885,6 +940,14 @@ name = "rand_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "rand_core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand_hc" version = "0.1.0" @@ -893,6 +956,14 @@ dependencies = [ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand_isaac" version = "0.1.1" @@ -906,7 +977,7 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -918,7 +989,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -946,7 +1017,7 @@ name = "rand_xoshiro" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -962,22 +1033,23 @@ dependencies = [ [[package]] name = "rayon" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rayon-core" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1066,6 +1138,11 @@ name = "scopeguard" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "scopeguard" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "scroll" version = "0.9.2" @@ -1111,7 +1188,7 @@ name = "serde-bench" version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1160,16 +1237,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "structopt" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "structopt-derive" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1238,7 +1315,7 @@ version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1258,7 +1335,7 @@ name = "termion" version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1285,7 +1362,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1392,12 +1469,12 @@ dependencies = [ name = "wasmer" version = "0.6.0" dependencies = [ - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "errno 0.2.4 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-clif-backend 0.6.0", "wasmer-dev-utils 0.6.0", @@ -1417,14 +1494,14 @@ dependencies = [ name = "wasmer-clif-backend" version = "0.6.0" dependencies = [ - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-codegen 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-entity 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-native 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde-bench 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_bytes 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1444,7 +1521,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cranelift-codegen 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1457,7 +1534,7 @@ dependencies = [ "cranelift-entity 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-clif-fork-frontend 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1466,18 +1543,18 @@ dependencies = [ name = "wasmer-dev-utils" version = "0.6.0" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmer-emscripten" version = "0.6.0" dependencies = [ - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-runtime-core 0.6.0", ] @@ -1500,7 +1577,7 @@ dependencies = [ name = "wasmer-kernel-loader" version = "0.1.0" dependencies = [ - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-runtime-core 0.6.0", ] @@ -1514,7 +1591,7 @@ dependencies = [ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "inkwell 0.1.0 (git+https://github.com/wasmerio/inkwell?branch=llvm8-0)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1558,7 +1635,7 @@ name = "wasmer-runtime-c-api" version = "0.6.0" dependencies = [ "cbindgen 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-runtime 0.6.0", "wasmer-runtime-core 0.6.0", ] @@ -1578,7 +1655,7 @@ dependencies = [ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "page_size 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1596,13 +1673,13 @@ dependencies = [ name = "wasmer-singlepass-backend" version = "0.6.0" dependencies = [ - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "dynasm 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "dynasmrt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-runtime-core 0.6.0", @@ -1624,12 +1701,12 @@ dependencies = [ name = "wasmer-wasi" version = "0.6.0" dependencies = [ - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "generational-arena 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-runtime-core 0.6.0", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1653,7 +1730,7 @@ version = "0.6.0" dependencies = [ "bindgen 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-runtime-core 0.6.0", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1670,7 +1747,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1744,7 +1821,8 @@ dependencies = [ "checksum bindgen 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8f7f7f0701772b17de73e4f5cbcb1dd6926f4706cba4c1ab62c5367f8bdc94e1" "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" "checksum blake2b_simd 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce2571a6cd634670daa2977cc894c1cc2ba57c563c498e5a82c35446f34d056e" -"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" +"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" "checksum capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00be9d203fa0e078b93b24603633fb081851dfe0c1086364431f52587a47157e" "checksum capstone-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc8d32bc5c1e6d0fcde10af411c98b07d93498d51654f678757f08fa2acd6a6" "checksum cargo_toml 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "097f5ce64ba566a83d9d914fd005de1e5937fdd57d8c5d99a7593040955d75a9" @@ -1767,9 +1845,10 @@ dependencies = [ "checksum cranelift-native 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce451162d18b7d82118e23ea7e12f7d8b98557549404bd71215548de79eb0736" "checksum criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0363053954f3e679645fc443321ca128b7b950a6fe288cf5f9335cc22ee58394" "checksum criterion-plot 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76f9212ddf2f4a9eb2d401635190600656a1f88a932ef53d06e7fa4c7e02fb8e" -"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3" -"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150" -"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9" +"checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13" +"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" +"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" +"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" "checksum csv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9044e25afb0924b5a5fc5511689b0918629e85d68ea591e5e87fbf1e85ea1b3b" "checksum csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5cdef62f37e6ffe7d1f07a381bc0db32b7a3ff1cac0de56cb0d81e71f53d65" "checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c" @@ -1787,6 +1866,7 @@ dependencies = [ "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" "checksum generational-arena 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4024f96ffa0ebaaf36aa589cd41f2fd69f3a5e6fd02c86e11e12cdf41d5b46a3" "checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592" +"checksum getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8e190892c840661957ba9f32dacfb3eb405e657f9f9f60485605f0bb37d6f8" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum goblin 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "84473a5302fa5094d3d9911c2f312f522f9a37462a777f195f63fae1bf7faf4d" "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" @@ -1800,15 +1880,15 @@ dependencies = [ "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" -"checksum libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)" = "a844cabbd5a77e60403a58af576f0a1baa83c3dd2670be63e615bd24fc58b82d" +"checksum libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb" "checksum libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5692f82b51823e27c4118b3e5c0d98aee9be90633ebc71ad12afef380b50219" "checksum llvm-sys 80.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2110cd4daf9cd8e39dd3b933b1a2a2ac7315e91f7c92b3a20beab526c63b5978" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" -"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" +"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" "checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" +"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" @@ -1823,16 +1903,21 @@ dependencies = [ "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" "checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" "checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" "checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" "checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" +"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" "checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" "checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" @@ -1840,8 +1925,8 @@ dependencies = [ "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" "checksum rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "03b418169fb9c46533f326efd6eed2576699c44ca92d3052a066214a8d828929" "checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d" -"checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473" -"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356" +"checksum rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4b0186e22767d5b9738a05eab7c6ac90b15db17e5b5f9bd87976dd7d89a10a4" +"checksum rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbe0df8435ac0c397d467b6cad6d25543d06e8a019ef3f6af3c384597515bd2" "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" "checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" @@ -1854,6 +1939,7 @@ dependencies = [ "checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" "checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" +"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" "checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383" "checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" @@ -1866,8 +1952,8 @@ dependencies = [ "checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" -"checksum structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" +"checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" +"checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" diff --git a/Cargo.toml b/Cargo.toml index 273f87f08..67cd7b455 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,9 +19,9 @@ include = [ ] [dependencies] -byteorder = "1.3.1" +byteorder = "1.3.2" errno = "0.2.4" -structopt = "0.2.11" +structopt = "0.2.18" wabt = "0.9.0" hashbrown = "0.1.8" wasmer-clif-backend = { path = "lib/clif-backend" } diff --git a/lib/clif-backend/Cargo.toml b/lib/clif-backend/Cargo.toml index 04cfa00d7..6d0252a54 100644 --- a/lib/clif-backend/Cargo.toml +++ b/lib/clif-backend/Cargo.toml @@ -18,10 +18,10 @@ cranelift-wasm = { package = "wasmer-clif-fork-wasm", version = "0.33" } hashbrown = "0.1" target-lexicon = "0.4.0" wasmparser = "0.35.1" -byteorder = "1" -nix = "0.14.0" -libc = "0.2.49" -rayon = "1.0" +byteorder = "1.3.2" +nix = "0.14.1" +libc = "0.2.60" +rayon = "1.1.0" # Dependencies for caching. [dependencies.serde] diff --git a/lib/dev-utils/Cargo.toml b/lib/dev-utils/Cargo.toml index 0655a5b33..96fb6aeed 100644 --- a/lib/dev-utils/Cargo.toml +++ b/lib/dev-utils/Cargo.toml @@ -8,4 +8,4 @@ edition = "2018" repository = "https://github.com/wasmerio/wasmer" [dependencies] -libc = "0.2.49" +libc = "0.2.60" diff --git a/lib/emscripten/Cargo.toml b/lib/emscripten/Cargo.toml index 6e160b774..2297b5f25 100644 --- a/lib/emscripten/Cargo.toml +++ b/lib/emscripten/Cargo.toml @@ -8,15 +8,15 @@ repository = "https://github.com/wasmerio/wasmer" edition = "2018" [dependencies] -byteorder = "1" +byteorder = "1.3.2" hashbrown = "0.1" lazy_static = "1.2.0" -libc = "0.2.49" +libc = "0.2.60" time = "0.1.41" wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } [target.'cfg(windows)'.dependencies] -rand = "0.6" +rand = "0.7.0" [features] debug = ["wasmer-runtime-core/debug"] diff --git a/lib/kernel-loader/Cargo.toml b/lib/kernel-loader/Cargo.toml index 921e71f9a..d1eab2f82 100644 --- a/lib/kernel-loader/Cargo.toml +++ b/lib/kernel-loader/Cargo.toml @@ -5,5 +5,5 @@ authors = ["Heyang Zhou "] edition = "2018" [dependencies] -libc = "0.2.49" +libc = "0.2.60" wasmer-runtime-core = { path = "../runtime-core" } diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml index 7783e7e43..de9686de8 100644 --- a/lib/llvm-backend/Cargo.toml +++ b/lib/llvm-backend/Cargo.toml @@ -11,8 +11,8 @@ wasmparser = "0.35.1" hashbrown = "0.1.8" smallvec = "0.6.8" goblin = "0.0.20" -libc = "0.2.49" -nix = "0.14.0" +libc = "0.2.60" +nix = "0.14.1" capstone = { version = "0.5.0", optional = true } [dependencies.inkwell] diff --git a/lib/runtime-abi/Cargo.toml b/lib/runtime-abi/Cargo.toml index 0d688a54f..33f11bc33 100644 --- a/lib/runtime-abi/Cargo.toml +++ b/lib/runtime-abi/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/wasmerio/wasmer" edition = "2018" [dependencies] -libc = "0.2.50" +libc = "0.2.60" wasmer-runtime-core = { path = "../runtime-core" } hashbrown = "0.1" failure = "0.1" diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index cd004b39c..d2f40a498 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -12,7 +12,7 @@ readme = "README.md" crate-type = ["cdylib", "rlib", "staticlib"] [dependencies] -libc = "0.2" +libc = "0.2.60" [dependencies.wasmer-runtime] path = "../runtime" diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml index 13263b6b2..323b090ea 100644 --- a/lib/runtime-core/Cargo.toml +++ b/lib/runtime-core/Cargo.toml @@ -8,14 +8,14 @@ repository = "https://github.com/wasmerio/wasmer" edition = "2018" [dependencies] -nix = "0.14.0" +nix = "0.14.1" page_size = "0.4.1" wasmparser = "0.35.1" parking_lot = "0.7.1" lazy_static = "1.2.0" indexmap = "1.0.2" errno = "0.2.4" -libc = "0.2.49" +libc = "0.2.60" hex = "0.3.2" smallvec = "0.6.9" bincode = "1.1" diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml index a6ab287f2..c5a93a5cf 100644 --- a/lib/singlepass-backend/Cargo.toml +++ b/lib/singlepass-backend/Cargo.toml @@ -14,9 +14,9 @@ wasmparser = "0.35.1" dynasm = "0.3.2" dynasmrt = "0.3.1" lazy_static = "1.2.0" -byteorder = "1" -nix = "0.14.0" -libc = "0.2.49" +byteorder = "1.3.2" +nix = "0.14.1" +libc = "0.2.60" smallvec = "0.6.9" hashbrown = "0.1" colored = "1.8" diff --git a/lib/wasi/Cargo.toml b/lib/wasi/Cargo.toml index ede343477..79367bac9 100644 --- a/lib/wasi/Cargo.toml +++ b/lib/wasi/Cargo.toml @@ -9,13 +9,13 @@ edition = "2018" [dependencies] wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } -libc = "0.2.50" -rand = "0.6.5" +libc = "0.2.60" +rand = "0.7.0" # wasmer-runtime-abi = { path = "../runtime-abi" } hashbrown = "0.1.8" generational-arena = "0.2.2" -log = "0.4.6" -byteorder = "1.3.1" +log = "0.4.8" +byteorder = "1.3.2" [target.'cfg(windows)'.dependencies] winapi = "0.3" diff --git a/lib/win-exception-handler/Cargo.toml b/lib/win-exception-handler/Cargo.toml index 61fe120d7..c3c76be79 100644 --- a/lib/win-exception-handler/Cargo.toml +++ b/lib/win-exception-handler/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [target.'cfg(windows)'.dependencies] wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } winapi = { version = "0.3", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] } -libc = "0.2.49" +libc = "0.2.60" [build-dependencies] cmake = "0.1.35" From a6461c3b146c0384c9c6482afa197b7e30d726bd Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 23:17:42 -0700 Subject: [PATCH 33/41] Removed explicit hashbrown dependency --- Cargo.lock | 67 +++++++++++++++------------- Cargo.toml | 1 - lib/clif-backend/Cargo.toml | 7 ++- lib/clif-backend/src/cache.rs | 2 +- lib/clif-backend/src/trampoline.rs | 2 +- lib/emscripten/Cargo.toml | 1 - lib/emscripten/src/lib.rs | 2 +- lib/llvm-backend/Cargo.toml | 1 - lib/llvm-backend/src/intrinsics.rs | 2 +- lib/runtime-abi/Cargo.toml | 1 - lib/runtime-abi/src/vfs/vfs.rs | 2 +- lib/runtime-core/src/backend.rs | 2 +- lib/runtime-core/src/export.rs | 2 +- lib/runtime-core/src/import.rs | 2 +- lib/runtime-core/src/module.rs | 2 +- lib/runtime-core/src/parse.rs | 2 +- lib/runtime-core/src/sig_registry.rs | 2 +- lib/runtime-core/src/vm.rs | 4 +- lib/singlepass-backend/Cargo.toml | 1 - lib/wasi/Cargo.toml | 1 - lib/wasi/src/state.rs | 2 +- src/bin/wasmer.rs | 2 +- 22 files changed, 53 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ccf0d27c..8c7355f39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,7 +77,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -152,8 +152,8 @@ name = "cargo_toml" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -171,8 +171,8 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -325,8 +325,8 @@ dependencies = [ "rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -389,7 +389,7 @@ dependencies = [ "csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -559,7 +559,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1177,10 +1177,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.92" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1189,7 +1189,7 @@ version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1197,12 +1197,20 @@ name = "serde_bytes" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_bytes" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.92" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1217,7 +1225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1372,7 +1380,7 @@ name = "tinytemplate" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1381,7 +1389,7 @@ name = "toml" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1439,8 +1447,8 @@ name = "wabt" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "wabt-sys 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1472,7 +1480,6 @@ dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "errno 0.2.4 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1498,14 +1505,13 @@ dependencies = [ "cranelift-codegen 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-entity 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-native 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde-bench 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_bytes 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_bytes 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-clif-fork-frontend 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-clif-fork-wasm 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1551,7 +1557,6 @@ name = "wasmer-emscripten" version = "0.6.0" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1588,7 +1593,6 @@ dependencies = [ "capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "goblin 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "inkwell 0.1.0 (git+https://github.com/wasmerio/inkwell?branch=llvm8-0)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1660,10 +1664,10 @@ dependencies = [ "page_size 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde-bench 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_bytes 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1677,7 +1681,6 @@ dependencies = [ "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "dynasm 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "dynasmrt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1703,7 +1706,6 @@ version = "0.6.0" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "generational-arena 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1944,10 +1946,11 @@ dependencies = [ "checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "32746bf0f26eab52f06af0d0aa1984f641341d06d8d673c693871da2d188c9be" +"checksum serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5626ac617da2f2d9c48af5515a21d5a480dbd151e01bb1c355e26a3e68113" "checksum serde-bench 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d733da87e79faaac25616e33d26299a41143fd4cd42746cbb0e91d8feea243fd" "checksum serde_bytes 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)" = "defbb8a83d7f34cc8380751eeb892b825944222888aff18996ea7901f24aec88" -"checksum serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "46a3223d0c9ba936b61c0d2e3e559e3217dbfb8d65d06d26e8b3c25de38bae3e" +"checksum serde_bytes 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aaff47db6ef8771cca5d88febef2f22f47f645420e51226374049f68c6b08569" +"checksum serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "01e69e1b8a631f245467ee275b8c757b818653c6d704cdbcaeb56b56767b529c" "checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" "checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" diff --git a/Cargo.toml b/Cargo.toml index 67cd7b455..6a1374d99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,6 @@ byteorder = "1.3.2" errno = "0.2.4" structopt = "0.2.18" wabt = "0.9.0" -hashbrown = "0.1.8" wasmer-clif-backend = { path = "lib/clif-backend" } wasmer-singlepass-backend = { path = "lib/singlepass-backend", optional = true } wasmer-middleware-common = { path = "lib/middleware-common" } diff --git a/lib/clif-backend/Cargo.toml b/lib/clif-backend/Cargo.toml index 6d0252a54..40f7f38bd 100644 --- a/lib/clif-backend/Cargo.toml +++ b/lib/clif-backend/Cargo.toml @@ -15,7 +15,6 @@ cranelift-codegen = { version = "0.31" } cranelift-entity = { version = "0.31" } cranelift-frontend = { package = "wasmer-clif-fork-frontend", version = "0.33" } cranelift-wasm = { package = "wasmer-clif-fork-wasm", version = "0.33" } -hashbrown = "0.1" target-lexicon = "0.4.0" wasmparser = "0.35.1" byteorder = "1.3.2" @@ -25,11 +24,11 @@ rayon = "1.1.0" # Dependencies for caching. [dependencies.serde] -version = "1.0" +version = "1.0.98" [dependencies.serde_derive] -version = "1.0" +version = "1.0.98" [dependencies.serde_bytes] -version = "0.10" +version = "0.11.1" [dependencies.serde-bench] version = "0.0.7" diff --git a/lib/clif-backend/src/cache.rs b/lib/clif-backend/src/cache.rs index b4f647372..1b2bdcb5f 100644 --- a/lib/clif-backend/src/cache.rs +++ b/lib/clif-backend/src/cache.rs @@ -1,6 +1,6 @@ use crate::relocation::{ExternalRelocation, TrapSink}; -use hashbrown::HashMap; +use std::collections::HashMap; use std::sync::Arc; use wasmer_runtime_core::{ backend::{sys::Memory, CacheGen}, diff --git a/lib/clif-backend/src/trampoline.rs b/lib/clif-backend/src/trampoline.rs index f75ef5ad5..c8a7c4802 100644 --- a/lib/clif-backend/src/trampoline.rs +++ b/lib/clif-backend/src/trampoline.rs @@ -5,7 +5,7 @@ use cranelift_codegen::{ ir::{self, InstBuilder}, isa, Context, }; -use hashbrown::HashMap; +use std::collections::HashMap; use std::{iter, mem, ptr::NonNull}; use wasmer_runtime_core::{ backend::sys::{Memory, Protect}, diff --git a/lib/emscripten/Cargo.toml b/lib/emscripten/Cargo.toml index 2297b5f25..35bc2fa72 100644 --- a/lib/emscripten/Cargo.toml +++ b/lib/emscripten/Cargo.toml @@ -9,7 +9,6 @@ edition = "2018" [dependencies] byteorder = "1.3.2" -hashbrown = "0.1" lazy_static = "1.2.0" libc = "0.2.60" time = "0.1.41" diff --git a/lib/emscripten/src/lib.rs b/lib/emscripten/src/lib.rs index 84c55bd3c..803c4e04c 100644 --- a/lib/emscripten/src/lib.rs +++ b/lib/emscripten/src/lib.rs @@ -3,7 +3,7 @@ #[macro_use] extern crate wasmer_runtime_core; -use hashbrown::HashMap; +use std::collections::HashMap; use lazy_static::lazy_static; use std::cell::UnsafeCell; use std::path::PathBuf; diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml index de9686de8..496901949 100644 --- a/lib/llvm-backend/Cargo.toml +++ b/lib/llvm-backend/Cargo.toml @@ -8,7 +8,6 @@ readme = "README.md" [dependencies] wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } wasmparser = "0.35.1" -hashbrown = "0.1.8" smallvec = "0.6.8" goblin = "0.0.20" libc = "0.2.60" diff --git a/lib/llvm-backend/src/intrinsics.rs b/lib/llvm-backend/src/intrinsics.rs index 778c09cb0..bd251b21d 100644 --- a/lib/llvm-backend/src/intrinsics.rs +++ b/lib/llvm-backend/src/intrinsics.rs @@ -1,4 +1,4 @@ -use hashbrown::HashMap; +use std::collections::HashMap; use inkwell::{ builder::Builder, context::Context, diff --git a/lib/runtime-abi/Cargo.toml b/lib/runtime-abi/Cargo.toml index 33f11bc33..43150a0ab 100644 --- a/lib/runtime-abi/Cargo.toml +++ b/lib/runtime-abi/Cargo.toml @@ -10,7 +10,6 @@ edition = "2018" [dependencies] libc = "0.2.60" wasmer-runtime-core = { path = "../runtime-core" } -hashbrown = "0.1" failure = "0.1" tar = "0.4" wasmparser = "0.34.0" diff --git a/lib/runtime-abi/src/vfs/vfs.rs b/lib/runtime-abi/src/vfs/vfs.rs index 5cb7a0997..c4e01a380 100644 --- a/lib/runtime-abi/src/vfs/vfs.rs +++ b/lib/runtime-abi/src/vfs/vfs.rs @@ -1,7 +1,7 @@ use crate::vfs::file_like::FileLike; use crate::vfs::vfs_header::{header_from_bytes, ArchiveType, CompressionType}; use crate::vfs::virtual_file::VirtualFile; -use hashbrown::HashMap; +use std::collections::HashMap; use std::cell::RefCell; use std::io; use std::io::Read; diff --git a/lib/runtime-core/src/backend.rs b/lib/runtime-core/src/backend.rs index a4b89c497..7725a18ff 100644 --- a/lib/runtime-core/src/backend.rs +++ b/lib/runtime-core/src/backend.rs @@ -15,7 +15,7 @@ use crate::{ }; use std::{any::Any, ptr::NonNull}; -use hashbrown::HashMap; +use std::collections::HashMap; pub mod sys { pub use crate::sys::*; diff --git a/lib/runtime-core/src/export.rs b/lib/runtime-core/src/export.rs index 81e0eae92..26bc14019 100644 --- a/lib/runtime-core/src/export.rs +++ b/lib/runtime-core/src/export.rs @@ -2,7 +2,7 @@ use crate::{ global::Global, instance::InstanceInner, memory::Memory, module::ExportIndex, module::ModuleInner, table::Table, types::FuncSig, vm, }; -use hashbrown::hash_map; +use std::collections::hash_map; use std::sync::Arc; #[derive(Debug, Copy, Clone)] diff --git a/lib/runtime-core/src/import.rs b/lib/runtime-core/src/import.rs index 5fb5b4b28..9e2f0ef63 100644 --- a/lib/runtime-core/src/import.rs +++ b/lib/runtime-core/src/import.rs @@ -1,5 +1,5 @@ use crate::export::Export; -use hashbrown::{hash_map::Entry, HashMap}; +use std::collections::{hash_map::Entry, HashMap}; use std::collections::VecDeque; use std::{ cell::{Ref, RefCell}, diff --git a/lib/runtime-core/src/module.rs b/lib/runtime-core/src/module.rs index 111bc8754..726c9ecde 100644 --- a/lib/runtime-core/src/module.rs +++ b/lib/runtime-core/src/module.rs @@ -14,7 +14,7 @@ use crate::{ }; use crate::backend::CacheGen; -use hashbrown::HashMap; +use std::collections::HashMap; use indexmap::IndexMap; use std::sync::Arc; diff --git a/lib/runtime-core/src/parse.rs b/lib/runtime-core/src/parse.rs index 51be05641..a5638b7e6 100644 --- a/lib/runtime-core/src/parse.rs +++ b/lib/runtime-core/src/parse.rs @@ -14,7 +14,7 @@ use crate::{ }, units::Pages, }; -use hashbrown::HashMap; +use std::collections::HashMap; use std::fmt::Debug; use std::sync::{Arc, RwLock}; use wasmparser::{ diff --git a/lib/runtime-core/src/sig_registry.rs b/lib/runtime-core/src/sig_registry.rs index 653294f32..f723514f6 100644 --- a/lib/runtime-core/src/sig_registry.rs +++ b/lib/runtime-core/src/sig_registry.rs @@ -2,7 +2,7 @@ use crate::{ structures::Map, types::{FuncSig, SigIndex}, }; -use hashbrown::HashMap; +use std::collections::HashMap; use lazy_static::lazy_static; use parking_lot::RwLock; use std::sync::Arc; diff --git a/lib/runtime-core/src/vm.rs b/lib/runtime-core/src/vm.rs index 4170c16ea..d8a7293cc 100644 --- a/lib/runtime-core/src/vm.rs +++ b/lib/runtime-core/src/vm.rs @@ -14,7 +14,7 @@ use std::{ sync::Once, }; -use hashbrown::HashMap; +use std::collections::HashMap; /// The context of the currently running WebAssembly instance. /// @@ -850,7 +850,7 @@ mod vm_ctx_tests { use crate::cache::Error as CacheError; use crate::typed_func::Wasm; use crate::types::{LocalFuncIndex, SigIndex}; - use hashbrown::HashMap; + use std::collections::HashMap; use std::any::Any; use std::ptr::NonNull; struct Placeholder; diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml index c5a93a5cf..bfe44eded 100644 --- a/lib/singlepass-backend/Cargo.toml +++ b/lib/singlepass-backend/Cargo.toml @@ -18,5 +18,4 @@ byteorder = "1.3.2" nix = "0.14.1" libc = "0.2.60" smallvec = "0.6.9" -hashbrown = "0.1" colored = "1.8" diff --git a/lib/wasi/Cargo.toml b/lib/wasi/Cargo.toml index 79367bac9..dd13c7cbe 100644 --- a/lib/wasi/Cargo.toml +++ b/lib/wasi/Cargo.toml @@ -12,7 +12,6 @@ wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } libc = "0.2.60" rand = "0.7.0" # wasmer-runtime-abi = { path = "../runtime-abi" } -hashbrown = "0.1.8" generational-arena = "0.2.2" log = "0.4.8" byteorder = "1.3.2" diff --git a/lib/wasi/src/state.rs b/lib/wasi/src/state.rs index a7f36d232..348e0eaa2 100644 --- a/lib/wasi/src/state.rs +++ b/lib/wasi/src/state.rs @@ -8,7 +8,7 @@ use crate::syscalls::types::*; use generational_arena::Arena; pub use generational_arena::Index as Inode; -use hashbrown::hash_map::HashMap; +use std::collections::HashMap; use std::{ borrow::Borrow, cell::Cell, diff --git a/src/bin/wasmer.rs b/src/bin/wasmer.rs index 91895a4fe..bd5075a8e 100644 --- a/src/bin/wasmer.rs +++ b/src/bin/wasmer.rs @@ -10,7 +10,7 @@ use std::path::PathBuf; use std::process::exit; use std::str::FromStr; -use hashbrown::HashMap; +use std::collections::HashMap; use structopt::StructOpt; use wasmer::*; From ebce7d03715189fe7e3d82f25149407f9944bfab Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 23:21:56 -0700 Subject: [PATCH 34/41] Updated dependencies --- Cargo.lock | 302 ++++++++++----------------- Cargo.toml | 2 +- lib/clif-backend/Cargo.toml | 3 +- lib/emscripten-tests/Cargo.toml | 2 +- lib/emscripten/Cargo.toml | 4 +- lib/llvm-backend/Cargo.toml | 12 +- lib/runtime-abi/Cargo.toml | 2 +- lib/runtime-c-api/Cargo.toml | 2 +- lib/runtime-core/Cargo.toml | 23 +- lib/runtime-core/src/sys/mod.rs | 6 +- lib/runtime/Cargo.toml | 4 +- lib/singlepass-backend/Cargo.toml | 4 +- lib/wasi-tests/Cargo.toml | 2 +- lib/wasi/Cargo.toml | 2 +- lib/win-exception-handler/Cargo.toml | 8 +- 15 files changed, 147 insertions(+), 231 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c7355f39..c5a9d76e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,10 +2,10 @@ # It is not intended for manual editing. [[package]] name = "aho-corasick" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -82,22 +82,23 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.46.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "clang-sys 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", + "clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -108,12 +109,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "blake2b_simd" -version = "0.4.1" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -133,15 +133,15 @@ dependencies = [ [[package]] name = "capstone" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "capstone-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "capstone-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "capstone-sys" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -164,7 +164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cbindgen" -version = "0.8.7" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -172,11 +172,10 @@ dependencies = [ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -209,10 +208,10 @@ dependencies = [ [[package]] name = "clang-sys" -version = "0.26.4" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -397,12 +396,12 @@ name = "csv-core" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "digest" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -454,7 +453,7 @@ dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -507,6 +506,14 @@ name = "fuchsia-cprng" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "gcc" version = "0.3.55" @@ -542,9 +549,14 @@ name = "glob" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "goblin" -version = "0.0.20" +version = "0.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -552,16 +564,6 @@ dependencies = [ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "hashbrown" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "heck" version = "0.3.1" @@ -598,7 +600,7 @@ dependencies = [ "inkwell_internal_macros 0.1.0 (git+https://github.com/wasmerio/inkwell?branch=llvm8-0)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "llvm-sys 80.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -665,17 +667,16 @@ dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "lock_api" -version = "0.1.5" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -688,7 +689,7 @@ dependencies = [ [[package]] name = "memchr" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", @@ -742,7 +743,7 @@ name = "nom" version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -783,14 +784,6 @@ dependencies = [ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "owning_ref" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "page_size" version = "0.4.1" @@ -803,22 +796,25 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "parking_lot_core" -version = "0.4.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -879,24 +875,6 @@ dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rand" version = "0.7.0" @@ -909,15 +887,6 @@ dependencies = [ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rand_chacha" version = "0.2.1" @@ -948,14 +917,6 @@ dependencies = [ "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -964,24 +925,6 @@ dependencies = [ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rand_os" version = "0.1.3" @@ -995,23 +938,6 @@ dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rand_xoshiro" version = "0.1.0" @@ -1076,22 +1002,22 @@ dependencies = [ [[package]] name = "regex" -version = "1.1.6" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex-syntax" -version = "0.6.6" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1133,11 +1059,6 @@ dependencies = [ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "scopeguard" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "scopeguard" version = "1.0.0" @@ -1192,14 +1113,6 @@ dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "serde_bytes" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "serde_bytes" version = "0.11.1" @@ -1228,9 +1141,14 @@ dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "shlex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "smallvec" -version = "0.6.9" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1319,12 +1237,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.0.8" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1392,6 +1310,14 @@ dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "toml" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "typenum" version = "1.10.0" @@ -1399,7 +1325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ucd-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1479,7 +1405,7 @@ version = "0.6.0" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1568,7 +1494,7 @@ dependencies = [ name = "wasmer-emscripten-tests" version = "0.6.0" dependencies = [ - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-clif-backend 0.6.0", "wasmer-dev-utils 0.6.0", @@ -1590,17 +1516,17 @@ dependencies = [ name = "wasmer-llvm-backend" version = "0.6.0" dependencies = [ - "capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", - "goblin 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", + "goblin 0.0.24 (registry+https://github.com/rust-lang/crates.io-index)", "inkwell 0.1.0 (git+https://github.com/wasmerio/inkwell?branch=llvm8-0)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-runtime-core 0.6.0", "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1626,7 +1552,7 @@ dependencies = [ "criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-clif-backend 0.6.0", "wasmer-llvm-backend 0.6.0", @@ -1638,7 +1564,7 @@ dependencies = [ name = "wasmer-runtime-c-api" version = "0.6.0" dependencies = [ - "cbindgen 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cbindgen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-runtime 0.6.0", "wasmer-runtime-core 0.6.0", @@ -1649,26 +1575,25 @@ name = "wasmer-runtime-core" version = "0.6.0" dependencies = [ "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "blake2b_simd 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "blake2b_simd 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "digest 0.8.1 (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)", - "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "page_size 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde-bench 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_bytes 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_bytes 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1684,7 +1609,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-runtime-core 0.6.0", "wasmparser 0.35.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1717,7 +1642,7 @@ dependencies = [ name = "wasmer-wasi-tests" version = "0.6.0" dependencies = [ - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-clif-backend 0.6.0", "wasmer-dev-utils 0.6.0", "wasmer-llvm-backend 0.6.0", @@ -1730,10 +1655,10 @@ dependencies = [ name = "wasmer-win-exception-handler" version = "0.6.0" dependencies = [ - "bindgen 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bindgen 0.51.0 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-runtime-core 0.6.0", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1810,7 +1735,7 @@ dependencies = [ ] [metadata] -"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" +"checksum aho-corasick 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "36b7aa1ccb7d7ea3f437cf025a2ab1c47cc6c1bc9fc84918ff449def12f5e282" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" @@ -1820,21 +1745,21 @@ dependencies = [ "checksum backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)" = "1a13fc43f04daf08ab4f71e3d27e1fc27fc437d3e95ac0063a796d92fb40f39b" "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" "checksum bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9f04a5e50dc80b3d5d35320889053637d15011aed5e66b66b37ae798c65da6f7" -"checksum bindgen 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8f7f7f0701772b17de73e4f5cbcb1dd6926f4706cba4c1ab62c5367f8bdc94e1" +"checksum bindgen 0.51.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18270cdd7065ec045a6bb4bdcd5144d14a78b3aedb3bc5111e688773ac8b9ad0" "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" -"checksum blake2b_simd 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce2571a6cd634670daa2977cc894c1cc2ba57c563c498e5a82c35446f34d056e" +"checksum blake2b_simd 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "627892644fc13118fa3fc40f66723bb45b6b1fb086afcb772f9284cba5db09d5" "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -"checksum capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00be9d203fa0e078b93b24603633fb081851dfe0c1086364431f52587a47157e" -"checksum capstone-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc8d32bc5c1e6d0fcde10af411c98b07d93498d51654f678757f08fa2acd6a6" +"checksum capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "031ba51c39151a1d6336ec859646153187204b0147c7b3f6fe2de636f1b8dbb3" +"checksum capstone-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fae25eddcb80e24f98c35952c37a91ff7f8d0f60dbbdafb9763e8d5cc566b8d7" "checksum cargo_toml 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "097f5ce64ba566a83d9d914fd005de1e5937fdd57d8c5d99a7593040955d75a9" "checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" -"checksum cbindgen 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f861ef68cabbb271d373a7795014052bff37edce22c620d95e395e8719d7dc5" +"checksum cbindgen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7e19db9a3892c88c74cbbdcd218196068a928f1b60e736c448b13a1e81f277" "checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" "checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af" "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" "checksum cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64a4b57c8f4e3a2e9ac07e0f6abc9c24b6fc9e1b54c3478cfb598f3d0023e51c" -"checksum clang-sys 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6ef0c1bcf2e99c649104bd7a7012d8f8802684400e03db0ec0af48583c6fa0e4" +"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "2ca4386c8954b76a8415b63959337d940d724b336cabd3afe189c2b51a7e1ff0" @@ -1853,7 +1778,7 @@ dependencies = [ "checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" "checksum csv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9044e25afb0924b5a5fc5511689b0918629e85d68ea591e5e87fbf1e85ea1b3b" "checksum csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5cdef62f37e6ffe7d1f07a381bc0db32b7a3ff1cac0de56cb0d81e71f53d65" -"checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c" +"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" "checksum dynasm 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f36d49ab6f8ecc642d2c6ee10fda04ba68003ef0277300866745cdde160e6b40" "checksum dynasmrt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c408a211e7f5762829f5e46bdff0c14bc3b1517a21a4bb781c716bf88b0c68" "checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" @@ -1865,13 +1790,14 @@ dependencies = [ "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" "checksum field-offset 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64e9bc339e426139e02601fa69d101e96a92aee71b58bc01697ec2a63a5c9e68" "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" "checksum generational-arena 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4024f96ffa0ebaaf36aa589cd41f2fd69f3a5e6fd02c86e11e12cdf41d5b46a3" "checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592" "checksum getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8e190892c840661957ba9f32dacfb3eb405e657f9f9f60485605f0bb37d6f8" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" -"checksum goblin 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "84473a5302fa5094d3d9911c2f312f522f9a37462a777f195f63fae1bf7faf4d" -"checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" +"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +"checksum goblin 0.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "e3fa261d919c1ae9d1e4533c4a2f99e10938603c4208d56c05bec7a872b661b0" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" @@ -1885,9 +1811,9 @@ dependencies = [ "checksum libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb" "checksum libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5692f82b51823e27c4118b3e5c0d98aee9be90633ebc71ad12afef380b50219" "checksum llvm-sys 80.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2110cd4daf9cd8e39dd3b933b1a2a2ac7315e91f7c92b3a20beab526c63b5978" -"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" +"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" +"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" "checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" "checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" @@ -1899,10 +1825,9 @@ dependencies = [ "checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" "checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" -"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum page_size 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f89ef58b3d32420dbd1a43d2f38ae92f6239ef12bb556ab09ca55445f5a67242" -"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" -"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" +"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" +"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" "checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" @@ -1911,20 +1836,13 @@ dependencies = [ "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" "checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" "checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" -"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" "checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" "checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" -"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" "checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" "checksum rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "03b418169fb9c46533f326efd6eed2576699c44ca92d3052a066214a8d828929" "checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d" "checksum rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4b0186e22767d5b9738a05eab7c6ac90b15db17e5b5f9bd87976dd7d89a10a4" @@ -1932,15 +1850,14 @@ dependencies = [ "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" "checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58" -"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" +"checksum regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6b23da8dfd98a84bd7e08700190a5d9f7d2d38abd4369dd1dae651bc40bfd2cc" +"checksum regex-syntax 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "cd5485bf1523a9ed51c4964273f22f63f24e31632adb5dad134f488f86a3875c" "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" "checksum rgb 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4f089652ca87f5a82a62935ec6172a534066c7b97be003cc8f702ee9a7a59c92" "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" "checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" -"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" "checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383" "checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb" @@ -1948,11 +1865,11 @@ dependencies = [ "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5626ac617da2f2d9c48af5515a21d5a480dbd151e01bb1c355e26a3e68113" "checksum serde-bench 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d733da87e79faaac25616e33d26299a41143fd4cd42746cbb0e91d8feea243fd" -"checksum serde_bytes 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)" = "defbb8a83d7f34cc8380751eeb892b825944222888aff18996ea7901f24aec88" "checksum serde_bytes 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aaff47db6ef8771cca5d88febef2f22f47f645420e51226374049f68c6b08569" "checksum serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "01e69e1b8a631f245467ee275b8c757b818653c6d704cdbcaeb56b56767b529c" "checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" -"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" +"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" @@ -1963,7 +1880,7 @@ dependencies = [ "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" "checksum target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b0ab4982b8945c35cc1c46a83a9094c414f6828a099ce5dcaa8ee2b04642dcb" -"checksum tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7dc4738f2e68ed2855de5ac9cdbe05c9216773ecde4739b2f095002ab03a13ef" +"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" "checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" @@ -1971,8 +1888,9 @@ dependencies = [ "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20" "checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +"checksum toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b8c96d7873fa7ef8bdeb3a9cda3ac48389b4154f32b9803b4bc26220b677b039" "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" -"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" +"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874" "checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" "checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" diff --git a/Cargo.toml b/Cargo.toml index 6a1374d99..54dcaa3a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ members = [ [build-dependencies] wabt = "0.9.0" -glob = "0.2.11" +glob = "0.3.0" rustc_version = "0.2.3" [features] diff --git a/lib/clif-backend/Cargo.toml b/lib/clif-backend/Cargo.toml index 40f7f38bd..c30591f47 100644 --- a/lib/clif-backend/Cargo.toml +++ b/lib/clif-backend/Cargo.toml @@ -25,6 +25,7 @@ rayon = "1.1.0" # Dependencies for caching. [dependencies.serde] version = "1.0.98" +features = ["rc"] [dependencies.serde_derive] version = "1.0.98" [dependencies.serde_bytes] @@ -33,7 +34,7 @@ version = "0.11.1" version = "0.0.7" [target.'cfg(windows)'.dependencies] -winapi = { version = "0.3", features = ["errhandlingapi", "minwindef", "minwinbase", "winnt"] } +winapi = { version = "0.3.7", features = ["errhandlingapi", "minwindef", "minwinbase", "winnt"] } wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.6.0" } [features] diff --git a/lib/emscripten-tests/Cargo.toml b/lib/emscripten-tests/Cargo.toml index f8a3aa52c..e715e3fc0 100644 --- a/lib/emscripten-tests/Cargo.toml +++ b/lib/emscripten-tests/Cargo.toml @@ -20,7 +20,7 @@ wabt = "0.9.0" wasmer-dev-utils = { path = "../dev-utils", version = "0.6.0"} [build-dependencies] -glob = "0.2.11" +glob = "0.3.0" [features] clif = [] diff --git a/lib/emscripten/Cargo.toml b/lib/emscripten/Cargo.toml index 35bc2fa72..7ffaf2d7e 100644 --- a/lib/emscripten/Cargo.toml +++ b/lib/emscripten/Cargo.toml @@ -9,9 +9,9 @@ edition = "2018" [dependencies] byteorder = "1.3.2" -lazy_static = "1.2.0" +lazy_static = "1.3.0" libc = "0.2.60" -time = "0.1.41" +time = "0.1.42" wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } [target.'cfg(windows)'.dependencies] diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml index 496901949..a7873d2f5 100644 --- a/lib/llvm-backend/Cargo.toml +++ b/lib/llvm-backend/Cargo.toml @@ -8,11 +8,11 @@ readme = "README.md" [dependencies] wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } wasmparser = "0.35.1" -smallvec = "0.6.8" -goblin = "0.0.20" +smallvec = "0.6.10" +goblin = "0.0.24" libc = "0.2.60" nix = "0.14.1" -capstone = { version = "0.5.0", optional = true } +capstone = { version = "0.6.0", optional = true } [dependencies.inkwell] git = "https://github.com/wasmerio/inkwell" @@ -21,12 +21,12 @@ default-features = false features = ["llvm8-0", "target-x86"] [target.'cfg(windows)'.dependencies] -winapi = { version = "0.3", features = ["memoryapi"] } +winapi = { version = "0.3.7", features = ["memoryapi"] } [build-dependencies] cc = "1.0" -lazy_static = "1.2.0" -regex = "1.1.0" +lazy_static = "1.3.0" +regex = "1.2.0" semver = "0.9" rustc_version = "0.2.3" diff --git a/lib/runtime-abi/Cargo.toml b/lib/runtime-abi/Cargo.toml index 43150a0ab..c1f35c801 100644 --- a/lib/runtime-abi/Cargo.toml +++ b/lib/runtime-abi/Cargo.toml @@ -12,7 +12,7 @@ libc = "0.2.60" wasmer-runtime-core = { path = "../runtime-core" } failure = "0.1" tar = "0.4" -wasmparser = "0.34.0" +wasmparser = "0.35.1" zstd = "0.4" # [target.'cfg(unix)'.dependencies.zbox] diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index d2f40a498..d4447740b 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -27,4 +27,4 @@ debug = ["wasmer-runtime/debug"] llvm = ["wasmer-runtime/llvm"] [build-dependencies] -cbindgen = "0.8" +cbindgen = "0.9.0" diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml index 323b090ea..dc5998e4a 100644 --- a/lib/runtime-core/Cargo.toml +++ b/lib/runtime-core/Cargo.toml @@ -11,43 +11,40 @@ edition = "2018" nix = "0.14.1" page_size = "0.4.1" wasmparser = "0.35.1" -parking_lot = "0.7.1" -lazy_static = "1.2.0" +parking_lot = "0.9.0" +lazy_static = "1.3.0" indexmap = "1.0.2" errno = "0.2.4" libc = "0.2.60" hex = "0.3.2" -smallvec = "0.6.9" +smallvec = "0.6.10" bincode = "1.1" colored = "1.8" # Dependencies for caching. [dependencies.serde] -version = "1.0" +version = "1.0.98" # 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" +version = "1.0.98" [dependencies.serde_bytes] -version = "0.10" +version = "0.11.1" [dependencies.serde-bench] version = "0.0.7" [dependencies.blake2b_simd] -version = "0.4.1" +version = "0.5.5" [dependencies.digest] -version = "0.8.0" -[dependencies.hashbrown] -version = "0.1" -features = ["serde"] +version = "0.8.1" [target.'cfg(windows)'.dependencies] -winapi = { version = "0.3", features = ["memoryapi"] } +winapi = { version = "0.3.7", features = ["memoryapi"] } [dev-dependencies] field-offset = "0.1.1" [build-dependencies] -blake2b_simd = "0.4.1" +blake2b_simd = "0.5.5" rustc_version = "0.2.3" cc = "1.0" diff --git a/lib/runtime-core/src/sys/mod.rs b/lib/runtime-core/src/sys/mod.rs index 0bfc134c2..ac83be473 100644 --- a/lib/runtime-core/src/sys/mod.rs +++ b/lib/runtime-core/src/sys/mod.rs @@ -16,7 +16,7 @@ use serde::{ Deserialize, Deserializer, Serialize, Serializer, }; -use serde_bytes::Bytes; +use serde_bytes::{Bytes, ByteBuf}; use std::fmt; @@ -56,10 +56,10 @@ impl<'de> Deserialize<'de> for Memory { .next_element()? .ok_or_else(|| de::Error::invalid_length(0, &self))?; - let bytes: Bytes = seq + let bytes: ByteBuf = seq .next_element()? .ok_or_else(|| de::Error::invalid_length(1, &self))?; - + let mut memory = Memory::with_size_protect(bytes.len(), Protect::ReadWrite) .expect("Could not create a memory"); diff --git a/lib/runtime/Cargo.toml b/lib/runtime/Cargo.toml index 0ac13406d..a8e595d70 100644 --- a/lib/runtime/Cargo.toml +++ b/lib/runtime/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" [dependencies] wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true } -lazy_static = "1.2.0" +lazy_static = "1.3.0" memmap = "0.7.0" [dependencies.wasmer-runtime-core] @@ -23,7 +23,7 @@ version = "0.6.0" optional = true [dev-dependencies] -tempfile = "3.0.7" +tempfile = "3.1.0" criterion = "0.2" wabt = "0.9.0" diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml index bfe44eded..6cc91523e 100644 --- a/lib/singlepass-backend/Cargo.toml +++ b/lib/singlepass-backend/Cargo.toml @@ -13,9 +13,9 @@ wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } wasmparser = "0.35.1" dynasm = "0.3.2" dynasmrt = "0.3.1" -lazy_static = "1.2.0" +lazy_static = "1.3.0" byteorder = "1.3.2" nix = "0.14.1" libc = "0.2.60" -smallvec = "0.6.9" +smallvec = "0.6.10" colored = "1.8" diff --git a/lib/wasi-tests/Cargo.toml b/lib/wasi-tests/Cargo.toml index f0e4d3451..9cf2c37e1 100644 --- a/lib/wasi-tests/Cargo.toml +++ b/lib/wasi-tests/Cargo.toml @@ -17,7 +17,7 @@ wasmer-llvm-backend = { path = "../llvm-backend", version = "0.6.0", optional = [build-dependencies] -glob = "0.2.11" +glob = "0.3.0" [dev-dependencies] wasmer-clif-backend = { path = "../clif-backend", version = "0.6.0" } diff --git a/lib/wasi/Cargo.toml b/lib/wasi/Cargo.toml index dd13c7cbe..88ee9a56d 100644 --- a/lib/wasi/Cargo.toml +++ b/lib/wasi/Cargo.toml @@ -17,4 +17,4 @@ log = "0.4.8" byteorder = "1.3.2" [target.'cfg(windows)'.dependencies] -winapi = "0.3" +winapi = "0.3.7" diff --git a/lib/win-exception-handler/Cargo.toml b/lib/win-exception-handler/Cargo.toml index c3c76be79..dff905cb9 100644 --- a/lib/win-exception-handler/Cargo.toml +++ b/lib/win-exception-handler/Cargo.toml @@ -9,10 +9,10 @@ edition = "2018" [target.'cfg(windows)'.dependencies] wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" } -winapi = { version = "0.3", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] } +winapi = { version = "0.3.7", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] } libc = "0.2.60" [build-dependencies] -cmake = "0.1.35" -bindgen = "0.46.0" -regex = "1.0.6" +cmake = "0.1.40" +bindgen = "0.51.0" +regex = "1.2.0" From 7d89f9cc9a3387a38e5f0964e001a6c0d7bb802c Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 23:46:59 -0700 Subject: [PATCH 35/41] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aee892153..faf1407d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All PRs to the Wasmer repository must add to this file. Blocks of changes will separated by version increments. ## **[Unreleased]** +- [#609](https://github.com/wasmerio/wasmer/issues/609) Update dependencies ## 0.6.0 - 2019-07-31 - [#603](https://github.com/wasmerio/wasmer/pull/603) Update Wapm-cli, bump version numbers From 0dfa1f68a8869881faae79df75987b089e6eec61 Mon Sep 17 00:00:00 2001 From: Syrus Date: Wed, 31 Jul 2019 23:51:12 -0700 Subject: [PATCH 36/41] Formatted code --- lib/emscripten/src/lib.rs | 2 +- lib/llvm-backend/src/intrinsics.rs | 2 +- lib/runtime-core/src/import.rs | 2 +- lib/runtime-core/src/module.rs | 2 +- lib/runtime-core/src/sig_registry.rs | 2 +- lib/runtime-core/src/sys/mod.rs | 4 ++-- lib/runtime-core/src/vm.rs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/emscripten/src/lib.rs b/lib/emscripten/src/lib.rs index 803c4e04c..e62201c0e 100644 --- a/lib/emscripten/src/lib.rs +++ b/lib/emscripten/src/lib.rs @@ -3,9 +3,9 @@ #[macro_use] extern crate wasmer_runtime_core; -use std::collections::HashMap; use lazy_static::lazy_static; use std::cell::UnsafeCell; +use std::collections::HashMap; use std::path::PathBuf; use std::{f64, ffi::c_void}; use wasmer_runtime_core::{ diff --git a/lib/llvm-backend/src/intrinsics.rs b/lib/llvm-backend/src/intrinsics.rs index bd251b21d..0d4e05087 100644 --- a/lib/llvm-backend/src/intrinsics.rs +++ b/lib/llvm-backend/src/intrinsics.rs @@ -1,4 +1,3 @@ -use std::collections::HashMap; use inkwell::{ builder::Builder, context::Context, @@ -9,6 +8,7 @@ use inkwell::{ values::{BasicValue, BasicValueEnum, FloatValue, FunctionValue, IntValue, PointerValue}, AddressSpace, }; +use std::collections::HashMap; use std::marker::PhantomData; use wasmer_runtime_core::{ memory::MemoryType, diff --git a/lib/runtime-core/src/import.rs b/lib/runtime-core/src/import.rs index 9e2f0ef63..a7ca8de84 100644 --- a/lib/runtime-core/src/import.rs +++ b/lib/runtime-core/src/import.rs @@ -1,6 +1,6 @@ use crate::export::Export; -use std::collections::{hash_map::Entry, HashMap}; use std::collections::VecDeque; +use std::collections::{hash_map::Entry, HashMap}; use std::{ cell::{Ref, RefCell}, ffi::c_void, diff --git a/lib/runtime-core/src/module.rs b/lib/runtime-core/src/module.rs index 726c9ecde..1faad791c 100644 --- a/lib/runtime-core/src/module.rs +++ b/lib/runtime-core/src/module.rs @@ -14,8 +14,8 @@ use crate::{ }; use crate::backend::CacheGen; -use std::collections::HashMap; use indexmap::IndexMap; +use std::collections::HashMap; use std::sync::Arc; /// This is used to instantiate a new WebAssembly module. diff --git a/lib/runtime-core/src/sig_registry.rs b/lib/runtime-core/src/sig_registry.rs index f723514f6..97a69c02d 100644 --- a/lib/runtime-core/src/sig_registry.rs +++ b/lib/runtime-core/src/sig_registry.rs @@ -2,9 +2,9 @@ use crate::{ structures::Map, types::{FuncSig, SigIndex}, }; -use std::collections::HashMap; use lazy_static::lazy_static; use parking_lot::RwLock; +use std::collections::HashMap; use std::sync::Arc; lazy_static! { diff --git a/lib/runtime-core/src/sys/mod.rs b/lib/runtime-core/src/sys/mod.rs index ac83be473..a9008a738 100644 --- a/lib/runtime-core/src/sys/mod.rs +++ b/lib/runtime-core/src/sys/mod.rs @@ -16,7 +16,7 @@ use serde::{ Deserialize, Deserializer, Serialize, Serializer, }; -use serde_bytes::{Bytes, ByteBuf}; +use serde_bytes::{ByteBuf, Bytes}; use std::fmt; @@ -59,7 +59,7 @@ impl<'de> Deserialize<'de> for Memory { let bytes: ByteBuf = seq .next_element()? .ok_or_else(|| de::Error::invalid_length(1, &self))?; - + let mut memory = Memory::with_size_protect(bytes.len(), Protect::ReadWrite) .expect("Could not create a memory"); diff --git a/lib/runtime-core/src/vm.rs b/lib/runtime-core/src/vm.rs index d8a7293cc..291c08bc2 100644 --- a/lib/runtime-core/src/vm.rs +++ b/lib/runtime-core/src/vm.rs @@ -850,8 +850,8 @@ mod vm_ctx_tests { use crate::cache::Error as CacheError; use crate::typed_func::Wasm; use crate::types::{LocalFuncIndex, SigIndex}; - use std::collections::HashMap; use std::any::Any; + use std::collections::HashMap; use std::ptr::NonNull; struct Placeholder; impl RunnableModule for Placeholder { From 676bccff3caea77d341f66fcb353eb64678dd676 Mon Sep 17 00:00:00 2001 From: Syrus Date: Thu, 1 Aug 2019 00:22:52 -0700 Subject: [PATCH 37/41] Tryin gto make c_api_tests verbose mitigates the flaky error Each time `make capi` is run, there is a flaky error: ``` Running target/release/deps/runtime_c_api_tests-3df0f74fcea1252d running 1 test test test_c_api ... FAILED failures: ---- test_c_api stdout ---- Running command: `cmake` arg: Some(".") output: status: 0 stdout: -- Configuring done -- Generating done -- Build files have been written to: /Users/syrusakbary/Development/wasmer/lib/runtime-c-api/tests stderr: Running command: `make` arg: Some("-Wdev -Werror=dev") output: status: 0 stdout: [ 7%] Built target test-tables [ 15%] Built target test-module-exports [ 23%] Built target test-module-imports [ 30%] Built target test-globals [ 38%] Built target test-imports [ 46%] Built target test-module [ 53%] Built target test-module-serialize [ 61%] Built target test-memory [ 69%] Built target test-validate [ 76%] Built target test-import-function [ 84%] Built target test-instantiate [ 92%] Built target test-exports [100%] Built target test-exported-memory stderr: Running command: `make` arg: Some("test") output: status: 2 stdout: Running tests... Test project /Users/syrusakbary/Development/wasmer/lib/runtime-c-api/tests Start 1: test-exported-memory 1/13 Test #1: test-exported-memory .............Child aborted***Exception: 0.00 sec Start 2: test-exports 2/13 Test #2: test-exports ..................... Passed 0.01 sec Start 3: test-globals 3/13 Test #3: test-globals ..................... Passed 0.00 sec Start 4: test-import-function 4/13 Test #4: test-import-function ............. Passed 0.01 sec Start 5: test-imports 5/13 Test #5: test-imports ..................... Passed 0.01 sec Start 6: test-instantiate 6/13 Test #6: test-instantiate ................. Passed 0.01 sec Start 7: test-memory 7/13 Test #7: test-memory ...................... Passed 0.00 sec Start 8: test-module 8/13 Test #8: test-module ...................... Passed 0.01 sec Start 9: test-module-exports 9/13 Test #9: test-module-exports .............. Passed 0.01 sec Start 10: test-module-imports 10/13 Test #10: test-module-imports .............. Passed 0.01 sec Start 11: test-module-serialize 11/13 Test #11: test-module-serialize ............ Passed 0.01 sec Start 12: test-tables 12/13 Test #12: test-tables ...................... Passed 0.00 sec Start 13: test-validate 13/13 Test #13: test-validate .................... Passed 0.00 sec 92% tests passed, 1 tests failed out of 13 Total Test time (real) = 0.08 sec The following tests FAILED: 1 - test-exported-memory (Child aborted) stderr: Errors while running CTest make[1]: *** [test] Error 8 thread 'test_c_api' panicked at 'Command failed with exit status: ExitStatus(ExitStatus(512))', lib/runtime-c-api/tests/runtime_c_api_tests.rs:43:17 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace. ``` --- lib/runtime-c-api/tests/runtime_c_api_tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/runtime-c-api/tests/runtime_c_api_tests.rs b/lib/runtime-c-api/tests/runtime_c_api_tests.rs index 4349133a7..98c9c27b1 100644 --- a/lib/runtime-c-api/tests/runtime_c_api_tests.rs +++ b/lib/runtime-c-api/tests/runtime_c_api_tests.rs @@ -6,7 +6,7 @@ fn test_c_api() { run_command("cmake", project_tests_dir, Some(".")); run_command("make", project_tests_dir, Some("-Wdev -Werror=dev")); - run_command("make", project_tests_dir, Some("test")); + run_command("make", project_tests_dir, Some("test VERBOSE=1")); } fn run_command(command_str: &str, dir: &str, arg: Option<&str>) { From 052ad1381d878da624f538de5df2c2a191fd0bc8 Mon Sep 17 00:00:00 2001 From: Syrus Date: Thu, 1 Aug 2019 01:27:21 -0700 Subject: [PATCH 38/41] Use ordered IndexMap for exports in runtime-core --- lib/runtime-core/Cargo.toml | 5 ++++- lib/runtime-core/src/export.rs | 4 ++-- lib/runtime-core/src/module.rs | 2 +- lib/runtime-core/src/vm.rs | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml index dc5998e4a..3cde70351 100644 --- a/lib/runtime-core/Cargo.toml +++ b/lib/runtime-core/Cargo.toml @@ -13,7 +13,6 @@ page_size = "0.4.1" wasmparser = "0.35.1" parking_lot = "0.9.0" lazy_static = "1.3.0" -indexmap = "1.0.2" errno = "0.2.4" libc = "0.2.60" hex = "0.3.2" @@ -21,6 +20,10 @@ smallvec = "0.6.10" bincode = "1.1" colored = "1.8" +[dependencies.indexmap] +version = "1.0.2" +features = ["serde-1"] + # Dependencies for caching. [dependencies.serde] version = "1.0.98" diff --git a/lib/runtime-core/src/export.rs b/lib/runtime-core/src/export.rs index 26bc14019..52ea9cf61 100644 --- a/lib/runtime-core/src/export.rs +++ b/lib/runtime-core/src/export.rs @@ -2,7 +2,7 @@ use crate::{ global::Global, instance::InstanceInner, memory::Memory, module::ExportIndex, module::ModuleInner, table::Table, types::FuncSig, vm, }; -use std::collections::hash_map; +use indexmap::map::Iter as IndexMapIter; use std::sync::Arc; #[derive(Debug, Copy, Clone)] @@ -41,7 +41,7 @@ impl FuncPointer { pub struct ExportIter<'a> { inner: &'a InstanceInner, - iter: hash_map::Iter<'a, String, ExportIndex>, + iter: IndexMapIter<'a, String, ExportIndex>, module: &'a ModuleInner, } diff --git a/lib/runtime-core/src/module.rs b/lib/runtime-core/src/module.rs index 1faad791c..6cc02343f 100644 --- a/lib/runtime-core/src/module.rs +++ b/lib/runtime-core/src/module.rs @@ -40,7 +40,7 @@ pub struct ModuleInfo { pub imported_tables: Map, pub imported_globals: Map, - pub exports: HashMap, + pub exports: IndexMap, pub data_initializers: Vec, pub elem_initializers: Vec, diff --git a/lib/runtime-core/src/vm.rs b/lib/runtime-core/src/vm.rs index 291c08bc2..d11220c73 100644 --- a/lib/runtime-core/src/vm.rs +++ b/lib/runtime-core/src/vm.rs @@ -850,6 +850,7 @@ mod vm_ctx_tests { use crate::cache::Error as CacheError; use crate::typed_func::Wasm; use crate::types::{LocalFuncIndex, SigIndex}; + use indexmap::IndexMap; use std::any::Any; use std::collections::HashMap; use std::ptr::NonNull; @@ -890,7 +891,7 @@ mod vm_ctx_tests { imported_tables: Map::new(), imported_globals: Map::new(), - exports: HashMap::new(), + exports: IndexMap::new(), data_initializers: Vec::new(), elem_initializers: Vec::new(), From 2c6fbcba1f3d60ce9866bc1692bb3aa332435e54 Mon Sep 17 00:00:00 2001 From: Syrus Date: Thu, 1 Aug 2019 01:27:36 -0700 Subject: [PATCH 39/41] Improved runtime_c_api_tests --- lib/runtime-c-api/tests/runtime_c_api_tests.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/runtime-c-api/tests/runtime_c_api_tests.rs b/lib/runtime-c-api/tests/runtime_c_api_tests.rs index 98c9c27b1..0e3257786 100644 --- a/lib/runtime-c-api/tests/runtime_c_api_tests.rs +++ b/lib/runtime-c-api/tests/runtime_c_api_tests.rs @@ -4,19 +4,17 @@ use std::process::Command; fn test_c_api() { let project_tests_dir = concat!(env!("CARGO_MANIFEST_DIR"), "/tests"); - run_command("cmake", project_tests_dir, Some(".")); - run_command("make", project_tests_dir, Some("-Wdev -Werror=dev")); - run_command("make", project_tests_dir, Some("test VERBOSE=1")); + run_command("cmake", project_tests_dir, vec!["."]); + run_command("make", project_tests_dir, vec!["-Wdev", "-Werror=dev"]); + run_command("make", project_tests_dir, vec!["test", "ARGS=\"-V\""]); } -fn run_command(command_str: &str, dir: &str, arg: Option<&str>) { - println!("Running command: `{}` arg: {:?}", command_str, arg); +fn run_command(command_str: &str, dir: &str, args: Vec<&str>) { + println!("Running command: `{}` args: {:?}", command_str, args); let mut command = Command::new(command_str); - if let Some(a) = arg { - command.arg(a); - } + command.args(&args); command.current_dir(dir); From 70a767e2040037ab9568f21c600d54015467062c Mon Sep 17 00:00:00 2001 From: Syrus Date: Thu, 1 Aug 2019 01:28:11 -0700 Subject: [PATCH 40/41] Improved exported memory tests --- Cargo.lock | 3 +++ lib/runtime-c-api/tests/test-exported-memory.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index c5a9d76e1..ab697e243 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -589,6 +589,9 @@ dependencies = [ name = "indexmap" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "inkwell" diff --git a/lib/runtime-c-api/tests/test-exported-memory.c b/lib/runtime-c-api/tests/test-exported-memory.c index 455de0402..895b5c27c 100644 --- a/lib/runtime-c-api/tests/test-exported-memory.c +++ b/lib/runtime-c-api/tests/test-exported-memory.c @@ -42,8 +42,9 @@ int main() assert(export_length == 5); // Get the `memory` export. - wasmer_export_t *export = wasmer_exports_get(exports, 1); + wasmer_export_t *export = wasmer_exports_get(exports, 0); wasmer_import_export_kind kind = wasmer_export_kind(export); + printf("Wasmer import export kind: %d (Memory is %d)\n", kind, WASM_MEMORY); assert(kind == WASM_MEMORY); wasmer_byte_array export_name = wasmer_export_name(export); From 524585942a90e412a36eedfb210c16b41300a908 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 1 Aug 2019 17:24:51 +0300 Subject: [PATCH 41/41] deleting test-context binary --- lib/runtime-c-api/tests/test-context | Bin 14164 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 lib/runtime-c-api/tests/test-context diff --git a/lib/runtime-c-api/tests/test-context b/lib/runtime-c-api/tests/test-context deleted file mode 100755 index 782fbe97b9db7c85821fb2445bb136adc35599bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14164 zcmeHOZEPGz8J^2Wo2Cutwh4qnn^T3WfD)gb)*}6I@uj|Yqxz_6Vo?P}o6FrgKIMEq z?jvz3LY+E?vf3OnYFr|q5J5pvDl?#QY^+t0_JP_q)xAJ$0^!Jq8oHh{`f}u) z;`Z0^X$%IU^Vd0Y;sr`qk_Do_8tQsBm*1MLG`aoVbGzg3+e)L1%La>-Kh+)Lqd&dd zNT!Vpl-&M~D1Yaa17haAQs%@L%jPnP)HbEy_V?@^PJFk?Bnm-XU21$opzHb6&O|D% zCsJL#64%bh@CwHt=bVMu?Zc5cHRp9L`quTf(8f@eB;fdwFBF@BW#J2k!g<9zCm&*6 zPbKy2uAZ&ENj;s*e4;;PF8$HIT$ul5WdN${+j^^BlR5tC0#1C3lnt@l-)EGJMAwti zYsI%5_MC#lR7N4L_Q&xqr$80v%~@CN>%aPFxNUuTO*Fdl2F$XN4p2zgPr2NQbt_d+ zaV(2K*OrB#t-up7s9WR2#<^r1 zr|<;u+=M5X&t`(j#MWSZS27OF@;N+=YBk;>+bL@Kzm zH?uvM?FsITW_yfGFc-~iGjhRY02hm*_F{m>x|h8ZfHF)^gYE zcWqU_zKiFv{rIlr0J|p>s4(ZrD_#b?40svvGT>#v%Yc^w zF9Ti%ybO35@G{_Kz{`M_f&ZrrbZX|GwSfyAnz`H7EIh^LAkLBO-{F8xGs9D8n`(N) z9DkXIGMae`ZIfo?toVO#vH7h@9b)L0<;wYo76H1Y(&R{VYHukR&bL_uTZQnY_q^v)}!!`3YbN3}PKdYH<+wb9&8zIkF`Af35 z^a2Y4_S?u>bv-EU_gv_Qb<=2j5eY3uMw;Gjx0bAf$B1=9yBUGM-IHeiEZmx>+RgAm z&5R71;r;eg?8AzT0wb4^aZpauBqnLUOjPHf71`fzg%5^aVn*#G49xHmD}O{Qw&bBQ zEbLaaS$Rxs3o~to_n~bS+amV;k+UKHfs>*B4@;r`bH0%O*cmPMjy7-+YJ2^AdEN-K zN7+@ed4nWNegN|Fz3lAgI4GM2BL;RK@%ayo-c$O5&wp%Od8nA*9FWdkHZO>Rg$mZAWKjO5~f1`gzn<&2@SPz&L&UELDlXcEgWKudX zcVkB0MzkaLG%Q2rXq#Lqm~}HejuFh*?^N0+FbJB##0PdtGedkmF_)n_&=M?!W*w)I zW=VI}kRvZrzs)KT*&k5NEcBJAR+OZ8Tq7zrzr@)rE;|NdKSw{sg*z~gaMP$(EVfFW zp*E1v%h15C@Y`_HyKUxs>&o()-L@)vD z=p&6Xbc`r6sF`Q9;!!zx^F2-GykCY<>|^iGb1JO@d2L{{5jl`f&C?nt${M1o-7lxR z#iIXB7deE&taLFXWB@IDAi+A0OFeXXx-bJdrye7cs+Lp@nG;&^IAv|-$F@wtwvKjMzRVdDY8ldxIn5=#0crkU{99;r7@M1}<$6ZtuH%rkR?t2%DhkAR`iKJ0Ga?FwVJRX*6 ziuXY9t{c~J@@dAsG7B+ZnwxM3Rfk8F3R7-y)1~TO`3^-_D!N9|2NZo+(GEp7DH>Na zrD&g`Pb<1#(J^%&{+6PXik?&Sf}$TQDwN$~Mcr|G*vo*I0WSky2D}V-8SpaTWx&gT zmjN#WUIx4jco~?Rft&AKzJ=dS-_ok{)AeXZZ{vhU7T=)AESHw*5GIpL3A6=V-nycRB->Y_y(^aN%^F0FM7?Q4nye+r7|}Q- ztqzb{8u_eYY^R`uAZH|{wvJ8&9rVRu0}oDK#dE%%D2#sU<6+f&F@Yn+ zd9jMQ=}TPk^$dQH(%%53QC2gohJ&c4))3x}Z`xN4`&t`Yhv)NT7KJYTK7Kjvd>@aa zFkl>Nqt`AP?hlnUf?w@i zSug-qD+XI3))r2pYZfUs^{TD8W{a1ba!re~>6dqCwKuC>nZyukCsuoKdG{^vyQJKt z%6n~jm%Y~ZdNmpM)k=HKhB~*^y^~&BLq=EL>?@v?5AL0F%*&f*t-#qW=lo}sua6M_ E26vyM!vFvP