fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-13 00:51:20 +00:00
Code Issues Projects Releases Wiki Activity

Deprecate Instance::func and Instance::dyn_func

Browse Source
This commit is contained in:
Mark McCaskey
2020-03-26 17:11:37 -07:00
parent a18371eb91
commit 2fb8f8197b
7 changed files with 154 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
lib/emscripten/src/lib.rs
View File

@ -33,7 +33,7 @@ use wasmer_runtime_core::{
types::{ElementType, FuncSig, MemoryDescriptor, TableDescriptor, Type, Value},
units::Pages,
vm::Ctx,
Func, Instance, IsExport, Module,
DynFunc, Func, Instance, IsExport, Module,
};
#[cfg(unix)]
@ -181,75 +181,89 @@ impl<'a> EmscriptenData<'a> {
globals: &'a EmscriptenGlobalsData,
mapped_dirs: HashMap<String, PathBuf>,
) -> EmscriptenData<'a> {
let malloc = instance.func("_malloc").or(instance.func("malloc")).ok();
let free = instance.func("_free").or(instance.func("free")).ok();
let memalign = instance
.func("_memalign")
.or(instance.func("memalign"))
let malloc = instance
.exports
.get("_malloc")
.or(instance.exports.get("malloc"))
.ok();
let memset = instance.func("_memset").or(instance.func("memset")).ok();
let stack_alloc = instance.func("stackAlloc").ok();
let free = instance
.exports
.get("_free")
.or(instance.exports.get("free"))
.ok();
let memalign = instance
.exports
.get("_memalign")
.or(instance.exports.get("memalign"))
.ok();
let memset = instance
.exports
.get("_memset")
.or(instance.exports.get("memset"))
.ok();
let stack_alloc = instance.exports.get("stackAlloc").ok();
let dyn_call_i = instance.func("dynCall_i").ok();
let dyn_call_ii = instance.func("dynCall_ii").ok();
let dyn_call_iii = instance.func("dynCall_iii").ok();
let dyn_call_iiii = instance.func("dynCall_iiii").ok();
let dyn_call_iifi = instance.func("dynCall_iifi").ok();
let dyn_call_v = instance.func("dynCall_v").ok();
let dyn_call_vi = instance.func("dynCall_vi").ok();
let dyn_call_vii = instance.func("dynCall_vii").ok();
let dyn_call_viii = instance.func("dynCall_viii").ok();
let dyn_call_viiii = instance.func("dynCall_viiii").ok();
let dyn_call_i = instance.exports.get("dynCall_i").ok();
let dyn_call_ii = instance.exports.get("dynCall_ii").ok();
let dyn_call_iii = instance.exports.get("dynCall_iii").ok();
let dyn_call_iiii = instance.exports.get("dynCall_iiii").ok();
let dyn_call_iifi = instance.exports.get("dynCall_iifi").ok();
let dyn_call_v = instance.exports.get("dynCall_v").ok();
let dyn_call_vi = instance.exports.get("dynCall_vi").ok();
let dyn_call_vii = instance.exports.get("dynCall_vii").ok();
let dyn_call_viii = instance.exports.get("dynCall_viii").ok();
let dyn_call_viiii = instance.exports.get("dynCall_viiii").ok();
// round 2
let dyn_call_dii = instance.func("dynCall_dii").ok();
let dyn_call_diiii = instance.func("dynCall_diiii").ok();
let dyn_call_iiiii = instance.func("dynCall_iiiii").ok();
let dyn_call_iiiiii = instance.func("dynCall_iiiiii").ok();
let dyn_call_iiiiiii = instance.func("dynCall_iiiiiii").ok();
let dyn_call_iiiiiiii = instance.func("dynCall_iiiiiiii").ok();
let dyn_call_iiiiiiiii = instance.func("dynCall_iiiiiiiii").ok();
let dyn_call_iiiiiiiiii = instance.func("dynCall_iiiiiiiiii").ok();
let dyn_call_iiiiiiiiiii = instance.func("dynCall_iiiiiiiiiii").ok();
let dyn_call_vd = instance.func("dynCall_vd").ok();
let dyn_call_viiiii = instance.func("dynCall_viiiii").ok();
let dyn_call_viiiiii = instance.func("dynCall_viiiiii").ok();
let dyn_call_viiiiiii = instance.func("dynCall_viiiiiii").ok();
let dyn_call_viiiiiiii = instance.func("dynCall_viiiiiiii").ok();
let dyn_call_viiiiiiiii = instance.func("dynCall_viiiiiiiii").ok();
let dyn_call_viiiiiiiiii = instance.func("dynCall_viiiiiiiiii").ok();
let dyn_call_iij = instance.func("dynCall_iij").ok();
let dyn_call_iji = instance.func("dynCall_iji").ok();
let dyn_call_iiji = instance.func("dynCall_iiji").ok();
let dyn_call_iiijj = instance.func("dynCall_iiijj").ok();
let dyn_call_j = instance.func("dynCall_j").ok();
let dyn_call_ji = instance.func("dynCall_ji").ok();
let dyn_call_jii = instance.func("dynCall_jii").ok();
let dyn_call_jij = instance.func("dynCall_jij").ok();
let dyn_call_jjj = instance.func("dynCall_jjj").ok();
let dyn_call_viiij = instance.func("dynCall_viiij").ok();
let dyn_call_viiijiiii = instance.func("dynCall_viiijiiii").ok();
let dyn_call_viiijiiiiii = instance.func("dynCall_viiijiiiiii").ok();
let dyn_call_viij = instance.func("dynCall_viij").ok();
let dyn_call_viiji = instance.func("dynCall_viiji").ok();
let dyn_call_viijiii = instance.func("dynCall_viijiii").ok();
let dyn_call_viijj = instance.func("dynCall_viijj").ok();
let dyn_call_vj = instance.func("dynCall_vj").ok();
let dyn_call_vjji = instance.func("dynCall_vjji").ok();
let dyn_call_vij = instance.func("dynCall_vij").ok();
let dyn_call_viji = instance.func("dynCall_viji").ok();
let dyn_call_vijiii = instance.func("dynCall_vijiii").ok();
let dyn_call_vijj = instance.func("dynCall_vijj").ok();
let dyn_call_viid = instance.func("dynCall_viid").ok();
let dyn_call_vidd = instance.func("dynCall_vidd").ok();
let dyn_call_viidii = instance.func("dynCall_viidii").ok();
let dyn_call_viidddddddd = instance.func("dynCall_viidddddddd").ok();
let dyn_call_dii = instance.exports.get("dynCall_dii").ok();
let dyn_call_diiii = instance.exports.get("dynCall_diiii").ok();
let dyn_call_iiiii = instance.exports.get("dynCall_iiiii").ok();
let dyn_call_iiiiii = instance.exports.get("dynCall_iiiiii").ok();
let dyn_call_iiiiiii = instance.exports.get("dynCall_iiiiiii").ok();
let dyn_call_iiiiiiii = instance.exports.get("dynCall_iiiiiiii").ok();
let dyn_call_iiiiiiiii = instance.exports.get("dynCall_iiiiiiiii").ok();
let dyn_call_iiiiiiiiii = instance.exports.get("dynCall_iiiiiiiiii").ok();
let dyn_call_iiiiiiiiiii = instance.exports.get("dynCall_iiiiiiiiiii").ok();
let dyn_call_vd = instance.exports.get("dynCall_vd").ok();
let dyn_call_viiiii = instance.exports.get("dynCall_viiiii").ok();
let dyn_call_viiiiii = instance.exports.get("dynCall_viiiiii").ok();
let dyn_call_viiiiiii = instance.exports.get("dynCall_viiiiiii").ok();
let dyn_call_viiiiiiii = instance.exports.get("dynCall_viiiiiiii").ok();
let dyn_call_viiiiiiiii = instance.exports.get("dynCall_viiiiiiiii").ok();
let dyn_call_viiiiiiiiii = instance.exports.get("dynCall_viiiiiiiiii").ok();
let dyn_call_iij = instance.exports.get("dynCall_iij").ok();
let dyn_call_iji = instance.exports.get("dynCall_iji").ok();
let dyn_call_iiji = instance.exports.get("dynCall_iiji").ok();
let dyn_call_iiijj = instance.exports.get("dynCall_iiijj").ok();
let dyn_call_j = instance.exports.get("dynCall_j").ok();
let dyn_call_ji = instance.exports.get("dynCall_ji").ok();
let dyn_call_jii = instance.exports.get("dynCall_jii").ok();
let dyn_call_jij = instance.exports.get("dynCall_jij").ok();
let dyn_call_jjj = instance.exports.get("dynCall_jjj").ok();
let dyn_call_viiij = instance.exports.get("dynCall_viiij").ok();
let dyn_call_viiijiiii = instance.exports.get("dynCall_viiijiiii").ok();
let dyn_call_viiijiiiiii = instance.exports.get("dynCall_viiijiiiiii").ok();
let dyn_call_viij = instance.exports.get("dynCall_viij").ok();
let dyn_call_viiji = instance.exports.get("dynCall_viiji").ok();
let dyn_call_viijiii = instance.exports.get("dynCall_viijiii").ok();
let dyn_call_viijj = instance.exports.get("dynCall_viijj").ok();
let dyn_call_vj = instance.exports.get("dynCall_vj").ok();
let dyn_call_vjji = instance.exports.get("dynCall_vjji").ok();
let dyn_call_vij = instance.exports.get("dynCall_vij").ok();
let dyn_call_viji = instance.exports.get("dynCall_viji").ok();
let dyn_call_vijiii = instance.exports.get("dynCall_vijiii").ok();
let dyn_call_vijj = instance.exports.get("dynCall_vijj").ok();
let dyn_call_viid = instance.exports.get("dynCall_viid").ok();
let dyn_call_vidd = instance.exports.get("dynCall_vidd").ok();
let dyn_call_viidii = instance.exports.get("dynCall_viidii").ok();
let dyn_call_viidddddddd = instance.exports.get("dynCall_viidddddddd").ok();
let stack_save = instance.func("stackSave").ok();
let stack_restore = instance.func("stackRestore").ok();
let stack_save = instance.exports.get("stackSave").ok();
let stack_restore = instance.exports.get("stackRestore").ok();
let set_threw = instance
.func("_setThrew")
.or(instance.func("setThrew"))
.exports
.get("_setThrew")
.or(instance.exports.get("setThrew"))
.ok();
EmscriptenData {
@ -335,11 +349,14 @@ impl<'a> EmscriptenData<'a> {
pub fn set_up_emscripten(instance: &mut Instance) -> CallResult<()> {
// ATINIT
// (used by C++)
if let Ok(_func) = instance.dyn_func("globalCtors") {
if let Ok(_func) = instance.exports.get::<DynFunc>("globalCtors") {
instance.call("globalCtors", &[])?;
}
if let Ok(_func) = instance.dyn_func("___emscripten_environ_constructor") {
if let Ok(_func) = instance
.exports
.get::<DynFunc>("___emscripten_environ_constructor")
{
instance.call("___emscripten_environ_constructor", &[])?;
}
Ok(())
@ -350,9 +367,9 @@ pub fn set_up_emscripten(instance: &mut Instance) -> CallResult<()> {
///
/// If you don't want to set it up yourself, consider using [`run_emscripten_instance`].
pub fn emscripten_call_main(instance: &mut Instance, path: &str, args: &[&str]) -> CallResult<()> {
let (func_name, main_func) = match instance.dyn_func("_main") {
let (func_name, main_func) = match instance.exports.get::<DynFunc>("_main") {
Ok(func) => Ok(("_main", func)),
Err(_e) => match instance.dyn_func("main") {
Err(_e) => match instance.exports.get::<DynFunc>("main") {
Ok(func) => Ok(("main", func)),
Err(e) => Err(e),
},