Merge branch 'master' into feature/vfs

README.md

@@ -18,7 +18,7 @@
 
 ## Introduction
 
-[Wasmer](https://wasmer.io/) is a standalone JIT WebAssembly runtime, aiming to be fully compatible with Emscripten, Rust and Go.
+[Wasmer](https://wasmer.io/) is a standalone JIT WebAssembly runtime, aiming to be fully compatible with [WASI](https://hacks.mozilla.org/2019/03/standardizing-wasi-a-webassembly-system-interface/) and [Emscripten](https://emscripten.org/).
 
 Install Wasmer with:
 
@@ -164,6 +164,7 @@ Below are some of the goals of this project (in order of priority):
 
 - [x] It should be 100% compatible with the [WebAssembly spec tests](https://github.com/wasmerio/wasmer/tree/master/lib/spectests/spectests)
 - [x] It should be fast _(partially achieved)_
+- [ ] Support WASI _(in the works)_
 - [ ] Support Emscripten calls _(in the works)_
 - [ ] Support Rust ABI calls
 - [ ] Support Go ABI calls

lib/emscripten/src/emscripten_target.rs

@@ -12,24 +12,6 @@ pub fn getTempRet0(_ctx: &mut Ctx) -> i32 {
     debug!("emscripten::getTempRet0");
     0
 }
-pub fn nullFunc_d(_ctx: &mut Ctx, _a: i32) {
-    debug!("emscripten::nullFunc_d");
-}
-pub fn nullFunc_ji(_ctx: &mut Ctx, _a: i32) {
-    debug!("emscripten::nullFunc_ji");
-}
-pub fn nullFunc_viidii(_ctx: &mut Ctx, _a: i32) {
-    debug!("emscripten::nullFunc_viidii");
-}
-pub fn nullFunc_iiiiiii(_ctx: &mut Ctx, _a: i32) {
-    debug!("emscripten::nullFunc_iiiiiii");
-}
-pub fn nullFunc_iiiiiiii(_ctx: &mut Ctx, _a: i32) {
-    debug!("emscripten::nullFunc_iiiiiiii");
-}
-pub fn nullFunc_iiiiiiiiii(_ctx: &mut Ctx, _a: i32) {
-    debug!("emscripten::nullFunc_iiiiiiiiii");
-}
 pub fn invoke_i(ctx: &mut Ctx, index: i32) -> i32 {
     debug!("emscripten::invoke_i");
     if let Some(dyn_call_i) = &get_emscripten_data(ctx).dyn_call_i {
@@ -243,130 +225,6 @@ pub fn _getloadavg(_ctx: &mut Ctx, _loadavg: i32, _nelem: i32) -> i32 {
     debug!("emscripten::getloadavg");
     0
 }
-// round 2
-pub fn nullFunc_di(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_di");
-}
-pub fn nullFunc_dii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_dii");
-}
-pub fn nullFunc_diiii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_diiii");
-}
-pub fn nullFunc_iiji(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iiji");
-}
-pub fn nullFunc_iiid(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iiid");
-}
-pub fn nullFunc_iij(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iij");
-}
-pub fn nullFunc_iiiiiiiii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iiiiiiiii");
-}
-pub fn nullFunc_iiiiiiiiiii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iiiiiiiiiii");
-}
-pub fn nullFunc_iiiiijii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iiiiijii");
-}
-pub fn nullFunc_iiiijii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iiiijii");
-}
-pub fn nullFunc_iiiij(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iiiij");
-}
-pub fn nullFunc_iiij(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iiij");
-}
-pub fn nullFunc_iijii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iijii");
-}
-pub fn nullFunc_iijj(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iijj");
-}
-pub fn nullFunc_iiiiji(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_iiiiji");
-}
-pub fn nullFunc_ij(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_ij");
-}
-pub fn nullFunc_j(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_j");
-}
-pub fn nullFunc_jij(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_jij");
-}
-pub fn nullFunc_jj(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_jj");
-}
-pub fn nullFunc_jjj(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_jjj");
-}
-pub fn nullFunc_jii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_jii");
-}
-pub fn nullFunc_jiij(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_jiij");
-}
-pub fn nullFunc_vd(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_vd");
-}
-pub fn nullFunc_vid(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_vid");
-}
-pub fn nullFunc_viiiiiii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viiiiiii");
-}
-pub fn nullFunc_viiiij(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viiiij");
-}
-pub fn nullFunc_viiiiiiii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viiiiiiii");
-}
-pub fn nullFunc_viiiiiiiii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viiiiiiiii");
-}
-pub fn nullFunc_viiij(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viiij");
-}
-pub fn nullFunc_viiijiiii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viiijiiii");
-}
-pub fn nullFunc_viiijiiiiii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viiijiiiiii");
-}
-pub fn nullFunc_viij(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viij");
-}
-pub fn nullFunc_viijii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viijii");
-}
-pub fn nullFunc_viiji(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viiji");
-}
-pub fn nullFunc_vijii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_vijii");
-}
-pub fn nullFunc_viijiii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viijiii");
-}
-pub fn nullFunc_viijj(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viijj");
-}
-pub fn nullFunc_vij(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_vij");
-}
-pub fn nullFunc_viji(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_viji");
-}
-pub fn nullFunc_vijiii(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_vijiii");
-}
-pub fn nullFunc_vijj(_ctx: &mut Ctx, _index: i32) {
-    debug!("emscripten::nullFunc_vijj");
-}
 pub fn invoke_dii(ctx: &mut Ctx, index: i32, a1: i32, a2: i32) -> f64 {
     debug!("emscripten::invoke_dii");
     if let Some(dyn_call_dii) = &get_emscripten_data(ctx).dyn_call_dii {

lib/emscripten/src/lib.rs

@@ -40,7 +40,6 @@ mod linking;
 mod lock;
 mod math;
 mod memory;
-mod nullfunc;
 mod process;
 mod signal;
 mod storage;
@@ -347,6 +346,7 @@ pub struct EmscriptenGlobals {
     pub table: Table,
     pub memory_min: Pages,
     pub memory_max: Option<Pages>,
+    pub null_func_names: Vec<String>,
 }
 
 impl EmscriptenGlobals {
@@ -420,12 +420,29 @@ impl EmscriptenGlobals {
 
         emscripten_set_up_memory(&memory, &data);
 
+        let mut null_func_names = vec![];
+        for (
+            _,
+            ImportName {
+                namespace_index,
+                name_index,
+            },
+        ) in &module.info().imported_functions
+        {
+            let namespace = module.info().namespace_table.get(*namespace_index);
+            let name = module.info().name_table.get(*name_index);
+            if namespace == "env" && name.starts_with("nullFunc_") {
+                null_func_names.push(name.to_string())
+            }
+        }
+
         Self {
             data,
             memory,
             table,
             memory_min,
             memory_max,
+            null_func_names,
         }
     }
 }
@@ -437,8 +454,7 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
         func!(crate::memory::abort_on_cannot_grow_memory).to_export()
     };
 
-    imports! {
+    let mut env_ns = namespace! {
-        "env" => {
         "memory" => Export::Memory(globals.memory.clone()),
         "table" => Export::Table(globals.table.clone()),
 
@@ -492,21 +508,6 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
         "_getaddrinfo" => func!(crate::env::_getaddrinfo),
         "_initgroups" => func!(crate::env::_initgroups),
 
-            // Null func
-            "nullFunc_i" => func!(crate::nullfunc::nullfunc_i),
-            "nullFunc_ii" => func!(crate::nullfunc::nullfunc_ii),
-            "nullFunc_iii" => func!(crate::nullfunc::nullfunc_iii),
-            "nullFunc_iiii" => func!(crate::nullfunc::nullfunc_iiii),
-            "nullFunc_iiiii" => func!(crate::nullfunc::nullfunc_iiiii),
-            "nullFunc_iiiiii" => func!(crate::nullfunc::nullfunc_iiiiii),
-            "nullFunc_v" => func!(crate::nullfunc::nullfunc_v),
-            "nullFunc_vi" => func!(crate::nullfunc::nullfunc_vi),
-            "nullFunc_vii" => func!(crate::nullfunc::nullfunc_vii),
-            "nullFunc_viii" => func!(crate::nullfunc::nullfunc_viii),
-            "nullFunc_viiii" => func!(crate::nullfunc::nullfunc_viiii),
-            "nullFunc_viiiii" => func!(crate::nullfunc::nullfunc_viiiii),
-            "nullFunc_viiiiii" => func!(crate::nullfunc::nullfunc_viiiiii),
-
         // Syscalls
         "___syscall1" => func!(crate::syscalls::___syscall1),
         "___syscall3" => func!(crate::syscalls::___syscall3),
@@ -654,14 +655,14 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
         "_llvm_cos_f64" => func!(crate::math::_llvm_cos_f64),
         "_emscripten_random" => func!(crate::math::_emscripten_random),
 
-            // Bitwise
-            "_llvm_bswap_i64" => func!(crate::bitwise::_llvm_bswap_i64),
-
         // Jump
         "__setjmp" => func!(crate::jmp::__setjmp),
         "__longjmp" => func!(crate::jmp::__longjmp),
         "_longjmp" => func!(crate::jmp::__longjmp),
 
+        // Bitwise
+        "_llvm_bswap_i64" => func!(crate::bitwise::_llvm_bswap_i64),
+
         // Linking
         "_dlclose" => func!(crate::linking::_dlclose),
         "_dlerror" => func!(crate::linking::_dlerror),
@@ -671,12 +672,6 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
         // wasm32-unknown-emscripten
         "setTempRet0" => func!(crate::emscripten_target::setTempRet0),
         "getTempRet0" => func!(crate::emscripten_target::getTempRet0),
-            "nullFunc_ji" => func!(crate::emscripten_target::nullFunc_ji),
-            "nullFunc_d" => func!(crate::emscripten_target::nullFunc_d),
-            "nullFunc_viidii" => func!(crate::emscripten_target::nullFunc_viidii),
-            "nullFunc_iiiiiii" => func!(crate::emscripten_target::nullFunc_iiiiiii),
-            "nullFunc_iiiiiiii" => func!(crate::emscripten_target::nullFunc_iiiiiiii),
-            "nullFunc_iiiiiiiiii" => func!(crate::emscripten_target::nullFunc_iiiiiiiiii),
         "invoke_i" => func!(crate::emscripten_target::invoke_i),
         "invoke_ii" => func!(crate::emscripten_target::invoke_ii),
         "invoke_iii" => func!(crate::emscripten_target::invoke_iii),
@@ -716,48 +711,6 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
         "_gethostbyaddr" => func!(crate::emscripten_target::_gethostbyaddr),
         "_gethostbyname_r" => func!(crate::emscripten_target::_gethostbyname_r),
         "_getloadavg" => func!(crate::emscripten_target::_getloadavg),
-            // round 2
-            "nullFunc_di" => func!(crate::emscripten_target::nullFunc_di),
-            "nullFunc_dii" => func!(crate::emscripten_target::nullFunc_dii),
-            "nullFunc_diiii" => func!(crate::emscripten_target::nullFunc_diiii),
-            "nullFunc_iiid" => func!(crate::emscripten_target::nullFunc_iiid),
-            "nullFunc_iiji" => func!(crate::emscripten_target::nullFunc_iiji),
-            "nullFunc_iijj" => func!(crate::emscripten_target::nullFunc_iijj),
-            "nullFunc_iij" => func!(crate::emscripten_target::nullFunc_iij),
-            "nullFunc_ij" => func!(crate::emscripten_target::nullFunc_ij),
-            "nullFunc_j" => func!(crate::emscripten_target::nullFunc_j),
-            "nullFunc_jij" => func!(crate::emscripten_target::nullFunc_jij),
-            "nullFunc_jj" => func!(crate::emscripten_target::nullFunc_jj),
-            "nullFunc_jjj" => func!(crate::emscripten_target::nullFunc_jjj),
-            "nullFunc_jii" => func!(crate::emscripten_target::nullFunc_jii),
-            "nullFunc_jiij" => func!(crate::emscripten_target::nullFunc_jiij),
-            "nullFunc_vd" => func!(crate::emscripten_target::nullFunc_vd),
-            "nullFunc_iiiiiiiii" => func!(crate::emscripten_target::nullFunc_iiiiiiiii),
-            "nullFunc_iiiiiiiiiii" => func!(crate::emscripten_target::nullFunc_iiiiiiiiiii),
-            "nullFunc_iiiiijii" => func!(crate::emscripten_target::nullFunc_iiiiijii),
-            "nullFunc_iiiij" => func!(crate::emscripten_target::nullFunc_iiiij),
-            "nullFunc_iiij" => func!(crate::emscripten_target::nullFunc_iiij),
-            "nullFunc_iiiiji" => func!(crate::emscripten_target::nullFunc_iiiiji),
-            "nullFunc_iijii" => func!(crate::emscripten_target::nullFunc_iijii),
-            "nullFunc_iiiijii" => func!(crate::emscripten_target::nullFunc_iiiijii),
-            "nullFunc_viiiiiii" => func!(crate::emscripten_target::nullFunc_viiiiiii),
-            "nullFunc_viiiiiiii" => func!(crate::emscripten_target::nullFunc_viiiiiiii),
-            "nullFunc_viiiiiiiii" => func!(crate::emscripten_target::nullFunc_viiiiiiiii),
-            "nullFunc_viiij" => func!(crate::emscripten_target::nullFunc_viiij),
-            "nullFunc_viiijiiii" => func!(crate::emscripten_target::nullFunc_viiijiiii),
-            "nullFunc_viiijiiiiii" => func!(crate::emscripten_target::nullFunc_viiijiiiiii),
-            "nullFunc_viij" => func!(crate::emscripten_target::nullFunc_viij),
-            "nullFunc_viiji" => func!(crate::emscripten_target::nullFunc_viiji),
-            "nullFunc_vijii" => func!(crate::emscripten_target::nullFunc_vijii),
-            "nullFunc_viijii" => func!(crate::emscripten_target::nullFunc_viijii),
-            "nullFunc_viiiij" => func!(crate::emscripten_target::nullFunc_viiiij),
-            "nullFunc_viijiii" => func!(crate::emscripten_target::nullFunc_viijiii),
-            "nullFunc_viijj" => func!(crate::emscripten_target::nullFunc_viijj),
-            "nullFunc_vij" => func!(crate::emscripten_target::nullFunc_vij),
-            "nullFunc_vid" => func!(crate::emscripten_target::nullFunc_vid),
-            "nullFunc_viji" => func!(crate::emscripten_target::nullFunc_viji),
-            "nullFunc_vijiii" => func!(crate::emscripten_target::nullFunc_vijiii),
-            "nullFunc_vijj" => func!(crate::emscripten_target::nullFunc_vijj),
         "invoke_dii" => func!(crate::emscripten_target::invoke_dii),
         "invoke_diiii" => func!(crate::emscripten_target::invoke_diiii),
         "invoke_iiiii" => func!(crate::emscripten_target::invoke_iiiii),
@@ -788,7 +741,14 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
         "invoke_vijiii" => func!(crate::emscripten_target::invoke_vijiii),
         "invoke_vijj" => func!(crate::emscripten_target::invoke_vijj),
         "invoke_viidii" => func!(crate::emscripten_target::invoke_viidii),
-        },
+    };
+
+    for null_func_name in globals.null_func_names.iter() {
+        env_ns.insert(null_func_name.as_str(), Func::new(nullfunc).to_export());
+    }
+
+    let import_object: ImportObject = imports! {
+        "env" => env_ns,
         "global" => {
           "NaN" => Global::new(Value::F64(f64::NAN)),
           "Infinity" => Global::new(Value::F64(f64::INFINITY)),
@@ -801,7 +761,18 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
         "asm2wasm" => {
             "f64-rem" => func!(crate::math::f64_rem),
         },
+    };
+
+    import_object
 }
+
+pub fn nullfunc(ctx: &mut Ctx, _x: u32) {
+    use crate::process::abort_with_message;
+    debug!("emscripten::nullfunc_i {}", _x);
+    abort_with_message(ctx, "Invalid function pointer. Perhaps this is an invalid value \
+    (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an \
+    incorrect type, which will fail? (it is worth building your source files with -Werror (\
+    warnings are errors), as warnings can indicate undefined behavior which can cause this)");
 }
 
 /// The current version of this crate

lib/emscripten/src/nullfunc.rs

@@ -1,67 +0,0 @@
-use super::process::abort_with_message;
-use wasmer_runtime_core::vm::Ctx;
-
-pub fn nullfunc_i(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_i {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'i'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_ii(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_ii {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'ii'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_iii(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_iii {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'iii'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_iiii(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_iiii {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'iiii'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_iiiii(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_iiiii {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'iiiii'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_iiiiii(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_iiiiii {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'iiiiii'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_v(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_v {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'v'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_vi(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_vi {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'vi'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_vii(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_vii {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'vii'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_viii(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_viii {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'viii'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_viiii(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_viiii {}", _x);
-    abort_with_message(ctx, "Invalid function pointer called with signature 'viiii'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_viiiii(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_viiiii");
-    abort_with_message(ctx, "Invalid function pointer called with signature 'viiiii'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}
-
-pub fn nullfunc_viiiiii(ctx: &mut Ctx, _x: u32) {
-    debug!("emscripten::nullfunc_viiiiii");
-    abort_with_message(ctx, "Invalid function pointer called with signature 'viiiiii'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)");
-}

lib/runtime-core/src/macros.rs

@@ -75,3 +75,15 @@ macro_rules! __imports_internal {
         $ns
     };
 }
+
+#[macro_export]
+#[doc(hidden)]
+macro_rules! namespace {
+    ( $( $imp_name:expr => $import_item:expr, )* ) => {{
+        let mut ns = $crate::import::Namespace::new();
+        $(
+            ns.insert($imp_name, $import_item);
+        )*
+        ns
+    }};
+}