mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-06 04:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(c-api) Do not rename wat2wasm for the moment.

Browse Source
This commit is contained in:
Ivan Enderlin
2021-02-12 00:26:53 +01:00
parent fd6689c580
commit 17dbb32e5a
11 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/c-api/build.rs
View File

@@ -496,7 +496,6 @@ fn exclude_items_from_wasm_c_api(builder: Builder) -> Builder {
.exclude_item("wasmer_triple_new") .exclude_item("wasmer_triple_new")
.exclude_item("wasmer_triple_new_from_host") .exclude_item("wasmer_triple_new_from_host")
.exclude_item("wasmer_triple_t") .exclude_item("wasmer_triple_t")
.exclude_item("wasmer_wat2wasm")
.exclude_item("wat2wasm") .exclude_item("wat2wasm")
} }

2
lib/c-api/src/error.rs
View File

@@ -21,7 +21,7 @@
//! wasm_byte_vec_t wat; //! wasm_byte_vec_t wat;
//! wasmer_byte_vec_new_from_string(&wat, "(foobar)"); //! wasmer_byte_vec_new_from_string(&wat, "(foobar)");
//! wasm_byte_vec_t wasm; //! wasm_byte_vec_t wasm;
//! wasmer_wat2wasm(&wat, &wasm); //! wat2wasm(&wat, &wasm);
//! //!
//! int error_length = wasmer_last_error_length(); //! int error_length = wasmer_last_error_length();
//! //!

2
lib/c-api/src/wasm_c_api/externals/global.rs vendored
View File

@@ -127,7 +127,7 @@ mod tests {
wasm_byte_vec_t wat; wasm_byte_vec_t wat;
wasmer_byte_vec_new_from_string(&wat, "(module (global $global (export \"global\") f32 (f32.const 1)))"); wasmer_byte_vec_new_from_string(&wat, "(module (global $global (export \"global\") f32 (f32.const 1)))");
wasm_byte_vec_t wasm_bytes; wasm_byte_vec_t wasm_bytes;
wasmer_wat2wasm(&wat, &wasm_bytes); wat2wasm(&wat, &wasm_bytes);
wasm_module_t* module = wasm_module_new(store, &wasm_bytes); wasm_module_t* module = wasm_module_new(store, &wasm_bytes);
wasm_extern_vec_t import_object = WASM_EMPTY_VEC; wasm_extern_vec_t import_object = WASM_EMPTY_VEC;
wasm_instance_t* instance = wasm_instance_new(store, module, &import_object, NULL); wasm_instance_t* instance = wasm_instance_new(store, module, &import_object, NULL);

2
lib/c-api/src/wasm_c_api/externals/mod.rs vendored
View File

@@ -156,7 +156,7 @@ mod tests {
" (func (export \"function\")))" " (func (export \"function\")))"
); );
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
wasm_module_t* module = wasm_module_new(store, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm);
assert(module); assert(module);

4
lib/c-api/src/wasm_c_api/instance.rs
View File

@@ -118,7 +118,7 @@ pub unsafe extern "C" fn wasm_instance_delete(_instance: Option<Box<wasm_instanc
/// " (memory (export \"memory\") 1))" /// " (memory (export \"memory\") 1))"
/// ); /// );
/// wasm_byte_vec_t wasm; /// wasm_byte_vec_t wasm;
/// wasmer_wat2wasm(&wat, &wasm); /// wat2wasm(&wat, &wasm);
/// ///
/// // Create the module. /// // Create the module.
/// wasm_module_t* module = wasm_module_new(store, &wasm); /// wasm_module_t* module = wasm_module_new(store, &wasm);
@@ -245,7 +245,7 @@ mod tests {
" call $sum))" " call $sum))"
); );
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
// Create the module. // Create the module.
wasm_module_t* module = wasm_module_new(store, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm);

6
lib/c-api/src/wasm_c_api/mod.rs
View File

