Merge branch 'master' into feature/c-api

2024-12-13 06:15:33 +00:00 · 2019-02-17 17:20:47 -06:00 · 2019-02-17 17:20:47 -06:00 · 2ed6e82354
commit 2ed6e82354
parent 123d55cb4a 7602071e1a
205 changed files with 67 additions and 4 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1083,6 +1083,7 @@ version = "0.1.0"
 dependencies = [
 "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.48 (git+https://github.com/rust-lang/libc)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/lib/emscripten/Cargo.toml
+++ b/lib/emscripten/Cargo.toml
@ -10,6 +10,7 @@ build = "build/mod.rs"

 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.1.0" }
+lazy_static = "1.2.0"
 libc = { git = "https://github.com/rust-lang/libc" }
 byteorder = "1"
 time = "0.1.41"
--- a/lib/emscripten/emtests/FS_exports.wasm
+++ b/lib/emscripten/emtests/FS_exports.wasm
--- a/lib/emscripten/emtests/clock_gettime.wasm
+++ b/lib/emscripten/emtests/clock_gettime.wasm
--- a/lib/emscripten/emtests/closebitcasts.wasm
+++ b/lib/emscripten/emtests/closebitcasts.wasm
--- a/lib/emscripten/emtests/dyncall.wasm
+++ b/lib/emscripten/emtests/dyncall.wasm
--- a/lib/emscripten/emtests/dyncall_specific.wasm
+++ b/lib/emscripten/emtests/dyncall_specific.wasm
--- a/lib/emscripten/emtests/emscripten_get_compiler_setting.wasm
+++ b/lib/emscripten/emtests/emscripten_get_compiler_setting.wasm
--- a/lib/emscripten/emtests/env.wasm
+++ b/lib/emscripten/emtests/env.wasm
--- a/lib/emscripten/emtests/getValue_setValue.wasm
+++ b/lib/emscripten/emtests/getValue_setValue.wasm
--- a/lib/emscripten/emtests/legacy_exported_runtime_numbers.wasm
+++ b/lib/emscripten/emtests/legacy_exported_runtime_numbers.wasm
--- a/lib/emscripten/emtests/localtime.wasm
+++ b/lib/emscripten/emtests/localtime.wasm
--- a/lib/emscripten/emtests/modularize_closure_pre.wasm
+++ b/lib/emscripten/emtests/modularize_closure_pre.wasm
--- a/lib/emscripten/emtests/printf.wasm
+++ b/lib/emscripten/emtests/printf.wasm
--- a/lib/emscripten/emtests/puts.wasm
+++ b/lib/emscripten/emtests/puts.wasm
--- a/lib/emscripten/emtests/stackAlloc.wasm
+++ b/lib/emscripten/emtests/stackAlloc.wasm
--- a/lib/emscripten/emtests/stack_overflow.wasm
+++ b/lib/emscripten/emtests/stack_overflow.wasm
--- a/lib/emscripten/emtests/test_addr_of_stacked.wasm
+++ b/lib/emscripten/emtests/test_addr_of_stacked.wasm
--- a/lib/emscripten/emtests/test_alloca.wasm
+++ b/lib/emscripten/emtests/test_alloca.wasm
--- a/lib/emscripten/emtests/test_alloca_stack.wasm
+++ b/lib/emscripten/emtests/test_alloca_stack.wasm
--- a/lib/emscripten/emtests/test_array2.wasm
+++ b/lib/emscripten/emtests/test_array2.wasm
--- a/lib/emscripten/emtests/test_array2b.wasm
+++ b/lib/emscripten/emtests/test_array2b.wasm
--- a/lib/emscripten/emtests/test_atoX.wasm
+++ b/lib/emscripten/emtests/test_atoX.wasm
--- a/lib/emscripten/emtests/test_atomic.wasm
+++ b/lib/emscripten/emtests/test_atomic.wasm
--- a/lib/emscripten/emtests/test_atomic_cxx.wasm
+++ b/lib/emscripten/emtests/test_atomic_cxx.wasm
--- a/lib/emscripten/emtests/test_bsearch.wasm
+++ b/lib/emscripten/emtests/test_bsearch.wasm
--- a/lib/emscripten/emtests/test_ccall.wasm
+++ b/lib/emscripten/emtests/test_ccall.wasm
--- a/lib/emscripten/emtests/test_complex.wasm
+++ b/lib/emscripten/emtests/test_complex.wasm
--- a/lib/emscripten/emtests/test_demangle_stacks.wasm
+++ b/lib/emscripten/emtests/test_demangle_stacks.wasm
--- a/lib/emscripten/emtests/test_demangle_stacks_noassert.wasm
+++ b/lib/emscripten/emtests/test_demangle_stacks_noassert.wasm
--- a/lib/emscripten/emtests/test_dlmalloc_partial_2.wasm
+++ b/lib/emscripten/emtests/test_dlmalloc_partial_2.wasm
--- a/lib/emscripten/emtests/test_double_varargs.wasm
+++ b/lib/emscripten/emtests/test_double_varargs.wasm
--- a/lib/emscripten/emtests/test_em_asm.wasm
+++ b/lib/emscripten/emtests/test_em_asm.wasm
--- a/lib/emscripten/emtests/test_em_asm_2.wasm
+++ b/lib/emscripten/emtests/test_em_asm_2.wasm
--- a/lib/emscripten/emtests/test_em_asm_parameter_pack.wasm
+++ b/lib/emscripten/emtests/test_em_asm_parameter_pack.wasm
--- a/lib/emscripten/emtests/test_em_asm_signatures.wasm
+++ b/lib/emscripten/emtests/test_em_asm_signatures.wasm
--- a/lib/emscripten/emtests/test_em_asm_unicode.wasm
+++ b/lib/emscripten/emtests/test_em_asm_unicode.wasm
--- a/lib/emscripten/emtests/test_em_asm_unused_arguments.wasm
+++ b/lib/emscripten/emtests/test_em_asm_unused_arguments.wasm
--- a/lib/emscripten/emtests/test_em_js.wasm
+++ b/lib/emscripten/emtests/test_em_js.wasm
--- a/lib/emscripten/emtests/test_emscripten_api.wasm
+++ b/lib/emscripten/emtests/test_emscripten_api.wasm
--- a/lib/emscripten/emtests/test_emulate_function_pointer_casts.wasm
+++ b/lib/emscripten/emtests/test_emulate_function_pointer_casts.wasm
--- a/lib/emscripten/emtests/test_erf.wasm
+++ b/lib/emscripten/emtests/test_erf.wasm
--- a/lib/emscripten/emtests/test_errar.wasm
+++ b/lib/emscripten/emtests/test_errar.wasm
--- a/lib/emscripten/emtests/test_exceptions_2.wasm
+++ b/lib/emscripten/emtests/test_exceptions_2.wasm
--- a/lib/emscripten/emtests/test_exceptions_convert.wasm
+++ b/lib/emscripten/emtests/test_exceptions_convert.wasm
--- a/lib/emscripten/emtests/test_exceptions_destroy_virtual.wasm
+++ b/lib/emscripten/emtests/test_exceptions_destroy_virtual.wasm
--- a/lib/emscripten/emtests/test_exceptions_libcxx.wasm
+++ b/lib/emscripten/emtests/test_exceptions_libcxx.wasm
--- a/lib/emscripten/emtests/test_exceptions_multi.wasm
+++ b/lib/emscripten/emtests/test_exceptions_multi.wasm
--- a/lib/emscripten/emtests/test_exceptions_multiple_inherit.wasm
+++ b/lib/emscripten/emtests/test_exceptions_multiple_inherit.wasm
--- a/lib/emscripten/emtests/test_exceptions_multiple_inherit_rethrow.wasm
+++ b/lib/emscripten/emtests/test_exceptions_multiple_inherit_rethrow.wasm
--- a/lib/emscripten/emtests/test_exceptions_primary.wasm
+++ b/lib/emscripten/emtests/test_exceptions_primary.wasm
--- a/lib/emscripten/emtests/test_exceptions_refcount.wasm
+++ b/lib/emscripten/emtests/test_exceptions_refcount.wasm
--- a/lib/emscripten/emtests/test_exceptions_resume.wasm
+++ b/lib/emscripten/emtests/test_exceptions_resume.wasm
--- a/lib/emscripten/emtests/test_exceptions_rethrow.wasm
+++ b/lib/emscripten/emtests/test_exceptions_rethrow.wasm
--- a/lib/emscripten/emtests/test_exceptions_simplify_cfg.wasm
+++ b/lib/emscripten/emtests/test_exceptions_simplify_cfg.wasm
--- a/lib/emscripten/emtests/test_exceptions_std.wasm
+++ b/lib/emscripten/emtests/test_exceptions_std.wasm
--- a/lib/emscripten/emtests/test_exceptions_virtual_inheritance.wasm
+++ b/lib/emscripten/emtests/test_exceptions_virtual_inheritance.wasm
--- a/lib/emscripten/emtests/test_exceptions_white_list.wasm
+++ b/lib/emscripten/emtests/test_exceptions_white_list.wasm
--- a/lib/emscripten/emtests/test_fast_math.wasm
+++ b/lib/emscripten/emtests/test_fast_math.wasm
--- a/lib/emscripten/emtests/test_flexarray_struct.wasm
+++ b/lib/emscripten/emtests/test_flexarray_struct.wasm
--- a/lib/emscripten/emtests/test_float32_precise.wasm
+++ b/lib/emscripten/emtests/test_float32_precise.wasm
--- a/lib/emscripten/emtests/test_float_builtins.wasm
+++ b/lib/emscripten/emtests/test_float_builtins.wasm
--- a/lib/emscripten/emtests/test_frexp.wasm
+++ b/lib/emscripten/emtests/test_frexp.wasm
--- a/lib/emscripten/emtests/test_funcptr.wasm
+++ b/lib/emscripten/emtests/test_funcptr.wasm
--- a/lib/emscripten/emtests/test_funcptr_namecollide.wasm
+++ b/lib/emscripten/emtests/test_funcptr_namecollide.wasm
--- a/lib/emscripten/emtests/test_funcptrfunc.wasm
+++ b/lib/emscripten/emtests/test_funcptrfunc.wasm
--- a/lib/emscripten/emtests/test_funcs.wasm
+++ b/lib/emscripten/emtests/test_funcs.wasm
--- a/lib/emscripten/emtests/test_functionpointer_libfunc_varargs.wasm
+++ b/lib/emscripten/emtests/test_functionpointer_libfunc_varargs.wasm
--- a/lib/emscripten/emtests/test_fwrite_0.wasm
+++ b/lib/emscripten/emtests/test_fwrite_0.wasm
--- a/lib/emscripten/emtests/test_getgep.wasm
+++ b/lib/emscripten/emtests/test_getgep.wasm
--- a/lib/emscripten/emtests/test_getloadavg.wasm
+++ b/lib/emscripten/emtests/test_getloadavg.wasm
--- a/lib/emscripten/emtests/test_getopt.wasm
+++ b/lib/emscripten/emtests/test_getopt.wasm
--- a/lib/emscripten/emtests/test_getopt_long.wasm
+++ b/lib/emscripten/emtests/test_getopt_long.wasm
--- a/lib/emscripten/emtests/test_globaldoubles.wasm
+++ b/lib/emscripten/emtests/test_globaldoubles.wasm
--- a/lib/emscripten/emtests/test_globals.wasm
+++ b/lib/emscripten/emtests/test_globals.wasm
--- a/lib/emscripten/emtests/test_gmtime.wasm
+++ b/lib/emscripten/emtests/test_gmtime.wasm
--- a/lib/emscripten/emtests/test_hello_world.wasm
+++ b/lib/emscripten/emtests/test_hello_world.wasm
--- a/lib/emscripten/emtests/test_i16_emcc_intrinsic.wasm
+++ b/lib/emscripten/emtests/test_i16_emcc_intrinsic.wasm
--- a/lib/emscripten/emtests/test_i32_mul_precise.wasm
+++ b/lib/emscripten/emtests/test_i32_mul_precise.wasm
--- a/lib/emscripten/emtests/test_i64.wasm
+++ b/lib/emscripten/emtests/test_i64.wasm
--- a/lib/emscripten/emtests/test_i64_4.wasm
+++ b/lib/emscripten/emtests/test_i64_4.wasm
--- a/lib/emscripten/emtests/test_i64_7z.wasm
+++ b/lib/emscripten/emtests/test_i64_7z.wasm
--- a/lib/emscripten/emtests/test_i64_cmp2.wasm
+++ b/lib/emscripten/emtests/test_i64_cmp2.wasm
--- a/lib/emscripten/emtests/test_i64_i16.wasm
+++ b/lib/emscripten/emtests/test_i64_i16.wasm
--- a/lib/emscripten/emtests/test_i64_llabs.wasm
+++ b/lib/emscripten/emtests/test_i64_llabs.wasm
--- a/lib/emscripten/emtests/test_i64_precise.wasm
+++ b/lib/emscripten/emtests/test_i64_precise.wasm
--- a/lib/emscripten/emtests/test_i64_precise_needed.wasm
+++ b/lib/emscripten/emtests/test_i64_precise_needed.wasm
--- a/lib/emscripten/emtests/test_i64_precise_unneeded.wasm
+++ b/lib/emscripten/emtests/test_i64_precise_unneeded.wasm
--- a/lib/emscripten/emtests/test_i64_qdouble.wasm
+++ b/lib/emscripten/emtests/test_i64_qdouble.wasm
--- a/lib/emscripten/emtests/test_i64_umul.wasm
+++ b/lib/emscripten/emtests/test_i64_umul.wasm
--- a/lib/emscripten/emtests/test_i64_varargs.wasm
+++ b/lib/emscripten/emtests/test_i64_varargs.wasm
--- a/lib/emscripten/emtests/test_i64_zextneg.wasm
+++ b/lib/emscripten/emtests/test_i64_zextneg.wasm
--- a/lib/emscripten/emtests/test_if.wasm
+++ b/lib/emscripten/emtests/test_if.wasm
--- a/lib/emscripten/emtests/test_if_else.wasm
+++ b/lib/emscripten/emtests/test_if_else.wasm
--- a/lib/emscripten/emtests/test_indirectbr.wasm
+++ b/lib/emscripten/emtests/test_indirectbr.wasm
--- a/lib/emscripten/emtests/test_indirectbr_many.wasm
+++ b/lib/emscripten/emtests/test_indirectbr_many.wasm
--- a/lib/emscripten/emtests/test_intentional_fault.wasm
+++ b/lib/emscripten/emtests/test_intentional_fault.wasm
--- a/lib/emscripten/emtests/test_isnan.wasm
+++ b/lib/emscripten/emtests/test_isnan.wasm
--- a/lib/emscripten/emtests/test_libcextra.wasm
+++ b/lib/emscripten/emtests/test_libcextra.wasm
--- a/lib/emscripten/emtests/test_libgen.wasm
+++ b/lib/emscripten/emtests/test_libgen.wasm
--- a/Show More
+++ b/Show More