Merge branch 'master' into update-version-numbers-to-4

2025-03-18 00:50:51 +00:00 · 2019-05-01 09:27:38 -07:00 · 2019-05-01 09:27:38 -07:00 · 2646765671
commit 2646765671
parent d020ffd759 da6f5ffda0
22 changed files with 125 additions and 42 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,9 +5,11 @@ All PRs to the Wasmer repository must add to this file.
 Blocks of changes will separated by version increments.

 ## **[Unreleased]**
+- [#409](https://github.com/wasmerio/wasmer/pull/409) Improved Emscripten functions to run JavascriptCore compiled to wasm
 - [#399](https://github.com/wasmerio/wasmer/pull/399) Add example of using a plugin extended from WASI
 - [#397](https://github.com/wasmerio/wasmer/pull/397) Fix WASI fs abstraction to work on Windows
 - [#390](https://github.com/wasmerio/wasmer/pull/390) Pin released wapm version and add it as a git submodule
+- [#408](https://github.com/wasmerio/wasmer/pull/408) Add images to windows installer and update installer to add wapm bin directory to path

 ## 0.4.0 - 2018-04-23

--- a/Cargo.lock
+++ b/Cargo.lock
@ -2264,7 +2264,7 @@ dependencies = [
 "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasmer-runtime-core 0.3.0",
 "wasmer-win-exception-handler 0.3.0",
- "wasmparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -2303,7 +2303,7 @@ dependencies = [
 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasmer-runtime-core 0.3.0",
- "wasmparser 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2331,7 +2331,7 @@ dependencies = [
 "tar 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasmer-runtime-core 0.3.0",
- "wasmparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "zbox 0.6.1 (git+https://github.com/wasmerio/zbox?branch=bundle-libsodium)",
 "zstd 0.4.22+zstd.1.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -2385,7 +2385,7 @@ dependencies = [
 "nix 0.13.0 (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.3.0",
- "wasmparser 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2424,16 +2424,6 @@ dependencies = [
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "wasmparser"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wasmparser"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "wasmparser"
 version = "0.29.2"
@ -2827,8 +2817,6 @@ dependencies = [
 "checksum wabt-sys 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a6265b25719e82598d104b3717375e37661d41753e2c84cde3f51050c7ed7e3c"
 "checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1"
 "checksum want 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "797464475f30ddb8830cc529aaaae648d581f99e2036a928877dfde027ddf6b3"
-"checksum wasmparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5e01c420bc7d36e778bd242e1167b079562ba8b34087122cc9057187026d060"
-"checksum wasmparser 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "40f426b1929bd26517fb10702e2a8e520d1845c49567aa4d244f426f10b206c1"
 "checksum wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)" = "981a8797cf89762e0233ec45fae731cb79a4dfaee12d9f0fe6cee01e4ac58d00"
 "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"
--- a/install.sh
+++ b/install.sh
@ -131,7 +131,7 @@ wasmer_link() {
  printf "$cyan> Adding to bash profile...$reset\n"
  WASMER_PROFILE="$(wasmer_detect_profile)"
  LOAD_STR="\n# Wasmer\nexport WASMER_DIR=\"\$HOME/.wasmer\"\n[ -s \"\$WASMER_DIR/wasmer.sh\" ] && source \"\$WASMER_DIR/wasmer.sh\"  # This loads wasmer\n"
-  SOURCE_STR="# Wasmer config\nexport WASMER_DIR=\"\$HOME/.wasmer\"\nexport WASMER_CACHE_DIR=\"\$WASMER_DIR/cache\"\nexport PATH=\"\$HOME/.wasmer/bin:\$PATH\"\n"
+  SOURCE_STR="# Wasmer config\nexport WASMER_DIR=\"\$HOME/.wasmer\"\nexport WASMER_CACHE_DIR=\"\$WASMER_DIR/cache\"\nexport PATH=\"\$HOME/.wasmer/bin:\$HOME/.wasmer/globals/wapm_packages/.bin:\$PATH\"\n"

  # We create the wasmer.sh file
  printf "$SOURCE_STR" > "$HOME/.wasmer/wasmer.sh"
--- a/lib/clif-backend/Cargo.toml
+++ b/lib/clif-backend/Cargo.toml
@ -15,7 +15,7 @@ cranelift-entity = "0.30.0"
 cranelift-wasm = "0.30.0"
 hashbrown = "0.1"
 target-lexicon = "0.3.0"
-wasmparser = "0.23.0"
+wasmparser = "0.29.2"
 byteorder = "1"
 nix = "0.13.0"
 libc = "0.2.49"
--- a/lib/emscripten/src/emscripten_target.rs
+++ b/lib/emscripten/src/emscripten_target.rs
@ -15,6 +15,15 @@ pub fn getTempRet0(ctx: &mut Ctx) -> i32 {
    get_emscripten_data(ctx).temp_ret_0
 }

+pub fn _atexit(_ctx: &mut Ctx, _func: i32) -> i32 {
+    debug!("emscripten::_atexit");
+    // TODO: implement atexit properly
+    // __ATEXIT__.unshift({
+    //     func: func,
+    //     arg: arg
+    // });
+    0
+}
 pub fn __Unwind_Backtrace(_ctx: &mut Ctx, _a: i32, _b: i32) -> i32 {
    debug!("emscripten::__Unwind_Backtrace");
    0
@ -45,14 +54,42 @@ pub fn _dladdr(_ctx: &mut Ctx, _a: i32, _b: i32) -> i32 {
    debug!("emscripten::_dladdr");
    0
 }
+pub fn _pthread_attr_init(_ctx: &mut Ctx, _a: i32) -> i32 {
+    debug!("emscripten::_pthread_attr_init");
+    0
+}
+pub fn _pthread_attr_destroy(_ctx: &mut Ctx, _a: i32) -> i32 {
+    debug!("emscripten::_pthread_attr_destroy");
+    0
+}
+pub fn _pthread_attr_getstack(
+    _ctx: &mut Ctx,
+    _stackaddr: i32,
+    _stacksize: i32,
+    _other: i32,
+) -> i32 {
+    debug!("emscripten::_pthread_attr_getstack");
+    // TODO: Translate from Emscripten
+    // HEAP32[stackaddr >> 2] = STACK_BASE;
+    // HEAP32[stacksize >> 2] = TOTAL_STACK;
+    0
+}
 pub fn _pthread_cond_destroy(_ctx: &mut Ctx, _a: i32) -> i32 {
    debug!("emscripten::_pthread_cond_destroy");
    0
 }
+pub fn _pthread_cond_timedwait(_ctx: &mut Ctx, _a: i32, _b: i32, _c: i32) -> i32 {
+    debug!("emscripten::_pthread_cond_timedwait");
+    0
+}
 pub fn _pthread_getspecific(_ctx: &mut Ctx, _a: i32) -> i32 {
    debug!("emscripten::_pthread_getspecific");
    0
 }
+pub fn _pthread_getattr_np(_ctx: &mut Ctx, _thread: i32, _attr: i32) -> i32 {
+    debug!("emscripten::_pthread_getattr_np");
+    0
+}
 pub fn _pthread_setspecific(_ctx: &mut Ctx, _a: i32, _b: i32) -> i32 {
    debug!("emscripten::_pthread_setspecific");
    0
@ -69,6 +106,10 @@ pub fn _pthread_create(_ctx: &mut Ctx, _a: i32, _b: i32, _c: i32, _d: i32) -> i3
    debug!("emscripten::_pthread_create");
    0
 }
+pub fn _pthread_detach(_ctx: &mut Ctx, _a: i32) -> i32 {
+    debug!("emscripten::_pthread_detach");
+    0
+}
 pub fn _pthread_join(_ctx: &mut Ctx, _a: i32, _b: i32) -> i32 {
    debug!("emscripten::_pthread_join");
    0
--- a/lib/emscripten/src/exception.rs
+++ b/lib/emscripten/src/exception.rs
@ -28,3 +28,9 @@ pub fn ___cxa_uncaught_exception(_ctx: &mut Ctx) -> i32 {
    debug!("emscripten::___cxa_uncaught_exception");
    -1
 }
+
+pub fn ___cxa_pure_virtual(_ctx: &mut Ctx) {
+    debug!("emscripten::___cxa_pure_virtual");
+    // ABORT = true
+    panic!("Pure virtual function called!");
+}
--- a/lib/emscripten/src/lib.rs
+++ b/lib/emscripten/src/lib.rs
@ -619,6 +619,7 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
        "_llvm_eh_typeid_for" => func!(crate::process::_llvm_eh_typeid_for),
        "_raise" => func!(crate::process::_raise),
        "_sem_init" => func!(crate::process::_sem_init),
+        "_sem_destroy" => func!(crate::process::_sem_destroy),
        "_sem_post" => func!(crate::process::_sem_post),
        "_sem_wait" => func!(crate::process::_sem_wait),
        "_getgrent" => func!(crate::process::_getgrent),
@ -646,6 +647,9 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
        "_emscripten_get_heap_size" => func!(crate::memory::_emscripten_get_heap_size),
        "_emscripten_resize_heap" => func!(crate::memory::_emscripten_resize_heap),
        "enlargeMemory" => func!(crate::memory::enlarge_memory),
+        "segfault" => func!(crate::memory::segfault),
+        "alignfault" => func!(crate::memory::alignfault),
+        "ftfault" => func!(crate::memory::ftfault),
        "getTotalMemory" => func!(crate::memory::get_total_memory),
        "___map_file" => func!(crate::memory::___map_file),

@ -655,6 +659,7 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
        "___cxa_begin_catch" => func!(crate::exception::___cxa_begin_catch),
        "___cxa_end_catch" => func!(crate::exception::___cxa_end_catch),
        "___cxa_uncaught_exception" => func!(crate::exception::___cxa_uncaught_exception),
+        "___cxa_pure_virtual" => func!(crate::exception::___cxa_pure_virtual),

        // Time
        "_gettimeofday" => func!(crate::time::_gettimeofday),
@ -683,6 +688,7 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
        "_llvm_cos_f64" => func!(crate::math::_llvm_cos_f64),
        "_llvm_exp2_f32" => func!(crate::math::_llvm_exp2_f32),
        "_llvm_exp2_f64" => func!(crate::math::_llvm_exp2_f64),
+        "_llvm_trunc_f64" => func!(crate::math::_llvm_trunc_f64),
        "_emscripten_random" => func!(crate::math::_emscripten_random),

        // Jump
@ -701,6 +707,7 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
        "_dlsym" => func!(crate::linking::_dlsym),

        // wasm32-unknown-emscripten
+        "_atexit" => func!(crate::emscripten_target::_atexit),
        "setTempRet0" => func!(crate::emscripten_target::setTempRet0),
        "getTempRet0" => func!(crate::emscripten_target::getTempRet0),
        "invoke_i" => func!(crate::emscripten_target::invoke_i),
@ -723,10 +730,15 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
        "___resumeException" => func!(crate::emscripten_target::___resumeException),
        "_dladdr" => func!(crate::emscripten_target::_dladdr),
        "_pthread_create" => func!(crate::emscripten_target::_pthread_create),
+        "_pthread_detach" => func!(crate::emscripten_target::_pthread_detach),
        "_pthread_join" => func!(crate::emscripten_target::_pthread_join),
-        "_pthread_cond_destroy" => func!(crate::emscripten_target::_pthread_cond_destroy),
+        "_pthread_attr_init" => func!(crate::emscripten_target::_pthread_attr_init),
+        "_pthread_attr_destroy" => func!(crate::emscripten_target::_pthread_attr_destroy),
+        "_pthread_attr_getstack" => func!(crate::emscripten_target::_pthread_attr_getstack),
        "_pthread_cond_init" => func!(crate::emscripten_target::_pthread_cond_init),
+        "_pthread_cond_destroy" => func!(crate::emscripten_target::_pthread_cond_destroy),
        "_pthread_cond_signal" => func!(crate::emscripten_target::_pthread_cond_signal),
+        "_pthread_cond_timedwait" => func!(crate::emscripten_target::_pthread_cond_timedwait),
        "_pthread_cond_wait" => func!(crate::emscripten_target::_pthread_cond_wait),
        "_pthread_condattr_destroy" => func!(crate::emscripten_target::_pthread_condattr_destroy),
        "_pthread_condattr_init" => func!(crate::emscripten_target::_pthread_condattr_init),
@ -740,6 +752,7 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
        "_pthread_rwlock_unlock" => func!(crate::emscripten_target::_pthread_rwlock_unlock),
        "_pthread_setcancelstate" => func!(crate::emscripten_target::_pthread_setcancelstate),
        "_pthread_getspecific" => func!(crate::emscripten_target::_pthread_getspecific),
+        "_pthread_getattr_np" => func!(crate::emscripten_target::_pthread_getattr_np),
        "_pthread_setspecific" => func!(crate::emscripten_target::_pthread_setspecific),
        "_pthread_once" => func!(crate::emscripten_target::_pthread_once),
        "_pthread_key_create" => func!(crate::emscripten_target::_pthread_key_create),
--- a/lib/emscripten/src/math.rs
+++ b/lib/emscripten/src/math.rs
@ -44,6 +44,11 @@ pub fn _llvm_exp2_f64(_ctx: &mut Ctx, value: f64) -> f64 {
    2f64.powf(value)
 }

+pub fn _llvm_trunc_f64(_ctx: &mut Ctx, value: f64) -> f64 {
+    debug!("emscripten::_llvm_trunc_f64");
+    value.trunc()
+}
+
 pub fn _emscripten_random(_ctx: &mut Ctx) -> f64 {
    debug!("emscripten::_emscripten_random");
    -1.0
--- a/lib/emscripten/src/memory.rs
+++ b/lib/emscripten/src/memory.rs
@ -95,6 +95,24 @@ pub fn abort_on_cannot_grow_memory_old(ctx: &mut Ctx) -> u32 {
    0
 }

+/// emscripten: segfault
+pub fn segfault(ctx: &mut Ctx) {
+    debug!("emscripten::segfault");
+    abort_with_message(ctx, "segmentation fault");
+}
+
+/// emscripten: alignfault
+pub fn alignfault(ctx: &mut Ctx) {
+    debug!("emscripten::alignfault");
+    abort_with_message(ctx, "alignment fault");
+}
+
+/// emscripten: ftfault
+pub fn ftfault(ctx: &mut Ctx) {
+    debug!("emscripten::ftfault");
+    abort_with_message(ctx, "Function table mask error");
+}
+
 /// emscripten: ___map_file
 pub fn ___map_file(_ctx: &mut Ctx, _one: u32, _two: u32) -> c_int {
    debug!("emscripten::___map_file");
--- a/lib/emscripten/src/process.rs
+++ b/lib/emscripten/src/process.rs
@ -83,7 +83,12 @@ pub fn _raise(_ctx: &mut Ctx, _one: i32) -> i32 {

 pub fn _sem_init(_ctx: &mut Ctx, _one: i32, _two: i32, _three: i32) -> i32 {
    debug!("emscripten::_sem_init");
-    -1
+    0
+}
+
+pub fn _sem_destroy(_ctx: &mut Ctx, _one: i32) -> i32 {
+    debug!("emscripten::_sem_destroy");
+    0
 }

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

 pub fn _popen(_ctx: &mut Ctx, _one: i32, _two: i32) -> c_int {
--- a/lib/emscripten/src/time.rs
+++ b/lib/emscripten/src/time.rs
@ -345,7 +345,7 @@ pub fn _strftime(
    // pad for null?
    let bytes = result_str.chars().count();
    if bytes as u32 > maxsize {
-        return 0;
+        0
    } else {
        // write output string
        for (i, c) in result_str.chars().enumerate() {
--- a/lib/llvm-backend/Cargo.toml
+++ b/lib/llvm-backend/Cargo.toml
@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.4.0" }
 inkwell = { git = "https://github.com/wasmerio/inkwell", branch = "llvm7-0" }
-wasmparser = "0.28.0"
+wasmparser = "0.29.2"
 hashbrown = "0.1.8"
 smallvec = "0.6.8"
 goblin = "0.0.20"
--- a/lib/llvm-backend/src/code.rs
+++ b/lib/llvm-backend/src/code.rs
@ -1468,7 +1468,7 @@ fn parse_function(
                    context,
                    &function,
                    -2147483904.0,
-                    2147483648.0,
+                    2_147_483_648.0,
                    v1,
                );
                let res =
@ -1482,8 +1482,8 @@ fn parse_function(
                    intrinsics,
                    context,
                    &function,
-                    -2147483649.0,
-                    2147483648.0,
+                    -2_147_483_649.0,
+                    2_147_483_648.0,
                    v1,
                );
                let res =
@ -1503,8 +1503,8 @@ fn parse_function(
                    intrinsics,
                    context,
                    &function,
-                    -9223373136366403584.0,
-                    9223372036854775808.0,
+                    -9_223_373_136_366_403_584.0,
+                    9_223_372_036_854_775_808.0,
                    v1,
                );
                let res =
--- a/lib/runtime-abi/Cargo.toml
+++ b/lib/runtime-abi/Cargo.toml
@ -13,7 +13,7 @@ wasmer-runtime-core = { path = "../runtime-core" }
 hashbrown = "0.1"
 failure = "0.1"
 tar = "0.4"
-wasmparser = "0.23.0"
+wasmparser = "0.29.2"
 zstd = "0.4"

 [target.'cfg(unix)'.dependencies.zbox]
--- a/lib/runtime-core/src/memory/atomic.rs
+++ b/lib/runtime-core/src/memory/atomic.rs
@ -52,6 +52,7 @@ macro_rules! intcast {
 }
 intcast! { u8 i8 u16 i16 u32 i32 u64 i64 }

+#[repr(transparent)]
 pub struct Atomic<T> {
    v: UnsafeCell<Wrapping<T>>,
 }
--- a/lib/singlepass-backend/Cargo.toml
+++ b/lib/singlepass-backend/Cargo.toml
@ -9,7 +9,7 @@ edition = "2018"

 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.4.0" }
-wasmparser = "0.28.0"
+wasmparser = "0.29.2"
 dynasm = "0.3.1"
 dynasmrt = "0.3.1"
 lazy_static = "1.2.0"
--- a/lib/singlepass-backend/src/protect_unix.rs
+++ b/lib/singlepass-backend/src/protect_unix.rs
@ -11,7 +11,7 @@
 //!
 use libc::{c_int, c_void, siginfo_t};
 use nix::sys::signal::{
-    sigaction, SaFlags, SigAction, SigHandler, SigSet, Signal, SIGBUS, SIGFPE, SIGILL, SIGSEGV,
+    sigaction, SaFlags, SigAction, SigHandler, SigSet, SIGBUS, SIGFPE, SIGILL, SIGSEGV,
 };
 use std::any::Any;
 use std::cell::{Cell, UnsafeCell};
--- a/media/wizard_logo.ico
+++ b/media/wizard_logo.ico
--- a/media/wizard_logo_2.bmp
+++ b/media/wizard_logo_2.bmp
--- a/media/wizard_logo_small.bmp
+++ b/media/wizard_logo_small.bmp
--- a/src/installer/wasmer.iss
+++ b/src/installer/wasmer.iss
@ -1,6 +1,6 @@
 [Setup]
 AppName=Wasmer
-AppVersion=1.5
+AppVersion=0.4.0
 DefaultDirName={pf}\Wasmer
 DefaultGroupName=Wasmer
 Compression=lzma2
@ -9,9 +9,14 @@ OutputDir=.\
 DisableProgramGroupPage=yes
 ChangesEnvironment=yes
 OutputBaseFilename=WasmerInstaller
+WizardImageFile=..\..\media\wizard_logo_2.bmp
+WizardSmallImageFile=..\..\media\wizard_logo_small.bmp
+SetupIconFile=..\..\media\wizard_logo.ico
+DisableWelcomePage=no

 [Files]
 Source: "..\..\target\release\wasmer.exe"; DestDir: "{app}\bin"
+Source: "..\..\wapm-cli\target\release\wapm.exe"; DestDir: "{app}\bin"

 [Code]
 const EnvironmentKey = 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment';
@ -61,11 +66,17 @@ end;
 procedure CurStepChanged(CurStep: TSetupStep);
 begin
    if CurStep = ssPostInstall 
-     then EnvAddPath(ExpandConstant('{app}') +'\bin');
+     then begin 
+     EnvAddPath(ExpandConstant('{app}') +'\bin');
+     EnvAddPath(ExpandConstant('{app}') +'\globals\wapm_packages\.bin');
+     end
 end;

 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 begin
    if CurUninstallStep = usPostUninstall
-    then EnvRemovePath(ExpandConstant('{app}') +'\bin');
+    then begin 
+    EnvRemovePath(ExpandConstant('{app}') +'\bin');
+    EnvAddPath(ExpandConstant('{app}') +'\globals\wapm_packages\.bin');
+    end
 end;
--- a/src/webassembly.rs
+++ b/src/webassembly.rs
@ -1,13 +1,6 @@
 use std::panic;
 pub use wasmer_runtime::compile_with_config_with;
-use wasmer_runtime::{
-    self as runtime,
-    error::{CallResult, Result},
-    ImportObject, Instance, Module,
-};
-use wasmer_runtime_core::types::Value;
-
-use wasmer_emscripten::run_emscripten_instance;
+use wasmer_runtime::{self as runtime, error::Result, ImportObject, Instance, Module};

 pub struct ResultObject {
    /// A webassembly::Module object representing the compiled WebAssembly module.