@@ -94,7 +94,7 @@ pub mod externals;
/// wasm_byte_vec_t wat; /// wasm_byte_vec_t wat;
/// wasmer_byte_vec_new_from_string(&wat, "(module)"); /// wasmer_byte_vec_new_from_string(&wat, "(module)");
/// wasm_byte_vec_t wasm; /// wasm_byte_vec_t wasm;
/// wasmer_wat2wasm(&wat, &wasm); /// wat2wasm(&wat, &wasm);
/// ///
/// // Create the module. /// // Create the module.
/// wasm_module_t* module = wasm_module_new(store, &wasm); /// wasm_module_t* module = wasm_module_new(store, &wasm);
@@ -152,7 +152,7 @@ pub mod instance;
/// wasm_byte_vec_t wat; /// wasm_byte_vec_t wat;
/// wasmer_byte_vec_new_from_string(&wat, "(module)"); /// wasmer_byte_vec_new_from_string(&wat, "(module)");
/// wasm_byte_vec_t wasm; /// wasm_byte_vec_t wasm;
/// wasmer_wat2wasm(&wat, &wasm); /// wat2wasm(&wat, &wasm);
/// ///
/// // Create the module. /// // Create the module.
/// wasm_module_t* module = wasm_module_new(store, &wasm); /// wasm_module_t* module = wasm_module_new(store, &wasm);
@@ -302,7 +302,7 @@ pub mod wasi;
/// ///
/// // Our Wasm bytes. /// // Our Wasm bytes.
/// wasm_byte_vec_t wasm; /// wasm_byte_vec_t wasm;
/// wasmer_wat2wasm(&wat, &wasm); /// wat2wasm(&wat, &wasm);
/// ///
/// // It works! /// // It works!
/// assert(wasm.size > 0); /// assert(wasm.size > 0);

20
lib/c-api/src/wasm_c_api/module.rs
View File

