From 5d5fa45e3b0e5763ddc9d0d1c7e497442f9b28ed Mon Sep 17 00:00:00 2001 From: Edoardo Marangoni Date: Wed, 16 Oct 2024 13:54:41 +0200 Subject: [PATCH 1/6] feat(api/build/v8): Use blob to build v8 --- Cargo.lock | 58 ++- lib/api/Cargo.toml | 2 + lib/api/build.rs | 70 +--- lib/api/third_party/v8/wasm.h | 664 ++++++++++++++++++++++++++++++++++ 4 files changed, 738 insertions(+), 56 deletions(-) create mode 100644 lib/api/third_party/v8/wasm.h diff --git a/Cargo.lock b/Cargo.lock index f4a33d79c1a..b3bf0aa787b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aes" version = "0.8.4" @@ -325,7 +331,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object 0.36.3", "rustc-demangle", ] @@ -1904,12 +1910,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.31" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -3141,6 +3147,17 @@ dependencies = [ "crc 3.2.1", ] +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "mac_address" version = "1.1.7" @@ -3315,6 +3332,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.6.23" @@ -5340,9 +5366,9 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -6952,6 +6978,7 @@ dependencies = [ "serde", "serde-wasm-bindgen", "shared-buffer", + "tar", "target-lexicon 0.12.16", "tempfile", "thiserror", @@ -6970,6 +6997,7 @@ dependencies = [ "wasmparser 0.216.0", "wat", "windows-sys 0.59.0", + "xz", "zip", ] @@ -8372,6 +8400,24 @@ version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" +[[package]] +name = "xz" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c887690ff2a2e233e8e49633461521f98ec57fbff9d59a884c9a4f04ec1da34" +dependencies = [ + "xz2", +] + +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + [[package]] name = "yaml-rust" version = "0.4.5" diff --git a/lib/api/Cargo.toml b/lib/api/Cargo.toml index bc837ab74bd..7d5f2ce2b79 100644 --- a/lib/api/Cargo.toml +++ b/lib/api/Cargo.toml @@ -150,7 +150,9 @@ static-artifact-create = ["wasmer-compiler/static-artifact-create"] [build-dependencies] bindgen = "0.70.1" cmake = "0.1.50" +tar = "0.4.42" ureq = "2.10.1" +xz = "0.1.0" zip = "2.2.0" [package.metadata.docs.rs] diff --git a/lib/api/build.rs b/lib/api/build.rs index 2307becc746..d8cf7cab0e0 100644 --- a/lib/api/build.rs +++ b/lib/api/build.rs @@ -148,58 +148,33 @@ fn main() { #[cfg(feature = "v8")] { - use cmake::Config; use std::{env, path::PathBuf}; + let url = match (env::var("CARGO_CFG_TARGET_OS").unwrap().as_str(), env::var("CARGO_CFG_TARGET_ARCH").unwrap().as_str()) { + ("macos", "aarch64") => "https://github.com/xdoardo/wee8-custom-builds/releases/download/11.6/wee8-darwin-aarch64.tar.xz", + ("macos", "x86_64") => "https://github.com/xdoardo/wee8-custom-builds/releases/download/11.6/wee8-darwin-amd64.tar.xz", + ("linux", "x86_64") => "https://github.com/xdoardo/wee8-custom-builds/releases/download/11.6/wee8-linux-amd64.tar.xz", + ("windows", "x86_64") =>"https://github.com/xdoardo/wee8-custom-builds/releases/download/11.6/wee8-windows-amd64.tar.xz", + (os, arch) => panic!("target os + arch combination not supported: {os}, {arch}") + }; + let crate_root = env::var("CARGO_MANIFEST_DIR").unwrap(); - let v8_cmake_dir = PathBuf::from(&crate_root) - .join("third_party") - .join("v8-cmake"); - - let mut fetch_submodules = std::process::Command::new("git"); - fetch_submodules - .current_dir(crate_root) - .arg("submodule") - .arg("update") - .arg("--init") - .arg("--recursive"); - - let res = fetch_submodules.output(); - - if let Err(e) = res { - panic!("fetching submodules failed: {e}"); - } + let v8_dir = PathBuf::from(&crate_root).join("third_party").join("v8"); + let out_dir = env::var("OUT_DIR").unwrap(); - let mut dst = Config::new(v8_cmake_dir.clone()); + let tar = ureq::get(url).call().expect("failed to download v8"); - dst.always_configure(true) - .generator("Ninja") - .define( - "CMAKE_BUILD_TYPE", - if cfg!(debug_assertions) { - "RelWithDebInfo" - } else { - "Release" - }, - ) - .build_target("wee8"); + let mut tar_data = Vec::new(); + tar.into_reader() + .read_to_end(&mut tar_data) + .expect("failed to download v8 lib"); - if cfg!(target_os = "windows") { - dst.define("CMAKE_CXX_COMPILER", "cl.exe"); - dst.define("CMAKE_C_COMPILER", "cl.exe"); - dst.define("CMAKE_LINKER_TYPE", "MSVC"); - dst.define("WAMR_BUILD_PLATFORM", "windows"); - } + let tar = xz::read::XzDecoder::new(tar_data.as_slice()); + let mut archive = tar::Archive::new(tar); + archive.unpack(out_dir.clone()).unwrap(); - let dst = dst.build(); + println!("cargo:rustc-link-search=native={}", out_dir); - // Check output of `cargo build --verbose`, should see something like: - // -L native=/path/runng/target/debug/build/runng-sys-abc1234/out - // That contains output from cmake - println!( - "cargo:rustc-link-search=native={}", - dst.join("build").display() - ); println!("cargo:rustc-link-lib=wee8"); println!("cargo:rustc-link-lib=v8_initializers"); println!("cargo:rustc-link-lib=v8_libbase"); @@ -219,12 +194,7 @@ fn main() { } let bindings = bindgen::Builder::default() - .header( - v8_cmake_dir - .join("v8/third_party/wasm-api/wasm.h") - .to_str() - .unwrap(), - ) + .header(v8_dir.join("wasm.h").to_str().unwrap()) .derive_default(true) .derive_debug(true) .generate() diff --git a/lib/api/third_party/v8/wasm.h b/lib/api/third_party/v8/wasm.h new file mode 100644 index 00000000000..971d413bc78 --- /dev/null +++ b/lib/api/third_party/v8/wasm.h @@ -0,0 +1,664 @@ +// WebAssembly C API + +#ifndef __WASM_H +#define __WASM_H + +#include +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/////////////////////////////////////////////////////////////////////////////// +// Auxiliaries + +// Machine types + +inline void assertions() { + static_assert(sizeof(float) == sizeof(uint32_t), "incompatible float type"); + static_assert(sizeof(double) == sizeof(uint64_t), "incompatible double type"); + static_assert(sizeof(intptr_t) == sizeof(uint32_t) || + sizeof(intptr_t) == sizeof(uint64_t), + "incompatible pointer type"); +} + +typedef char byte_t; +typedef float float32_t; +typedef double float64_t; + +// Ownership + +#define own + +// The qualifier `own` is used to indicate ownership of data in this API. +// It is intended to be interpreted similar to a `const` qualifier: +// +// - `own wasm_xxx_t*` owns the pointed-to data +// - `own wasm_xxx_t` distributes to all fields of a struct or union `xxx` +// - `own wasm_xxx_vec_t` owns the vector as well as its elements(!) +// - an `own` function parameter passes ownership from caller to callee +// - an `own` function result passes ownership from callee to caller +// - an exception are `own` pointer parameters named `out`, which are copy-back +// output parameters passing back ownership from callee to caller +// +// Own data is created by `wasm_xxx_new` functions and some others. +// It must be released with the corresponding `wasm_xxx_delete` function. +// +// Deleting a reference does not necessarily delete the underlying object, +// it merely indicates that this owner no longer uses it. +// +// For vectors, `const wasm_xxx_vec_t` is used informally to indicate that +// neither the vector nor its elements should be modified. +// TODO: introduce proper `wasm_xxx_const_vec_t`? + +#define WASM_DECLARE_OWN(name) \ + typedef struct wasm_##name##_t wasm_##name##_t; \ + \ + void wasm_##name##_delete(own wasm_##name##_t *); + +// Vectors + +#define WASM_DECLARE_VEC(name, ptr_or_none) \ + typedef struct wasm_##name##_vec_t { \ + size_t size; \ + wasm_##name##_t ptr_or_none *data; \ + } wasm_##name##_vec_t; \ + \ + void wasm_##name##_vec_new_empty(own wasm_##name##_vec_t *out); \ + void wasm_##name##_vec_new_uninitialized(own wasm_##name##_vec_t *out, \ + size_t); \ + void wasm_##name##_vec_new(own wasm_##name##_vec_t *out, size_t, \ + own wasm_##name##_t ptr_or_none const[]); \ + void wasm_##name##_vec_copy(own wasm_##name##_vec_t *out, \ + wasm_##name##_vec_t *); \ + void wasm_##name##_vec_delete(own wasm_##name##_vec_t *); + +// Byte vectors + +typedef byte_t wasm_byte_t; +WASM_DECLARE_VEC(byte, ) + +typedef wasm_byte_vec_t wasm_name_t; + +#define wasm_name wasm_byte_vec +#define wasm_name_new wasm_byte_vec_new +#define wasm_name_new_empty wasm_byte_vec_new_empty +#define wasm_name_new_new_uninitialized wasm_byte_vec_new_uninitialized +#define wasm_name_copy wasm_byte_vec_copy +#define wasm_name_delete wasm_byte_vec_delete + +static inline void wasm_name_new_from_string(own wasm_name_t *out, + const char *s) { + wasm_name_new(out, strlen(s) + 1, s); +} + +/////////////////////////////////////////////////////////////////////////////// +// Runtime Environment + +// Configuration + +WASM_DECLARE_OWN(config) + +own wasm_config_t *wasm_config_new(); + +// Embedders may provide custom functions for manipulating configs. + +// Engine + +WASM_DECLARE_OWN(engine) + +own wasm_engine_t *wasm_engine_new(); +own wasm_engine_t *wasm_engine_new_with_config(own wasm_config_t *); + +// Store + +WASM_DECLARE_OWN(store) + +own wasm_store_t *wasm_store_new(wasm_engine_t *); + +/////////////////////////////////////////////////////////////////////////////// +// Type Representations + +// Type attributes + +typedef uint8_t wasm_mutability_t; +enum wasm_mutability_enum { + WASM_CONST, + WASM_VAR, +}; + +typedef struct wasm_limits_t { + uint32_t min; + uint32_t max; +} wasm_limits_t; + +static const uint32_t wasm_limits_max_default = 0xffffffff; + +// Generic + +#define WASM_DECLARE_TYPE(name) \ + WASM_DECLARE_OWN(name) \ + WASM_DECLARE_VEC(name, *) \ + \ + own wasm_##name##_t *wasm_##name##_copy(wasm_##name##_t *); + +// Value Types + +WASM_DECLARE_TYPE(valtype) + +typedef uint8_t wasm_valkind_t; +enum wasm_valkind_enum { + WASM_I32, + WASM_I64, + WASM_F32, + WASM_F64, + WASM_ANYREF = 128, + WASM_FUNCREF, +}; + +own wasm_valtype_t *wasm_valtype_new(wasm_valkind_t); + +wasm_valkind_t wasm_valtype_kind(const wasm_valtype_t *); + +static inline bool wasm_valkind_is_num(wasm_valkind_t k) { + return k < WASM_ANYREF; +} +static inline bool wasm_valkind_is_ref(wasm_valkind_t k) { + return k >= WASM_ANYREF; +} + +static inline bool wasm_valtype_is_num(const wasm_valtype_t *t) { + return wasm_valkind_is_num(wasm_valtype_kind(t)); +} +static inline bool wasm_valtype_is_ref(const wasm_valtype_t *t) { + return wasm_valkind_is_ref(wasm_valtype_kind(t)); +} + +// Function Types + +WASM_DECLARE_TYPE(functype) + +own wasm_functype_t *wasm_functype_new(own wasm_valtype_vec_t *params, + own wasm_valtype_vec_t *results); + +const wasm_valtype_vec_t *wasm_functype_params(const wasm_functype_t *); +const wasm_valtype_vec_t *wasm_functype_results(const wasm_functype_t *); + +// Global Types + +WASM_DECLARE_TYPE(globaltype) + +own wasm_globaltype_t *wasm_globaltype_new(own wasm_valtype_t *, + wasm_mutability_t); + +const wasm_valtype_t *wasm_globaltype_content(const wasm_globaltype_t *); +wasm_mutability_t wasm_globaltype_mutability(const wasm_globaltype_t *); + +// Table Types + +WASM_DECLARE_TYPE(tabletype) + +own wasm_tabletype_t *wasm_tabletype_new(own wasm_valtype_t *, + const wasm_limits_t *); + +const wasm_valtype_t *wasm_tabletype_element(const wasm_tabletype_t *); +const wasm_limits_t *wasm_tabletype_limits(const wasm_tabletype_t *); + +// Memory Types + +WASM_DECLARE_TYPE(memorytype) + +own wasm_memorytype_t *wasm_memorytype_new(const wasm_limits_t *); + +const wasm_limits_t *wasm_memorytype_limits(const wasm_memorytype_t *); + +// Extern Types + +WASM_DECLARE_TYPE(externtype) + +typedef uint8_t wasm_externkind_t; +enum wasm_externkind_enum { + WASM_EXTERN_FUNC, + WASM_EXTERN_GLOBAL, + WASM_EXTERN_TABLE, + WASM_EXTERN_MEMORY, +}; + +wasm_externkind_t wasm_externtype_kind(const wasm_externtype_t *); + +wasm_externtype_t *wasm_functype_as_externtype(wasm_functype_t *); +wasm_externtype_t *wasm_globaltype_as_externtype(wasm_globaltype_t *); +wasm_externtype_t *wasm_tabletype_as_externtype(wasm_tabletype_t *); +wasm_externtype_t *wasm_memorytype_as_externtype(wasm_memorytype_t *); + +wasm_functype_t *wasm_externtype_as_functype(wasm_externtype_t *); +wasm_globaltype_t *wasm_externtype_as_globaltype(wasm_externtype_t *); +wasm_tabletype_t *wasm_externtype_as_tabletype(wasm_externtype_t *); +wasm_memorytype_t *wasm_externtype_as_memorytype(wasm_externtype_t *); + +const wasm_externtype_t * +wasm_functype_as_externtype_const(const wasm_functype_t *); +const wasm_externtype_t * +wasm_globaltype_as_externtype_const(const wasm_globaltype_t *); +const wasm_externtype_t * +wasm_tabletype_as_externtype_const(const wasm_tabletype_t *); +const wasm_externtype_t * +wasm_memorytype_as_externtype_const(const wasm_memorytype_t *); + +const wasm_functype_t * +wasm_externtype_as_functype_const(const wasm_externtype_t *); +const wasm_globaltype_t * +wasm_externtype_as_globaltype_const(const wasm_externtype_t *); +const wasm_tabletype_t * +wasm_externtype_as_tabletype_const(const wasm_externtype_t *); +const wasm_memorytype_t * +wasm_externtype_as_memorytype_const(const wasm_externtype_t *); + +// Import Types + +WASM_DECLARE_TYPE(importtype) + +own wasm_importtype_t *wasm_importtype_new(own wasm_name_t *module, + own wasm_name_t *name, + own wasm_externtype_t *); + +const wasm_name_t *wasm_importtype_module(const wasm_importtype_t *); +const wasm_name_t *wasm_importtype_name(const wasm_importtype_t *); +const wasm_externtype_t *wasm_importtype_type(const wasm_importtype_t *); + +// Export Types + +WASM_DECLARE_TYPE(exporttype) + +own wasm_exporttype_t *wasm_exporttype_new(own wasm_name_t *, + own wasm_externtype_t *); + +const wasm_name_t *wasm_exporttype_name(const wasm_exporttype_t *); +const wasm_externtype_t *wasm_exporttype_type(const wasm_exporttype_t *); + +/////////////////////////////////////////////////////////////////////////////// +// Runtime Objects + +// Values + +struct wasm_ref_t; + +typedef struct wasm_val_t { + wasm_valkind_t kind; + union { + int32_t i32; + int64_t i64; + float32_t f32; + float64_t f64; + struct wasm_ref_t *ref; + } of; +} wasm_val_t; + +void wasm_val_delete(own wasm_val_t *v); +void wasm_val_copy(own wasm_val_t *out, const wasm_val_t *); + +WASM_DECLARE_VEC(val, ) + +// References + +#define WASM_DECLARE_REF_BASE(name) \ + WASM_DECLARE_OWN(name) \ + \ + own wasm_##name##_t *wasm_##name##_copy(const wasm_##name##_t *); \ + bool wasm_##name##_same(const wasm_##name##_t *, const wasm_##name##_t *); \ + \ + void *wasm_##name##_get_host_info(const wasm_##name##_t *); \ + void wasm_##name##_set_host_info(wasm_##name##_t *, void *); \ + void wasm_##name##_set_host_info_with_finalizer(wasm_##name##_t *, void *, \ + void (*)(void *)); + +#define WASM_DECLARE_REF(name) \ + WASM_DECLARE_REF_BASE(name) \ + \ + wasm_ref_t *wasm_##name##_as_ref(wasm_##name##_t *); \ + wasm_##name##_t *wasm_ref_as_##name(wasm_ref_t *); \ + const wasm_ref_t *wasm_##name##_as_ref_const(const wasm_##name##_t *); \ + const wasm_##name##_t *wasm_ref_as_##name##_const(const wasm_ref_t *); + +#define WASM_DECLARE_SHARABLE_REF(name) \ + WASM_DECLARE_REF(name) \ + WASM_DECLARE_OWN(shared_##name) \ + \ + own wasm_shared_##name##_t *wasm_##name##_share(const wasm_##name##_t *); \ + own wasm_##name##_t *wasm_##name##_obtain(wasm_store_t *, \ + const wasm_shared_##name##_t *); + +WASM_DECLARE_REF_BASE(ref) + +// Frames + +WASM_DECLARE_OWN(frame) +WASM_DECLARE_VEC(frame, *) +own wasm_frame_t *wasm_frame_copy(const wasm_frame_t *); + +struct wasm_instance_t *wasm_frame_instance(const wasm_frame_t *); +uint32_t wasm_frame_func_index(const wasm_frame_t *); +size_t wasm_frame_func_offset(const wasm_frame_t *); +size_t wasm_frame_module_offset(const wasm_frame_t *); + +// Traps + +typedef wasm_name_t wasm_message_t; // null terminated + +WASM_DECLARE_REF(trap) + +own wasm_trap_t *wasm_trap_new(wasm_store_t *store, const wasm_message_t *); + +void wasm_trap_message(const wasm_trap_t *, own wasm_message_t *out); +own wasm_frame_t *wasm_trap_origin(const wasm_trap_t *); +void wasm_trap_trace(const wasm_trap_t *, own wasm_frame_vec_t *out); + +// Foreign Objects + +WASM_DECLARE_REF(foreign) + +own wasm_foreign_t *wasm_foreign_new(wasm_store_t *); + +// Modules + +WASM_DECLARE_SHARABLE_REF(module) + +own wasm_module_t *wasm_module_new(wasm_store_t *, + const wasm_byte_vec_t *binary); + +bool wasm_module_validate(wasm_store_t *, const wasm_byte_vec_t *binary); + +void wasm_module_imports(const wasm_module_t *, own wasm_importtype_vec_t *out); +void wasm_module_exports(const wasm_module_t *, own wasm_exporttype_vec_t *out); + +void wasm_module_serialize(const wasm_module_t *, own wasm_byte_vec_t *out); +own wasm_module_t *wasm_module_deserialize(wasm_store_t *, + const wasm_byte_vec_t *); + +// Function Instances + +WASM_DECLARE_REF(func) + +typedef own wasm_trap_t *(*wasm_func_callback_t)(const wasm_val_t args[], + wasm_val_t results[]); +typedef own wasm_trap_t *(*wasm_func_callback_with_env_t)( + void *env, const wasm_val_t args[], wasm_val_t results[]); + +own wasm_func_t *wasm_func_new(wasm_store_t *, const wasm_functype_t *, + wasm_func_callback_t); +own wasm_func_t *wasm_func_new_with_env(wasm_store_t *, + const wasm_functype_t *type, + wasm_func_callback_with_env_t, + void *env, void (*finalizer)(void *)); + +own wasm_functype_t *wasm_func_type(const wasm_func_t *); +size_t wasm_func_param_arity(const wasm_func_t *); +size_t wasm_func_result_arity(const wasm_func_t *); + +own wasm_trap_t *wasm_func_call(const wasm_func_t *, const wasm_val_t args[], + wasm_val_t results[]); + +// Global Instances + +WASM_DECLARE_REF(global) + +own wasm_global_t *wasm_global_new(wasm_store_t *, const wasm_globaltype_t *, + const wasm_val_t *); + +own wasm_globaltype_t *wasm_global_type(const wasm_global_t *); + +void wasm_global_get(const wasm_global_t *, own wasm_val_t *out); +void wasm_global_set(wasm_global_t *, const wasm_val_t *); + +// Table Instances + +WASM_DECLARE_REF(table) + +typedef uint32_t wasm_table_size_t; + +own wasm_table_t *wasm_table_new(wasm_store_t *, const wasm_tabletype_t *, + wasm_ref_t *init); + +own wasm_tabletype_t *wasm_table_type(const wasm_table_t *); + +own wasm_ref_t *wasm_table_get(const wasm_table_t *, wasm_table_size_t index); +bool wasm_table_set(wasm_table_t *, wasm_table_size_t index, wasm_ref_t *); + +wasm_table_size_t wasm_table_size(const wasm_table_t *); +bool wasm_table_grow(wasm_table_t *, wasm_table_size_t delta, wasm_ref_t *init); + +// Memory Instances + +WASM_DECLARE_REF(memory) + +typedef uint32_t wasm_memory_pages_t; + +static const size_t MEMORY_PAGE_SIZE = 0x10000; + +own wasm_memory_t *wasm_memory_new(wasm_store_t *, const wasm_memorytype_t *); + +own wasm_memorytype_t *wasm_memory_type(const wasm_memory_t *); + +byte_t *wasm_memory_data(wasm_memory_t *); +size_t wasm_memory_data_size(const wasm_memory_t *); + +wasm_memory_pages_t wasm_memory_size(const wasm_memory_t *); +bool wasm_memory_grow(wasm_memory_t *, wasm_memory_pages_t delta); + +// Externals + +WASM_DECLARE_REF(extern) +WASM_DECLARE_VEC(extern, *) + +wasm_externkind_t wasm_extern_kind(const wasm_extern_t *); +own wasm_externtype_t *wasm_extern_type(const wasm_extern_t *); + +wasm_extern_t *wasm_func_as_extern(wasm_func_t *); +wasm_extern_t *wasm_global_as_extern(wasm_global_t *); +wasm_extern_t *wasm_table_as_extern(wasm_table_t *); +wasm_extern_t *wasm_memory_as_extern(wasm_memory_t *); + +wasm_func_t *wasm_extern_as_func(wasm_extern_t *); +wasm_global_t *wasm_extern_as_global(wasm_extern_t *); +wasm_table_t *wasm_extern_as_table(wasm_extern_t *); +wasm_memory_t *wasm_extern_as_memory(wasm_extern_t *); + +const wasm_extern_t *wasm_func_as_extern_const(const wasm_func_t *); +const wasm_extern_t *wasm_global_as_extern_const(const wasm_global_t *); +const wasm_extern_t *wasm_table_as_extern_const(const wasm_table_t *); +const wasm_extern_t *wasm_memory_as_extern_const(const wasm_memory_t *); + +const wasm_func_t *wasm_extern_as_func_const(const wasm_extern_t *); +const wasm_global_t *wasm_extern_as_global_const(const wasm_extern_t *); +const wasm_table_t *wasm_extern_as_table_const(const wasm_extern_t *); +const wasm_memory_t *wasm_extern_as_memory_const(const wasm_extern_t *); + +// Module Instances + +WASM_DECLARE_REF(instance) + +own wasm_instance_t *wasm_instance_new(wasm_store_t *, const wasm_module_t *, + const wasm_extern_t *const imports[], + own wasm_trap_t **); + +void wasm_instance_exports(const wasm_instance_t *, own wasm_extern_vec_t *out); + +/////////////////////////////////////////////////////////////////////////////// +// Convenience + +// Value Type construction short-hands + +static inline own wasm_valtype_t *wasm_valtype_new_i32() { + return wasm_valtype_new(WASM_I32); +} +static inline own wasm_valtype_t *wasm_valtype_new_i64() { + return wasm_valtype_new(WASM_I64); +} +static inline own wasm_valtype_t *wasm_valtype_new_f32() { + return wasm_valtype_new(WASM_F32); +} +static inline own wasm_valtype_t *wasm_valtype_new_f64() { + return wasm_valtype_new(WASM_F64); +} + +static inline own wasm_valtype_t *wasm_valtype_new_anyref() { + return wasm_valtype_new(WASM_ANYREF); +} +static inline own wasm_valtype_t *wasm_valtype_new_funcref() { + return wasm_valtype_new(WASM_FUNCREF); +} + +// Function Types construction short-hands + +static inline own wasm_functype_t *wasm_functype_new_0_0() { + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new_empty(¶ms); + wasm_valtype_vec_new_empty(&results); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_1_0(own wasm_valtype_t *p) { + wasm_valtype_t *ps[1] = {p}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new(¶ms, 1, ps); + wasm_valtype_vec_new_empty(&results); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_2_0(own wasm_valtype_t *p1, own wasm_valtype_t *p2) { + wasm_valtype_t *ps[2] = {p1, p2}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new(¶ms, 2, ps); + wasm_valtype_vec_new_empty(&results); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_3_0(own wasm_valtype_t *p1, own wasm_valtype_t *p2, + own wasm_valtype_t *p3) { + wasm_valtype_t *ps[3] = {p1, p2, p3}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new(¶ms, 3, ps); + wasm_valtype_vec_new_empty(&results); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_0_1(own wasm_valtype_t *r) { + wasm_valtype_t *rs[1] = {r}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new_empty(¶ms); + wasm_valtype_vec_new(&results, 1, rs); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_1_1(own wasm_valtype_t *p, own wasm_valtype_t *r) { + wasm_valtype_t *ps[1] = {p}; + wasm_valtype_t *rs[1] = {r}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new(¶ms, 1, ps); + wasm_valtype_vec_new(&results, 1, rs); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_2_1(own wasm_valtype_t *p1, own wasm_valtype_t *p2, + own wasm_valtype_t *r) { + wasm_valtype_t *ps[2] = {p1, p2}; + wasm_valtype_t *rs[1] = {r}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new(¶ms, 2, ps); + wasm_valtype_vec_new(&results, 1, rs); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_3_1(own wasm_valtype_t *p1, own wasm_valtype_t *p2, + own wasm_valtype_t *p3, own wasm_valtype_t *r) { + wasm_valtype_t *ps[3] = {p1, p2, p3}; + wasm_valtype_t *rs[1] = {r}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new(¶ms, 3, ps); + wasm_valtype_vec_new(&results, 1, rs); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_0_2(own wasm_valtype_t *r1, own wasm_valtype_t *r2) { + wasm_valtype_t *rs[2] = {r1, r2}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new_empty(¶ms); + wasm_valtype_vec_new(&results, 2, rs); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_1_2(own wasm_valtype_t *p, own wasm_valtype_t *r1, + own wasm_valtype_t *r2) { + wasm_valtype_t *ps[1] = {p}; + wasm_valtype_t *rs[2] = {r1, r2}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new(¶ms, 1, ps); + wasm_valtype_vec_new(&results, 2, rs); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_2_2(own wasm_valtype_t *p1, own wasm_valtype_t *p2, + own wasm_valtype_t *r1, own wasm_valtype_t *r2) { + wasm_valtype_t *ps[2] = {p1, p2}; + wasm_valtype_t *rs[2] = {r1, r2}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new(¶ms, 2, ps); + wasm_valtype_vec_new(&results, 2, rs); + return wasm_functype_new(¶ms, &results); +} + +static inline own wasm_functype_t * +wasm_functype_new_3_2(own wasm_valtype_t *p1, own wasm_valtype_t *p2, + own wasm_valtype_t *p3, own wasm_valtype_t *r1, + own wasm_valtype_t *r2) { + wasm_valtype_t *ps[3] = {p1, p2, p3}; + wasm_valtype_t *rs[2] = {r1, r2}; + wasm_valtype_vec_t params, results; + wasm_valtype_vec_new(¶ms, 3, ps); + wasm_valtype_vec_new(&results, 2, rs); + return wasm_functype_new(¶ms, &results); +} + +// Value construction short-hands + +static inline void wasm_val_init_ptr(own wasm_val_t *out, void *p) { +#if UINTPTR_MAX == UINT32_MAX + out->kind = WASM_I32; + out->of.i32 = (intptr_t)p; +#elif UINTPTR_MAX == UINT64_MAX + out->kind = WASM_I64; + out->of.i64 = (intptr_t)p; +#endif +} + +static inline void *wasm_val_ptr(const wasm_val_t *val) { +#if UINTPTR_MAX == UINT32_MAX + return (void *)(intptr_t)val->of.i32; +#elif UINTPTR_MAX == UINT64_MAX + return (void *)(intptr_t)val->of.i64; +#endif +} + +/////////////////////////////////////////////////////////////////////////////// + +#undef own + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // #ifdef __WASM_H From e52384a9fd3649f485dee1a76ce554e43d82ee42 Mon Sep 17 00:00:00 2001 From: Edoardo Marangoni Date: Wed, 16 Oct 2024 14:19:23 +0200 Subject: [PATCH 2/6] fix(api/build/v8): link `winmm`, more verbosity --- Makefile | 2 +- lib/api/build.rs | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3a5f92bb851..03d5f4bcdeb 100644 --- a/Makefile +++ b/Makefile @@ -580,7 +580,7 @@ test-examples: test-stage-5-test-examples test-stage-6-test-examples-release test-v8: test-v8-api test-v8-api: - cargo nextest run --package=wasmer --release --features=v8 --no-default-features + CARGO_TERM_VERBOSE=true cargo nextest run --package=wasmer --release --features=v8 --no-default-features test-wamr: test-wamr-api diff --git a/lib/api/build.rs b/lib/api/build.rs index d8cf7cab0e0..bac8ad81d9d 100644 --- a/lib/api/build.rs +++ b/lib/api/build.rs @@ -171,6 +171,14 @@ fn main() { let tar = xz::read::XzDecoder::new(tar_data.as_slice()); let mut archive = tar::Archive::new(tar); + + for entry in archive.entries().unwrap() { + eprintln!( + "entry: {:?}", + entry.unwrap().path().map(|v| v.to_string_lossy()) + ); + } + archive.unpack(out_dir.clone()).unwrap(); println!("cargo:rustc-link-search=native={}", out_dir); @@ -189,6 +197,7 @@ fn main() { println!("cargo:rustc-link-lib=stdc++"); } else if cfg!(target_os = "windows") { /* do nothing */ + println!("cargo:rustc-link-lib=winmm"); } else { println!("cargo:rustc-link-lib=c++"); } From 259b6d8a93aef8a7ec2f6d45c1c16cd0a31152a7 Mon Sep 17 00:00:00 2001 From: Edoardo Marangoni Date: Wed, 16 Oct 2024 14:25:51 +0200 Subject: [PATCH 3/6] fix(api/build/v8): Use `wasmerio` artifacts for wee8 --- lib/api/build.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/api/build.rs b/lib/api/build.rs index bac8ad81d9d..958328cf231 100644 --- a/lib/api/build.rs +++ b/lib/api/build.rs @@ -151,10 +151,10 @@ fn main() { use std::{env, path::PathBuf}; let url = match (env::var("CARGO_CFG_TARGET_OS").unwrap().as_str(), env::var("CARGO_CFG_TARGET_ARCH").unwrap().as_str()) { - ("macos", "aarch64") => "https://github.com/xdoardo/wee8-custom-builds/releases/download/11.6/wee8-darwin-aarch64.tar.xz", - ("macos", "x86_64") => "https://github.com/xdoardo/wee8-custom-builds/releases/download/11.6/wee8-darwin-amd64.tar.xz", - ("linux", "x86_64") => "https://github.com/xdoardo/wee8-custom-builds/releases/download/11.6/wee8-linux-amd64.tar.xz", - ("windows", "x86_64") =>"https://github.com/xdoardo/wee8-custom-builds/releases/download/11.6/wee8-windows-amd64.tar.xz", + ("macos", "aarch64") => "https://github.com/wasmerio/wee8-custom-builds/releases/download/11.6/wee8-darwin-aarch64.tar.xz", + ("macos", "x86_64") => "https://github.com/wasmerio/wee8-custom-builds/releases/download/11.6/wee8-darwin-amd64.tar.xz", + ("linux", "x86_64") => "https://github.com/wasmerio/wee8-custom-builds/releases/download/11.6/wee8-linux-amd64.tar.xz", + ("windows", "x86_64") =>"https://github.com/wasmerio/wee8-custom-builds/releases/download/11.6/wee8-windows-amd64.tar.xz", (os, arch) => panic!("target os + arch combination not supported: {os}, {arch}") }; @@ -173,12 +173,12 @@ fn main() { let mut archive = tar::Archive::new(tar); for entry in archive.entries().unwrap() { - eprintln!( - "entry: {:?}", - entry.unwrap().path().map(|v| v.to_string_lossy()) - ); + eprintln!("entry: {:?}", entry.unwrap().path()); } + let tar = xz::read::XzDecoder::new(tar_data.as_slice()); + let mut archive = tar::Archive::new(tar); + archive.unpack(out_dir.clone()).unwrap(); println!("cargo:rustc-link-search=native={}", out_dir); From c1c1fc55db9bf41890946dd9e2f827f28445f4e3 Mon Sep 17 00:00:00 2001 From: Edoardo Marangoni Date: Wed, 16 Oct 2024 14:40:23 +0200 Subject: [PATCH 4/6] fix(build): Setup MSVC before downloading rust --- .github/workflows/test.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 903deeb0a5e..bc0ff15dd15 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -272,6 +272,10 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Setup MSVC (Windows) + uses: ilammy/msvc-dev-cmd@v1 + if: matrix.metadata.build == 'windows-x64' + - uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ env.MSRV }} @@ -297,9 +301,7 @@ jobs: run: | choco install ninja - - name: Setup MSVC (Windows) - uses: ilammy/msvc-dev-cmd@v1 - if: matrix.metadata.build == 'windows-x64' + - name: Test WAMR API if: ${{ matrix.build-what.key == 'wamr' }} From d213b5a4bce9e77933065b4f5617a75629a07523 Mon Sep 17 00:00:00 2001 From: Edoardo Marangoni Date: Wed, 16 Oct 2024 14:49:43 +0200 Subject: [PATCH 5/6] fix(build): Reimplement the `link.exe` hack for windows --- .github/workflows/test.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index bc0ff15dd15..68806a19030 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -301,7 +301,10 @@ jobs: run: | choco install ninja - + - name: Delete unwanted link to stop it from interfering (Windows) + shell: bash + run: rm /usr/bin/link.exe + if: startsWith(matrix.metadata.build, 'windows-') - name: Test WAMR API if: ${{ matrix.build-what.key == 'wamr' }} From 878777e06bef2e15b9390045c973b53754f11a10 Mon Sep 17 00:00:00 2001 From: Edoardo Marangoni Date: Wed, 16 Oct 2024 15:03:05 +0200 Subject: [PATCH 6/6] fix(api/build/v8): Link more missing libs on windows --- lib/api/build.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/api/build.rs b/lib/api/build.rs index 958328cf231..862f402edf4 100644 --- a/lib/api/build.rs +++ b/lib/api/build.rs @@ -198,6 +198,8 @@ fn main() { } else if cfg!(target_os = "windows") { /* do nothing */ println!("cargo:rustc-link-lib=winmm"); + println!("cargo:rustc-link-lib=dbghelp"); + println!("cargo:rustc-link-lib=shlwapi"); } else { println!("cargo:rustc-link-lib=c++"); }