Experimental: Add interpreter support for Wasmer #4515
+3,823
−278
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
syrusakbary
commented
Mar 25, 2024
Comment on lines
+151
to
+154
| #[cfg_attr( | ||
| feature = "wasm-c-api", | ||
| ignore = "wasm-c-api has a different memory testuite" | ||
| )] |
There was a problem hiding this comment.
We can probably remove this, since we are skipping the failing tests
syrusakbary
commented
Mar 26, 2024
| @@ -128,6 +124,7 @@ default = ["wat", "wast", "cache", "wasi", "engine", "emscripten", "middlewares" | |||
| # That means: that is able to execute modules | |||
| backend = [] | |||
| jsc = ["wasmer/jsc", "backend", "wat", "wasmer/std"] | |||
| wasm-c-api = ["wasmer/wasm-c-api", "backend", "wat", "wasmer/std"] | |||
There was a problem hiding this comment.
We should add a new one: wamr = ["wasm-c-api"]
feat(api): Update WAMR
syrusakbary
commented
May 29, 2024
| @@ -98,7 +98,7 @@ fn main() -> anyhow::Result<()> { | |||
| Ok(()) | |||
| } | |||
| Err(e) => { | |||
| bail!("Unknown error `{}` found. expected `ErrorCode`", e); | |||
| bail!("Unknown error `{}` found. expected `ExitCode`", e); | |||
lib/api/Cargo.toml
Outdated
Comment on lines
98
to
100
| default = ["sys-default"] | ||
| # default = ["js-default"] | ||
| # default = ["sys-default"] | ||
| default = ["wasm-c-api"] |
There was a problem hiding this comment.
We should keep the defaults once everything is passing
| @@ -0,0 +1,50 @@ | |||
| fn main() { | |||
| #[cfg(feature = "wasm-c-api")] | |||
There was a problem hiding this comment.
We shoudl do here wamr feature instead of wasm-c-api
lib/api/build.rs
Outdated
Comment on lines
39
to
48
| let bindings = bindgen::Builder::default() | ||
| .header("wasm.h") | ||
| // This is needed if use `#include <nng.h>` instead of `#include "path/nng.h"` | ||
| //.clang_arg("-Inng/src/") | ||
| .generate() | ||
| .expect("Unable to generate bindings"); | ||
| let out_path = PathBuf::from(env::var("OUT_DIR").unwrap()); | ||
| bindings | ||
| .write_to_file(out_path.join("bindings.rs")) | ||
| .expect("Couldn't write bindings"); |
There was a problem hiding this comment.
This should be in the wasm-c-api feature (not wamr)
Comment on lines
+16
to
+19
| unimplemented!() | ||
| // let error = Trap::user(error); | ||
| // let js_error: JsValue = error.into(); | ||
| // wasm_bindgen::throw_val(js_error) |
There was a problem hiding this comment.
We can probably do the same implementation as jsc
| impl PrettyError { | ||
| /// Process a `Result` printing any errors and exiting | ||
| /// the process after | ||
| pub fn report<T>(result: Result<T, Error>) -> ! { | ||
| use wasmer::RuntimeError; |
There was a problem hiding this comment.
Can we move the import up, and do it with a cfg decorator instead?
… back when instantiating a module
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support for running Wasm modules in interpreted mode (in this case, via WAMR).
Progress: