mirror of
https://github.com/fluencelabs/wasmer
synced 2025-06-21 20:51:32 +00:00
Removing some unused imports, cleanup
This commit is contained in:
@ -198,12 +198,12 @@ pub extern "C" fn ___build_environment(environ: c_int, instance: &mut Instance)
|
|||||||
const TOTAL_ENV_SIZE: u32 = 1024;
|
const TOTAL_ENV_SIZE: u32 = 1024;
|
||||||
let mut environment = instance.memory_offset_addr(0, environ as _) as *mut c_int;
|
let mut environment = instance.memory_offset_addr(0, environ as _) as *mut c_int;
|
||||||
unsafe {
|
unsafe {
|
||||||
let (pool_offset, pool_slice): (u32, &mut [u8]) =
|
let (pool_offset, _pool_slice): (u32, &mut [u8]) =
|
||||||
allocate_on_stack(TOTAL_ENV_SIZE as u32, instance);
|
allocate_on_stack(TOTAL_ENV_SIZE as u32, instance);
|
||||||
let (env_offset, env_slice): (u32, &mut [u8]) =
|
let (env_offset, _env_slice): (u32, &mut [u8]) =
|
||||||
allocate_on_stack((MAX_ENV_VALUES * 4) as u32, instance);
|
allocate_on_stack((MAX_ENV_VALUES * 4) as u32, instance);
|
||||||
let mut env_ptr = instance.memory_offset_addr(0, env_offset as _) as *mut c_int;
|
let mut env_ptr = instance.memory_offset_addr(0, env_offset as _) as *mut c_int;
|
||||||
let mut pool_ptr = instance.memory_offset_addr(0, pool_offset as _) as *mut c_int;
|
let mut _pool_ptr = instance.memory_offset_addr(0, pool_offset as _) as *mut c_int;
|
||||||
*env_ptr = pool_offset as i32;
|
*env_ptr = pool_offset as i32;
|
||||||
*environment = env_offset as i32;
|
*environment = env_offset as i32;
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ pub extern "C" fn ___cxa_allocate_exception(size: u32, instance: &mut Instance)
|
|||||||
|
|
||||||
/// emscripten: ___cxa_throw
|
/// emscripten: ___cxa_throw
|
||||||
/// TODO: We don't have support for exceptions yet
|
/// TODO: We don't have support for exceptions yet
|
||||||
pub extern "C" fn ___cxa_throw(ptr: u32, ty: u32, destructor: u32, instance: &mut Instance) {
|
pub extern "C" fn ___cxa_throw(_ptr: u32, ty: u32, destructor: u32, instance: &mut Instance) {
|
||||||
debug!("emscripten::___cxa_throw");
|
debug!("emscripten::___cxa_throw");
|
||||||
_abort();
|
_abort();
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
use libc::{c_int, c_void};
|
use libc::{c_int, c_void};
|
||||||
use std::cell::UnsafeCell;
|
|
||||||
use wasmer_runtime::Instance;
|
use wasmer_runtime::Instance;
|
||||||
|
|
||||||
/// setjmp
|
/// setjmp
|
||||||
|
@ -1,13 +1,8 @@
|
|||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate wasmer_runtime;
|
extern crate wasmer_runtime;
|
||||||
|
|
||||||
#[macro_use]
|
|
||||||
use wasmer_runtime::macros;
|
|
||||||
|
|
||||||
use byteorder::{ByteOrder, LittleEndian};
|
use byteorder::{ByteOrder, LittleEndian};
|
||||||
use hashbrown::{hash_map::Entry, HashMap};
|
use hashbrown::HashMap;
|
||||||
use libc::c_int;
|
|
||||||
use std::cell::UnsafeCell;
|
|
||||||
use std::mem;
|
use std::mem;
|
||||||
use wasmer_runtime::{
|
use wasmer_runtime::{
|
||||||
export::{Context, Export, FuncPointer, GlobalPointer},
|
export::{Context, Export, FuncPointer, GlobalPointer},
|
||||||
@ -16,9 +11,8 @@ use wasmer_runtime::{
|
|||||||
types::{
|
types::{
|
||||||
FuncSig, GlobalDesc,
|
FuncSig, GlobalDesc,
|
||||||
Type::{self, *},
|
Type::{self, *},
|
||||||
Value,
|
|
||||||
},
|
},
|
||||||
vm::{self, Func, LocalGlobal},
|
vm::LocalGlobal,
|
||||||
};
|
};
|
||||||
|
|
||||||
//#[cfg(test)]
|
//#[cfg(test)]
|
||||||
|
@ -3,10 +3,8 @@ use wasmer_runtime::{module::Module, Instance};
|
|||||||
use super::env;
|
use super::env;
|
||||||
use libc::stat;
|
use libc::stat;
|
||||||
use std::ffi::CStr;
|
use std::ffi::CStr;
|
||||||
use std::mem::size_of;
|
|
||||||
use std::os::raw::c_char;
|
use std::os::raw::c_char;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::sync::Arc;
|
|
||||||
/// 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.0.imported_functions {
|
for (_, import_name) in &module.0.imported_functions {
|
||||||
|
@ -350,7 +350,7 @@ impl Namespace for Instance {
|
|||||||
|
|
||||||
// TODO Remove this later, only needed for compilation till emscripten is updated
|
// TODO Remove this later, only needed for compilation till emscripten is updated
|
||||||
impl Instance {
|
impl Instance {
|
||||||
pub fn memory_offset_addr(&self, index: usize, offset: usize) -> *const u8 {
|
pub fn memory_offset_addr(&self, _index: usize, _offset: usize) -> *const u8 {
|
||||||
unimplemented!()
|
unimplemented!()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,13 +6,11 @@ use std::io;
|
|||||||
use std::io::Read;
|
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 structopt::StructOpt;
|
use structopt::StructOpt;
|
||||||
|
|
||||||
use wasmer::*;
|
use wasmer::*;
|
||||||
use wasmer_emscripten;
|
use wasmer_emscripten;
|
||||||
use wasmer_runtime as runtime;
|
|
||||||
|
|
||||||
#[derive(Debug, StructOpt)]
|
#[derive(Debug, StructOpt)]
|
||||||
#[structopt(name = "wasmer", about = "WASM execution runtime.")]
|
#[structopt(name = "wasmer", about = "WASM execution runtime.")]
|
||||||
@ -81,7 +79,7 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
|
|||||||
|
|
||||||
let emscripten_globals = wasmer_emscripten::EmscriptenGlobals::new();
|
let emscripten_globals = wasmer_emscripten::EmscriptenGlobals::new();
|
||||||
|
|
||||||
let mut import_object = if abi == webassembly::InstanceABI::Emscripten {
|
let import_object = if abi == webassembly::InstanceABI::Emscripten {
|
||||||
wasmer_emscripten::generate_emscripten_env(&emscripten_globals)
|
wasmer_emscripten::generate_emscripten_env(&emscripten_globals)
|
||||||
} else {
|
} else {
|
||||||
wasmer_runtime::import::Imports::new()
|
wasmer_runtime::import::Imports::new()
|
||||||
|
Reference in New Issue
Block a user