mirror of
https://github.com/fluencelabs/wasmer
synced 2025-06-21 04:31:33 +00:00
cargo fmt
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
use super::process::_abort;
|
||||
use super::env;
|
||||
use super::process::_abort;
|
||||
use wasmer_runtime::Instance;
|
||||
|
||||
/// emscripten: ___cxa_allocate_exception
|
||||
|
@ -1,6 +1,6 @@
|
||||
use wasmer_runtime::Instance;
|
||||
use libc::{c_int, c_void};
|
||||
use std::cell::UnsafeCell;
|
||||
use wasmer_runtime::Instance;
|
||||
|
||||
/// setjmp
|
||||
pub extern "C" fn __setjmp(env_addr: u32, instance: &mut Instance) -> c_int {
|
||||
|
@ -1,5 +1,5 @@
|
||||
use wasmer_runtime::Instance;
|
||||
use libc::c_int;
|
||||
use wasmer_runtime::Instance;
|
||||
|
||||
// NOTE: Not implemented by Emscripten
|
||||
pub extern "C" fn ___lock(which: c_int, varargs: c_int, _instance: &mut Instance) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
use super::process::abort_with_message;
|
||||
use wasmer_runtime::Instance;
|
||||
use libc::{c_int, c_void, memcpy, size_t};
|
||||
use wasmer_runtime::Instance;
|
||||
|
||||
/// emscripten: _emscripten_memcpy_big
|
||||
pub extern "C" fn _emscripten_memcpy_big(
|
||||
|
@ -1,7 +1,7 @@
|
||||
use libc::{abort, c_char, c_int, exit, pid_t, EAGAIN};
|
||||
|
||||
use wasmer_runtime::Instance;
|
||||
use std::ffi::CStr;
|
||||
use wasmer_runtime::Instance;
|
||||
|
||||
pub extern "C" fn abort_with_message(message: &str) {
|
||||
debug!("emscripten::abort_with_message");
|
||||
|
@ -1,6 +1,5 @@
|
||||
use super::utils::copy_stat_into_wasm;
|
||||
use super::varargs::VarArgs;
|
||||
use wasmer_runtime::Instance;
|
||||
use byteorder::{ByteOrder, LittleEndian};
|
||||
/// NOTE: TODO: These syscalls only support wasm_32 for now because they assume offsets are u32
|
||||
/// Syscall list: https://www.cs.utexas.edu/~bismith/test/syscalls/syscalls32.html
|
||||
@ -71,6 +70,7 @@ use libc::{
|
||||
SO_REUSEADDR,
|
||||
TIOCGWINSZ,
|
||||
};
|
||||
use wasmer_runtime::Instance;
|
||||
|
||||
use super::env;
|
||||
use std::mem;
|
||||
|
@ -1,4 +1,4 @@
|
||||
use wasmer_runtime::{Instance, module::Module};
|
||||
use wasmer_runtime::{module::Module, Instance};
|
||||
//use wasmer_runtime::Instance;
|
||||
use super::env;
|
||||
use libc::stat;
|
||||
@ -142,19 +142,17 @@ pub unsafe fn copy_stat_into_wasm(instance: &mut Instance, buf: u32, stat: &stat
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::is_emscripten_module;
|
||||
use wasmer_clif_backend::CraneliftCompiler;
|
||||
use wasmer_runtime::{
|
||||
compile,
|
||||
module::Module,
|
||||
};
|
||||
use wabt::wat2wasm;
|
||||
use std::sync::Arc;
|
||||
use wabt::wat2wasm;
|
||||
use wasmer_clif_backend::CraneliftCompiler;
|
||||
use wasmer_runtime::{compile, module::Module};
|
||||
|
||||
#[test]
|
||||
fn should_detect_emscripten_files() {
|
||||
const wast_bytes: &[u8] = include_bytes!("tests/is_emscripten_true.wast");
|
||||
let wasm_binary = wat2wasm(wast_bytes.to_vec()).expect("Can't convert to wasm");
|
||||
let module = compile(&wasm_binary[..], &CraneliftCompiler::new()).expect("WASM can't be compiled");
|
||||
let module =
|
||||
compile(&wasm_binary[..], &CraneliftCompiler::new()).expect("WASM can't be compiled");
|
||||
let module = Arc::new(module);
|
||||
assert!(is_emscripten_module(&module));
|
||||
}
|
||||
@ -163,7 +161,8 @@ mod tests {
|
||||
fn should_detect_non_emscripten_files() {
|
||||
const wast_bytes: &[u8] = include_bytes!("tests/is_emscripten_false.wast");
|
||||
let wasm_binary = wat2wasm(wast_bytes.to_vec()).expect("Can't convert to wasm");
|
||||
let module = compile(&wasm_binary[..], &CraneliftCompiler::new()).expect("WASM can't be compiled");
|
||||
let module =
|
||||
compile(&wasm_binary[..], &CraneliftCompiler::new()).expect("WASM can't be compiled");
|
||||
let module = Arc::new(module);
|
||||
assert!(!is_emscripten_module(&module));
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
use wasmer_runtime::Instance;
|
||||
use std::mem;
|
||||
use wasmer_runtime::Instance;
|
||||
|
||||
#[repr(transparent)]
|
||||
pub struct VarArgs {
|
||||
|
@ -6,14 +6,14 @@ use std::io;
|
||||
use std::io::Read;
|
||||
use std::path::PathBuf;
|
||||
use std::process::exit;
|
||||
use std::sync::Arc;
|
||||
use std::rc::Rc;
|
||||
use std::sync::Arc;
|
||||
|
||||
use structopt::StructOpt;
|
||||
|
||||
use wasmer::*;
|
||||
use wasmer_runtime;
|
||||
use wasmer_emscripten;
|
||||
use wasmer_runtime;
|
||||
|
||||
#[derive(Debug, StructOpt)]
|
||||
#[structopt(name = "wasmer", about = "WASM execution runtime.")]
|
||||
@ -99,7 +99,8 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
|
||||
|
||||
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))?;
|
||||
|
||||
webassembly::start_instance(
|
||||
|
@ -6,9 +6,9 @@ pub mod utils;
|
||||
use wasmer_clif_backend::CraneliftCompiler;
|
||||
use wasmer_runtime::{
|
||||
backend::Compiler,
|
||||
module::{Module, ModuleInner},
|
||||
import::Imports,
|
||||
instance::Instance,
|
||||
module::{Module, ModuleInner},
|
||||
};
|
||||
|
||||
use cranelift_codegen::{
|
||||
@ -16,9 +16,9 @@ use cranelift_codegen::{
|
||||
settings::{self, Configurable},
|
||||
};
|
||||
use std::panic;
|
||||
use std::rc::Rc;
|
||||
use std::str::FromStr;
|
||||
use std::sync::Arc;
|
||||
use std::rc::Rc;
|
||||
use target_lexicon;
|
||||
use wasmparser;
|
||||
use wasmparser::WasmDecoder;
|
||||
|
Reference in New Issue
Block a user