mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 13:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename wasmer_module_new -> wasmer_object_module_new

Browse Source 
There was a bit of confusion when merging: both wasmer_module_new,
wasmer_object_module_new and wasmer_static_module_new are one and
the same function.
This commit is contained in:
Felix Schütt
2022-11-01 15:04:51 +01:00
parent d6fb6a1241
commit eb7f14aa1d
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cli/src/c_gen/staticlib_header.rs
View File

@@ -58,7 +58,7 @@ wasm_byte_vec_t generate_serialized_data() {
return module_byte_vec; return module_byte_vec;
} }
wasm_module_t* wasmer_static_module_new(wasm_store_t* store, const char* wasm_name) { wasm_module_t* wasmer_object_module_new(wasm_store_t* store, const char* wasm_name) {
// wasm_name intentionally unused for now: will be used in the future. // wasm_name intentionally unused for now: will be used in the future.
wasm_byte_vec_t module_byte_vec = generate_serialized_data(); wasm_byte_vec_t module_byte_vec = generate_serialized_data();
wasm_module_t* module = wasm_module_deserialize(store, &module_byte_vec); wasm_module_t* module = wasm_module_deserialize(store, &module_byte_vec);

2
lib/cli/src/commands/create_exe.rs
View File

@@ -915,7 +915,7 @@ impl CreateExe {
c_code_to_instantiate.push_str(&format!( c_code_to_instantiate.push_str(&format!(
" "
wasm_module_t *atom_{atom_name} = wasmer_static_module_new(store, \"{atom_name}\"); wasm_module_t *atom_{atom_name} = wasmer_object_module_new(store, \"{atom_name}\");
if (!atom_{atom_name}) {{ if (!atom_{atom_name}) {{
fprintf(stderr, \"Failed to create module from atom \\\"{atom_name}\\\"\\n\"); fprintf(stderr, \"Failed to create module from atom \\\"{atom_name}\\\"\\n\");

2
lib/cli/src/commands/wasmer_create_exe.h
View File

@@ -10,7 +10,7 @@ extern "C" {
extern size_t WASMER_MODULE_LENGTH asm("WASMER_MODULE_LENGTH"); extern size_t WASMER_MODULE_LENGTH asm("WASMER_MODULE_LENGTH");
extern char WASMER_MODULE_DATA asm("WASMER_MODULE_DATA"); extern char WASMER_MODULE_DATA asm("WASMER_MODULE_DATA");
wasm_module_t* wasmer_module_new(wasm_store_t* store, const char* wasm_name) { wasm_module_t* wasmer_object_module_new(wasm_store_t* store, const char* wasm_name) {
wasm_byte_vec_t module_byte_vec = { wasm_byte_vec_t module_byte_vec = {
.size = WASMER_MODULE_LENGTH, .size = WASMER_MODULE_LENGTH,
.data = (const char*)&WASMER_MODULE_DATA, .data = (const char*)&WASMER_MODULE_DATA,

2
lib/cli/src/commands/wasmer_deserialize_module.h
View File

@@ -10,7 +10,7 @@ extern "C" {
extern size_t WASMER_MODULE_LENGTH asm("WASMER_MODULE_LENGTH"); extern size_t WASMER_MODULE_LENGTH asm("WASMER_MODULE_LENGTH");
extern char WASMER_MODULE_DATA asm("WASMER_MODULE_DATA"); extern char WASMER_MODULE_DATA asm("WASMER_MODULE_DATA");
wasm_module_t* wasmer_module_new(wasm_store_t* store, const char* wasm_name) { wasm_module_t* wasmer_object_module_new(wasm_store_t* store, const char* wasm_name) {
wasm_byte_vec_t module_byte_vec = { wasm_byte_vec_t module_byte_vec = {
.size = WASMER_MODULE_LENGTH, .size = WASMER_MODULE_LENGTH,
.data = (const char*)&WASMER_MODULE_DATA, .data = (const char*)&WASMER_MODULE_DATA,

6
lib/cli/src/commands/wasmer_static_create_exe_main.c
View File

@@ -14,9 +14,7 @@ extern size_t VOLUMES_LENGTH asm("VOLUMES_LENGTH");
extern char VOLUMES_DATA asm("VOLUMES_DATA"); extern char VOLUMES_DATA asm("VOLUMES_DATA");
#endif #endif
extern wasm_module_t* wasmer_module_new(wasm_store_t* store,const char* wasm_name) asm("wasmer_module_new"); extern wasm_module_t* wasmer_object_module_new(wasm_store_t* store,const char* wasm_name) asm("wasmer_object_module_new");
extern wasm_module_t* wasmer_static_module_new(wasm_store_t* store,const char* wasm_name) asm("wasmer_static_module_new");
static void print_wasmer_error() { static void print_wasmer_error() {
int error_len = wasmer_last_error_length(); int error_len = wasmer_last_error_length();
@@ -102,7 +100,7 @@ int main(int argc, char *argv[]) {
#ifdef WASI_PIRITA #ifdef WASI_PIRITA
// INSTANTIATE_MODULES // INSTANTIATE_MODULES
#else #else
wasm_module_t *module = wasmer_static_module_new(store, "module"); wasm_module_t *module = wasmer_object_module_new(store, "module");
#endif #endif
if (!module) { if (!module) {