@@ -76,7 +76,7 @@ pub unsafe extern "C" fn wasm_module_delete(_module: Option<Box<wasm_module_t>>)
/// wasm_byte_vec_t wat; /// wasm_byte_vec_t wat;
/// wasmer_byte_vec_new_from_string(&wat, "(module)"); /// wasmer_byte_vec_new_from_string(&wat, "(module)");
/// wasm_byte_vec_t wasm; /// wasm_byte_vec_t wasm;
/// wasmer_wat2wasm(&wat, &wasm); /// wat2wasm(&wat, &wasm);
/// ///
/// // Validate that the WebAssembly module is correct. /// // Validate that the WebAssembly module is correct.
/// assert(wasm_module_validate(store, &wasm)); /// assert(wasm_module_validate(store, &wasm));
@@ -150,7 +150,7 @@ pub unsafe extern "C" fn wasm_module_validate(
/// " (memory (export \"memory\") 1))" /// " (memory (export \"memory\") 1))"
/// ); /// );
/// wasm_byte_vec_t wasm; /// wasm_byte_vec_t wasm;
/// wasmer_wat2wasm(&wat, &wasm); /// wat2wasm(&wat, &wasm);
/// ///
/// // Create the module. /// // Create the module.
/// wasm_module_t* module = wasm_module_new(store, &wasm); /// wasm_module_t* module = wasm_module_new(store, &wasm);
@@ -274,7 +274,7 @@ pub unsafe extern "C" fn wasm_module_exports(
/// " (import \"ns\" \"memory\" (memory 3 4)))" /// " (import \"ns\" \"memory\" (memory 3 4)))"
/// ); /// );
/// wasm_byte_vec_t wasm; /// wasm_byte_vec_t wasm;
/// wasmer_wat2wasm(&wat, &wasm); /// wat2wasm(&wat, &wasm);
/// ///
/// // Create the module. /// // Create the module.
/// wasm_module_t* module = wasm_module_new(store, &wasm); /// wasm_module_t* module = wasm_module_new(store, &wasm);
@@ -426,7 +426,7 @@ pub unsafe extern "C" fn wasm_module_imports(
/// " (memory (export \"memory\") 1))" /// " (memory (export \"memory\") 1))"
/// ); /// );
/// wasm_byte_vec_t wasm; /// wasm_byte_vec_t wasm;
/// wasmer_wat2wasm(&wat, &wasm); /// wat2wasm(&wat, &wasm);
/// ///
/// // Create the module. /// // Create the module.
/// wasm_module_t* module = wasm_module_new(store, &wasm); /// wasm_module_t* module = wasm_module_new(store, &wasm);
@@ -533,7 +533,7 @@ mod tests {
wasm_byte_vec_t wat; wasm_byte_vec_t wat;
wasmer_byte_vec_new_from_string(&wat, "(module)"); wasmer_byte_vec_new_from_string(&wat, "(module)");
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
assert(wasm_module_validate(store, &wasm)); assert(wasm_module_validate(store, &wasm));
@@ -560,7 +560,7 @@ mod tests {
wasm_byte_vec_t wat; wasm_byte_vec_t wat;
wasmer_byte_vec_new_from_string(&wat, "(module)"); wasmer_byte_vec_new_from_string(&wat, "(module)");
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
wasm_module_t* module = wasm_module_new(store, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm);
assert(module); assert(module);
@@ -596,7 +596,7 @@ mod tests {
" (memory (export \"memory\") 1))" " (memory (export \"memory\") 1))"
); );
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
wasm_module_t* module = wasm_module_new(store, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm);
assert(module); assert(module);
@@ -704,7 +704,7 @@ mod tests {
" (import \"ns\" \"memory\" (memory 3 4)))" " (import \"ns\" \"memory\" (memory 3 4)))"
); );
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
wasm_module_t* module = wasm_module_new(store, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm);
assert(module); assert(module);
@@ -815,7 +815,7 @@ mod tests {
wasm_byte_vec_t wat; wasm_byte_vec_t wat;
wasmer_byte_vec_new_from_string(&wat, "(module)"); wasmer_byte_vec_new_from_string(&wat, "(module)");
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
wasm_module_t* module = wasm_module_new(store, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm);
assert(module); assert(module);
@@ -856,7 +856,7 @@ mod tests {
" (memory (export \"memory\") 1))" " (memory (export \"memory\") 1))"
); );
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
wasm_module_t* module = wasm_module_new(store, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm);
assert(module); assert(module);

4
lib/c-api/src/wasm_c_api/unstable/module.rs
View File

@@ -28,7 +28,7 @@ use std::sync::Arc;
/// wasmer_byte_vec_new_from_string(&wat, "(module $moduleName)"); /// wasmer_byte_vec_new_from_string(&wat, "(module $moduleName)");
/// // ^~~~~~~~~~~ that's the name! /// // ^~~~~~~~~~~ that's the name!
/// wasm_byte_vec_t wasm; /// wasm_byte_vec_t wasm;
/// wasmer_wat2wasm(&wat, &wasm); /// wat2wasm(&wat, &wasm);
/// ///
/// // Create the module. /// // Create the module.
/// wasm_module_t* module = wasm_module_new(store, &wasm); /// wasm_module_t* module = wasm_module_new(store, &wasm);
@@ -94,7 +94,7 @@ pub unsafe extern "C" fn wasmer_module_name(
/// wasm_byte_vec_t wat; /// wasm_byte_vec_t wat;
/// wasmer_byte_vec_new_from_string(&wat, "(module)"); /// wasmer_byte_vec_new_from_string(&wat, "(module)");
/// wasm_byte_vec_t wasm; /// wasm_byte_vec_t wasm;
/// wasmer_wat2wasm(&wat, &wasm); /// wat2wasm(&wat, &wasm);
/// ///
/// // Create the module. /// // Create the module.
/// wasm_module_t* module = wasm_module_new(store, &wasm); /// wasm_module_t* module = wasm_module_new(store, &wasm);

6
lib/c-api/src/wasm_c_api/wasi/mod.rs
View File

@@ -429,7 +429,7 @@ mod tests {
wasm_byte_vec_t wat; wasm_byte_vec_t wat;
wasmer_byte_vec_new_from_string(&wat, "(module (import \"wasi_unstable\" \"args_get\" (func (param i32 i32) (result i32))))"); wasmer_byte_vec_new_from_string(&wat, "(module (import \"wasi_unstable\" \"args_get\" (func (param i32 i32) (result i32))))");
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
wasm_module_t* module = wasm_module_new(store, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm);
assert(module); assert(module);
@@ -460,7 +460,7 @@ mod tests {
wasm_byte_vec_t wat; wasm_byte_vec_t wat;
wasmer_byte_vec_new_from_string(&wat, "(module (import \"wasi_snapshot_preview1\" \"args_get\" (func (param i32 i32) (result i32))))"); wasmer_byte_vec_new_from_string(&wat, "(module (import \"wasi_snapshot_preview1\" \"args_get\" (func (param i32 i32) (result i32))))");
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
wasm_module_t* module = wasm_module_new(store, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm);
assert(module); assert(module);
@@ -491,7 +491,7 @@ mod tests {
wasm_byte_vec_t wat; wasm_byte_vec_t wat;
wasmer_byte_vec_new_from_string(&wat, "(module (import \"wasi_snpsht_prvw1\" \"args_get\" (func (param i32 i32) (result i32))))"); wasmer_byte_vec_new_from_string(&wat, "(module (import \"wasi_snpsht_prvw1\" \"args_get\" (func (param i32 i32) (result i32))))");
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
wasm_module_t* module = wasm_module_new(store, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm);
assert(module); assert(module);

15
lib/c-api/src/wasm_c_api/wat.rs
View File

@@ -10,7 +10,7 @@ use super::types::wasm_byte_vec_t;
/// See the module's documentation. /// See the module's documentation.
#[cfg(feature = "wat")] #[cfg(feature = "wat")]
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn wasmer_wat2wasm(wat: &wasm_byte_vec_t, out: &mut wasm_byte_vec_t) { pub unsafe extern "C" fn wat2wasm(wat: &wasm_byte_vec_t, out: &mut wasm_byte_vec_t) {
let wat: &[u8] = match wat.into_slice() { let wat: &[u8] = match wat.into_slice() {
Some(v) => v, Some(v) => v,
_ => { _ => {
@@ -32,15 +32,6 @@ pub unsafe extern "C" fn wasmer_wat2wasm(wat: &wasm_byte_vec_t, out: &mut wasm_b
*out = result; *out = result;
} }
/// Please use `wasmer_wat2wasm`.
///
/// cbindgen:prefix=DEPRECATED("This function has been renamed `wasmer_wat2wasm`.")
#[cfg(feature = "wat")]
#[no_mangle]
pub unsafe extern "C" fn wat2wasm(wat: &wasm_byte_vec_t, out: &mut wasm_byte_vec_t) {
wasmer_wat2wasm(wat, out);
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use inline_c::assert_c; use inline_c::assert_c;
@@ -54,7 +45,7 @@ mod tests {
wasm_byte_vec_t wat; wasm_byte_vec_t wat;
wasmer_byte_vec_new_from_string(&wat, "(module)"); wasmer_byte_vec_new_from_string(&wat, "(module)");
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
assert(wasm.data); assert(wasm.data);
assert(wasm.size == 8); assert(wasm.size == 8);
@@ -87,7 +78,7 @@ mod tests {
wasm_byte_vec_t wat; wasm_byte_vec_t wat;
wasmer_byte_vec_new_from_string(&wat, "(module"); wasmer_byte_vec_new_from_string(&wat, "(module");
wasm_byte_vec_t wasm; wasm_byte_vec_t wasm;
wasmer_wat2wasm(&wat, &wasm); wat2wasm(&wat, &wasm);
assert(!wasm.data); assert(!wasm.data);
assert(wasmer_last_error_length() > 0); assert(wasmer_last_error_length() > 0);

6
lib/c-api/wasmer_wasm.h
View File

@@ -332,11 +332,7 @@ uint8_t wasmer_version_patch(void);
const char *wasmer_version_pre(void); const char *wasmer_version_pre(void);
void wasmer_wat2wasm(const wasm_byte_vec_t *wat, wasm_byte_vec_t *out); void wat2wasm(const wasm_byte_vec_t *wat, wasm_byte_vec_t *out);
DEPRECATED("This function has been renamed `wasmer_wat2wasm`.")
void wat2wasm(const wasm_byte_vec_t *wat,
wasm_byte_vec_t *out);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"