Merge #3038

3038: Re-introduce create-exe to wasmer-cli v3.0 r=epilys a=syrusakbary ### Usage ```shell $ make && make package-capi ... $ export WASMER_DIR=`pwd`/package $ ./target/release/wasmer create-exe qjs.wasm -o qjs Compiler: cranelift Target: x86_64-unknown-linux-gnu Using path `[..]/wasmer/package/lib/libwasmer.a` as libwasmer path. ✔ Native executable compiled successfully to `qjs`. $ ./qjs QuickJS - Type "\h" for help qjs > ^C ``` Co-authored-by: Manos Pitsidianakis <[email protected]> Co-authored-by: Manos Pitsidianakis <[email protected]>
wasmerio · Jul 29, 2022 · 93f6d7b · 93f6d7b
2 parents 087803c + 11d8ea2
commit 93f6d7b
Show file tree

Hide file tree

Showing 19 changed files with 680 additions and 115 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/api/src/js/module_info_polyfill.rs b/lib/api/src/js/module_info_polyfill.rs
@@ -40,11 +40,11 @@ impl ModuleInfoPolyfill {
         field: &str,
     ) -> WasmResult<()> {
         self.info.imports.insert(
-            (
-                String::from(module),
-                String::from(field),
-                self.info.imports.len() as u32,
-            ),
+            wasmer_types::ImportKey {
+                module: String::from(module),
+                field: String::from(field),
+                import_idx: self.info.imports.len() as u32,
+            },
             import,
         );
         Ok(())

diff --git a/lib/c-api/src/wasm_c_api/wasi/mod.rs b/lib/c-api/src/wasm_c_api/wasi/mod.rs
@@ -4,7 +4,7 @@
 
 pub use super::unstable::wasi::wasi_get_unordered_imports;
 use super::{
-    externals::{wasm_extern_t, wasm_extern_vec_t, wasm_func_t},
+    externals::{wasm_extern_t, wasm_extern_vec_t, wasm_func_t, wasm_memory_t},
     instance::wasm_instance_t,
     module::wasm_module_t,
     store::{wasm_store_t, StoreRef},
@@ -197,6 +197,14 @@ pub unsafe extern "C" fn wasi_env_new(
 #[no_mangle]
 pub extern "C" fn wasi_env_delete(_state: Option<Box<wasi_env_t>>) {}
 
+/// Set the memory on a [`wasi_env_t`].
+#[no_mangle]
+pub unsafe extern "C" fn wasi_env_set_memory(env: &mut wasi_env_t, memory: &wasm_memory_t) {
+    let mut store_mut = env.store.store_mut();
+    let wasi_env = env.inner.data_mut(&mut store_mut);
+    wasi_env.set_memory(memory.extern_.memory());
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn wasi_env_read_stdout(
     env: &mut wasi_env_t,

diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml
@@ -38,6 +38,7 @@ wasmer-wast = { version = "=2.3.0", path = "../../tests/lib/wast", optional = tr
 wasmer-cache = { version = "=2.3.0", path = "../cache", optional = true }
 wasmer-types = { version = "=2.3.0", path = "../types" }
 wasmer-vfs  = { version = "=2.3.0", path = "../vfs", default-features = false, features = ["host-fs"] }
+wasmer-object = { version = "=2.3.0", path = "../object" }
 atty = "0.2"
 colored = "2.0"
 anyhow = "1.0"

diff --git a/lib/cli/src/cli.rs b/lib/cli/src/cli.rs
@@ -4,6 +4,8 @@
 use crate::commands::Binfmt;
 #[cfg(feature = "compiler")]
 use crate::commands::Compile;
+#[cfg(feature = "compiler")]
+use crate::commands::CreateExe;
 #[cfg(feature = "wast")]
 use crate::commands::Wast;
 use crate::commands::{Cache, Config, Inspect, Run, SelfUpdate, Validate};
@@ -44,6 +46,11 @@ enum WasmerCLIOptions {
     #[structopt(name = "compile")]
     Compile(Compile),
 
+    /// Compile a WebAssembly binary into a native executable
+    #[cfg(feature = "compiler")]
+    #[structopt(name = "create-exe")]
+    CreateExe(CreateExe),
+
     /// Get various configuration information needed
     /// to compile programs which use Wasmer
     #[structopt(name = "config")]
@@ -77,6 +84,8 @@ impl WasmerCLIOptions {
             Self::Validate(validate) => validate.execute(),
             #[cfg(feature = "compiler")]
             Self::Compile(compile) => compile.execute(),
+            #[cfg(feature = "compiler")]
+            Self::CreateExe(create_exe) => create_exe.execute(),
             Self::Config(config) => config.execute(),
             Self::Inspect(inspect) => inspect.execute(),
             #[cfg(feature = "wast")]

diff --git a/lib/cli/src/commands.rs b/lib/cli/src/commands.rs
@@ -5,6 +5,8 @@ mod cache;
 #[cfg(feature = "compiler")]
 mod compile;
 mod config;
+#[cfg(feature = "compiler")]
+mod create_exe;
 mod inspect;
 mod run;
 mod self_update;
@@ -16,6 +18,8 @@ mod wast;
 pub use binfmt::*;
 #[cfg(feature = "compiler")]
 pub use compile::*;
+#[cfg(feature = "compiler")]
+pub use create_exe::*;
 #[cfg(feature = "wast")]
 pub use wast::*;
 pub use {cache::*, config::*, inspect::*, run::*, self_update::*, validate::*};