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

Fix other issues with emscripten integration

Browse Source
This commit is contained in:
Steve Akinyemi
2019-01-11 20:47:41 +01:00
parent ba6828c3d4
commit 927f6e4155
5 changed files with 117 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/emscripten/src/env.rs
View File

@ -8,8 +8,8 @@ use std::mem;
use std::os::raw::c_char; use std::os::raw::c_char;
use super::utils::{allocate_on_stack, copy_cstr_into_wasm, copy_terminated_array_of_cstrs}; use super::utils::{allocate_on_stack, copy_cstr_into_wasm, copy_terminated_array_of_cstrs};
use super::EmscriptenData;
use wasmer_runtime::{types::Value, Instance}; use wasmer_runtime::{types::Value, Instance};
//use super::EmscriptenData;
//impl Instance { //impl Instance {
// pub fn memory_offset_addr(&self, index: usize, offset: usize) -> *const usize { // pub fn memory_offset_addr(&self, index: usize, offset: usize) -> *const usize {

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

@ -6,7 +6,7 @@ use wasmer_runtime::{
import::{Imports}, import::{Imports},
export::{Export, Context}, export::{Export, Context},
types::{ types::{
FuncSig, Type, Value, FuncSig, Type::*, Value,
GlobalDesc, GlobalDesc,
}, },
vm::{self, LocalGlobal}, vm::{self, LocalGlobal},
@ -91,23 +91,23 @@ pub fn emscripten_set_up_memory(memory: &mut LinearMemory) {
} }
macro_rules! mock_external { macro_rules! mock_external {
($import:ident, $name:ident) => {{ ($imports:ident, $name:ident) => {{
use wasmer_runtime::types::{FuncSig, Type};
use wasmer_runtime::import::Import;
extern "C" fn _mocked_fn() -> i32 { extern "C" fn _mocked_fn() -> i32 {
debug!("emscripten::{} <mock>", stringify!($name)); debug!("emscripten::{} <mock>", stringify!($name));
-1 -1
} }
$import.add(
"env".to_string(), $imports.register_export(
stringify!($name).to_string(), "env",
Import::Func( stringify!($name),
unsafe { FuncRef::new(_mocked_fn as _) }, Export::Function {
FuncSig { func: unsafe { FuncRef::new(_mocked_fn as _) },
ctx: Context::Internal,
signature: FuncSig {
params: vec![], params: vec![],
returns: vec![Type::I32], returns: vec![I32],
}, },
), },
); );
}}; }};
} }
@ -123,31 +123,31 @@ impl EmscriptenGlobals {
data.push(( data.push((
"STACKTOP".into(), "STACKTOP".into(),
LocalGlobal { data: stacktop(STATIC_BUMP) as _ }, LocalGlobal { data: stacktop(STATIC_BUMP) as _ },
GlobalDesc { mutable: false, ty: Type::I32 }), GlobalDesc { mutable: false, ty: I32 }),
); );
data.push(( data.push((
"DYNAMICTOP_PTR", "DYNAMICTOP_PTR".into(),
LocalGlobal { data: dynamictop_ptr(STATIC_BUMP) as _ }, LocalGlobal { data: dynamictop_ptr(STATIC_BUMP) as _ },
GlobalDesc { mutable: false, ty: Type::I32 }), GlobalDesc { mutable: false, ty: I32 }),
); );
data.push(( data.push((
"Infinity", "Infinity".into(),
LocalGlobal { data: std::f64::INFINITY.to_bits() }, LocalGlobal { data: std::f64::INFINITY.to_bits() },
GlobalDesc { mutable: false, ty: Type::F64 }, GlobalDesc { mutable: false, ty: F64 },
)); ));
data.push(( data.push((
"NaN", "NaN".into(),
LocalGlobal { data: std::f64::NAN.to_bits() }, LocalGlobal { data: std::f64::NAN.to_bits() },
GlobalDesc { mutable: false, ty: Type::F64 }, GlobalDesc { mutable: false, ty: F64 },
)); ));
data.push(( data.push((
"tableBase", "tableBase".into(),
LocalGlobal { data: 0 }, LocalGlobal { data: 0 },
GlobalDesc { mutable: false, ty: Type::I32 }, GlobalDesc { mutable: false, ty: I32 },
)); ));
Self { Self {
@ -158,21 +158,17 @@ impl EmscriptenGlobals {
pub fn generate_emscripten_env() -> Imports { pub fn generate_emscripten_env() -> Imports {
use Type::*;
let mut imports = Imports::new(); let mut imports = Imports::new();
let mut env_imports= HashMap::new();
let em_globals = EmscriptenGlobals::new(); let em_globals = EmscriptenGlobals::new();
// Add globals. // Add globals.
for (name, ref global, desc) in em_globals.data { for (ref name, ref global, ref desc) in em_globals.data {
let export = Export::Global { let export = Export::Global {
local: global as *mut _, local: unsafe { std::mem::transmute::<&LocalGlobal, *mut LocalGlobal>(global) },
global: desc, global: desc.clone(),
}; };
imports.register_export("env", name, export); imports.register_export("env", name.clone(), export);
} }
// Print functions // Print functions
@ -1343,84 +1339,84 @@ pub fn generate_emscripten_env() -> Imports {
}, },
); );
mock_external!(import_object, _waitpid); mock_external!(imports, _waitpid);
mock_external!(import_object, _utimes); mock_external!(imports, _utimes);
mock_external!(import_object, _usleep); mock_external!(imports, _usleep);
// mock_external!(import_object, _time); // mock_external!(imports, _time);
// mock_external!(import_object, _sysconf); // mock_external!(imports, _sysconf);
// mock_external!(import_object, _strftime); // mock_external!(imports, _strftime);
mock_external!(import_object, _sigsuspend); mock_external!(imports, _sigsuspend);
// mock_external!(import_object, _sigprocmask); // mock_external!(imports, _sigprocmask);
// mock_external!(import_object, _sigemptyset); // mock_external!(imports, _sigemptyset);
// mock_external!(import_object, _sigaddset); // mock_external!(imports, _sigaddset);
// mock_external!(import_object, _sigaction); // mock_external!(imports, _sigaction);
mock_external!(import_object, _setitimer); mock_external!(imports, _setitimer);
mock_external!(import_object, _setgroups); mock_external!(imports, _setgroups);
mock_external!(import_object, _setgrent); mock_external!(imports, _setgrent);
mock_external!(import_object, _sem_wait); mock_external!(imports, _sem_wait);
mock_external!(import_object, _sem_post); mock_external!(imports, _sem_post);
mock_external!(import_object, _sem_init); mock_external!(imports, _sem_init);
mock_external!(import_object, _sched_yield); mock_external!(imports, _sched_yield);
mock_external!(import_object, _raise); mock_external!(imports, _raise);
mock_external!(import_object, _mktime); mock_external!(imports, _mktime);
// mock_external!(import_object, _localtime_r); // mock_external!(imports, _localtime_r);
// mock_external!(import_object, _localtime); // mock_external!(imports, _localtime);
mock_external!(import_object, _llvm_stacksave); mock_external!(imports, _llvm_stacksave);
mock_external!(import_object, _llvm_stackrestore); mock_external!(imports, _llvm_stackrestore);
mock_external!(import_object, _kill); mock_external!(imports, _kill);
mock_external!(import_object, _gmtime_r); mock_external!(imports, _gmtime_r);
// mock_external!(import_object, _gettimeofday); // mock_external!(imports, _gettimeofday);
// mock_external!(import_object, _getpagesize); // mock_external!(imports, _getpagesize);
mock_external!(import_object, _getgrent); mock_external!(imports, _getgrent);
mock_external!(import_object, _getaddrinfo); mock_external!(imports, _getaddrinfo);
// mock_external!(import_object, _fork); // mock_external!(imports, _fork);
// mock_external!(import_object, _exit); // mock_external!(imports, _exit);
mock_external!(import_object, _execve); mock_external!(imports, _execve);
mock_external!(import_object, _endgrent); mock_external!(imports, _endgrent);
// mock_external!(import_object, _clock_gettime); // mock_external!(imports, _clock_gettime);
mock_external!(import_object, ___syscall97); mock_external!(imports, ___syscall97);
mock_external!(import_object, ___syscall91); mock_external!(imports, ___syscall91);
mock_external!(import_object, ___syscall85); mock_external!(imports, ___syscall85);
mock_external!(import_object, ___syscall75); mock_external!(imports, ___syscall75);
mock_external!(import_object, ___syscall66); mock_external!(imports, ___syscall66);
// mock_external!(import_object, ___syscall64); // mock_external!(imports, ___syscall64);
// mock_external!(import_object, ___syscall63); // mock_external!(imports, ___syscall63);
// mock_external!(import_object, ___syscall60); // mock_external!(imports, ___syscall60);
// mock_external!(import_object, ___syscall54); // mock_external!(imports, ___syscall54);
// mock_external!(import_object, ___syscall39); // mock_external!(imports, ___syscall39);
mock_external!(import_object, ___syscall38); mock_external!(imports, ___syscall38);
// mock_external!(import_object, ___syscall340); // mock_external!(imports, ___syscall340);
mock_external!(import_object, ___syscall334); mock_external!(imports, ___syscall334);
mock_external!(import_object, ___syscall300); mock_external!(imports, ___syscall300);
mock_external!(import_object, ___syscall295); mock_external!(imports, ___syscall295);
mock_external!(import_object, ___syscall272); mock_external!(imports, ___syscall272);
mock_external!(import_object, ___syscall268); mock_external!(imports, ___syscall268);
// mock_external!(import_object, ___syscall221); // mock_external!(imports, ___syscall221);
mock_external!(import_object, ___syscall220); mock_external!(imports, ___syscall220);
// mock_external!(import_object, ___syscall212); // mock_external!(imports, ___syscall212);
// mock_external!(import_object, ___syscall201); // mock_external!(imports, ___syscall201);
mock_external!(import_object, ___syscall199); mock_external!(imports, ___syscall199);
// mock_external!(import_object, ___syscall197); // mock_external!(imports, ___syscall197);
mock_external!(import_object, ___syscall196); mock_external!(imports, ___syscall196);
// mock_external!(import_object, ___syscall195); // mock_external!(imports, ___syscall195);
mock_external!(import_object, ___syscall194); mock_external!(imports, ___syscall194);
mock_external!(import_object, ___syscall191); mock_external!(imports, ___syscall191);
// mock_external!(import_object, ___syscall181); // mock_external!(imports, ___syscall181);
// mock_external!(import_object, ___syscall180); // mock_external!(imports, ___syscall180);
mock_external!(import_object, ___syscall168); mock_external!(imports, ___syscall168);
// mock_external!(import_object, ___syscall146); // mock_external!(imports, ___syscall146);
// mock_external!(import_object, ___syscall145); // mock_external!(imports, ___syscall145);
// mock_external!(import_object, ___syscall142); // mock_external!(imports, ___syscall142);
mock_external!(import_object, ___syscall140); mock_external!(imports, ___syscall140);
// mock_external!(import_object, ___syscall122); // mock_external!(imports, ___syscall122);
// mock_external!(import_object, ___syscall102); // mock_external!(imports, ___syscall102);
// mock_external!(import_object, ___syscall20); // mock_external!(imports, ___syscall20);
mock_external!(import_object, ___syscall15); mock_external!(imports, ___syscall15);
mock_external!(import_object, ___syscall10); mock_external!(imports, ___syscall10);
mock_external!(import_object, _dlopen); mock_external!(imports, _dlopen);
mock_external!(import_object, _dlclose); mock_external!(imports, _dlclose);
mock_external!(import_object, _dlsym); mock_external!(imports, _dlsym);
mock_external!(import_object, _dlerror); mock_external!(imports, _dlerror);
import_object imports
} }

2
lib/emscripten/src/utils.rs
View File

@ -9,7 +9,7 @@ use std::slice;
/// We check if a provided module is an Emscripten generated one /// We check if a provided module is an Emscripten generated one
pub fn is_emscripten_module(module: &Module) -> bool { pub fn is_emscripten_module(module: &Module) -> bool {
for (_, import_name) in &module.imported_functions { for (_, import_name) in &module.imported_functions {
if import_name.name == "_emscripten_memcpy_big" && import_name.module == "env" { if import_name.name == "_emscripten_memcpy_big" && import_name.namespace == "env" {
return true; return true;
} }
} }

7
src/bin/wasmer.rs
View File

@ -7,6 +7,7 @@ use std::io::Read;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::exit; use std::process::exit;
use std::sync::Arc; use std::sync::Arc;
use std::rc::Rc;
use structopt::StructOpt; use structopt::StructOpt;
@ -83,9 +84,11 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
let import_object = if abi == webassembly::InstanceABI::Emscripten { let import_object = if abi == webassembly::InstanceABI::Emscripten {
wasmer_emscripten::generate_emscripten_env() wasmer_emscripten::generate_emscripten_env()
} else { } else {
wasmer_runtime::Imports::new() wasmer_runtime::import::Imports::new()
}; };
let import_object = Rc::new(import_object);
let instance_options = webassembly::InstanceOptions { let instance_options = webassembly::InstanceOptions {
mock_missing_imports: true, mock_missing_imports: true,
mock_missing_globals: true, mock_missing_globals: true,
@ -97,7 +100,7 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
debug!("webassembly - creating instance"); debug!("webassembly - creating instance");
let mut instance = module.instantiate(&import_object) let mut instance = module.instantiate(import_object)
.map_err(|err| format!("Can't instantiate the WebAssembly module: {}", err))?; .map_err(|err| format!("Can't instantiate the WebAssembly module: {}", err))?;
webassembly::start_instance( webassembly::start_instance(

9
src/webassembly/mod.rs
View File

@ -4,9 +4,12 @@ pub mod relocation;
pub mod utils; pub mod utils;
use wasmer_clif_backend::CraneliftCompiler; use wasmer_clif_backend::CraneliftCompiler;
use wasmer_runtime::{backend::Compiler, module::Module}; use wasmer_runtime::{
use wasmer_runtime; backend::Compiler,
use wasmer_runtime::{Import, Imports, Instance}; module::Module,
import::Imports,
instance::Instance,
};
use cranelift_codegen::{ use cranelift_codegen::{
isa, isa,
settings::{self, Configurable}, settings::{self, Configurable},