From e701bdb811e7b7d3c44b6d5f491922b7b4f39db2 Mon Sep 17 00:00:00 2001 From: Mackenzie Clark Date: Tue, 26 Mar 2019 19:00:03 -0700 Subject: [PATCH] remove the nullfunc functions --- lib/emscripten/src/emscripten_target.rs | 142 ------------------------ lib/emscripten/src/lib.rs | 64 ----------- lib/emscripten/src/nullfunc.rs | 67 ----------- 3 files changed, 273 deletions(-) delete mode 100644 lib/emscripten/src/nullfunc.rs diff --git a/lib/emscripten/src/emscripten_target.rs b/lib/emscripten/src/emscripten_target.rs index 0ae8eaab2..5e6b927e8 100644 --- a/lib/emscripten/src/emscripten_target.rs +++ b/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 { diff --git a/lib/emscripten/src/lib.rs b/lib/emscripten/src/lib.rs index 701c66309..f091e2521 100644 --- a/lib/emscripten/src/lib.rs +++ b/lib/emscripten/src/lib.rs @@ -39,7 +39,6 @@ mod linking; mod lock; mod math; mod memory; -mod nullfunc; mod process; mod signal; mod storage; @@ -477,21 +476,6 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject "_sysconf" => func!(crate::env::_sysconf), "_getaddrinfo" => func!(crate::env::_getaddrinfo), - // 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), @@ -653,12 +637,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), @@ -698,48 +676,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), diff --git a/lib/emscripten/src/nullfunc.rs b/lib/emscripten/src/nullfunc.rs deleted file mode 100644 index 8f289599b..000000000 --- a/lib/emscripten/src/nullfunc.rs +++ /dev/null @@ -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)"); -}