wasmer/src/webassembly/mod.rs

163 lines
5.6 KiB
Rust
Raw Normal View History

2018-10-13 17:22:57 +00:00
// pub mod module;
// pub mod compilation;
// pub mod memory;
// pub mod environ;
// pub mod instance;
pub mod errors;
2018-10-13 17:22:57 +00:00
// pub mod execute;
pub mod utils;
2018-10-13 17:22:57 +00:00
pub mod env;
2018-10-14 11:59:11 +00:00
pub mod memory;
pub mod instance;
2018-10-13 17:22:57 +00:00
use std::str::FromStr;
2018-10-13 13:31:56 +00:00
use std::time::{Duration, Instant};
use std::panic;
use cranelift_native;
use cranelift_codegen::isa::TargetIsa;
2018-10-13 17:22:57 +00:00
// use cranelift_codegen::settings;
use cranelift_codegen::settings::Configurable;
2018-10-13 17:22:57 +00:00
use target_lexicon::{self, Triple};
use cranelift_codegen::isa;
use cranelift_codegen::print_errors::pretty_verifier_error;
use cranelift_codegen::settings::{self, Flags};
use cranelift_codegen::verifier;
use cranelift_wasm::{translate_module, ReturnMode};
2018-10-14 19:41:59 +00:00
pub use self::env::Module;
2018-10-14 11:59:11 +00:00
pub use self::instance::Instance;
2018-10-13 17:22:57 +00:00
// pub use self::compilation::{compile_module, Compilation};
// pub use self::environ::{ModuleEnvironment};
// pub use self::module::Module;
// pub use self::instance::Instance;
pub use self::errors::{Error, ErrorKind};
2018-10-13 17:22:57 +00:00
// pub use self::execute::{compile_and_link_module,execute};
use wasmparser;
2018-10-13 17:22:57 +00:00
// pub struct ResultObject {
// /// A WebAssembly.Module object representing the compiled WebAssembly module.
// /// This Module can be instantiated again
// pub module: Module,
// /// A WebAssembly.Instance object that contains all the Exported WebAssembly
// /// functions.
// pub instance: Instance,
2018-10-12 10:39:33 +00:00
2018-10-13 17:22:57 +00:00
// pub compilation: Compilation,
// }
pub struct ImportObject {
}
/// The WebAssembly.instantiate() function allows you to compile and
/// instantiate WebAssembly code
/// Params:
/// * `buffer_source`: A `Vec<u8>` containing the
/// binary code of the .wasm module you want to compile.
/// * `import_object`: An object containing the values to be imported
/// into the newly-created Instance, such as functions or
/// WebAssembly.Memory objects. There must be one matching property
/// for each declared import of the compiled module or else a
/// WebAssembly.LinkError is thrown.
/// Errors:
/// If the operation fails, the Result rejects with a
/// WebAssembly.CompileError, WebAssembly.LinkError, or
2018-10-14 18:37:42 +00:00
/// WebAssembly.RuntimeError, depending on the cause of the failure.
2018-10-14 19:41:59 +00:00
pub fn instantiate(buffer_source: Vec<u8>, import_object: Option<ImportObject>) -> Result<Module, ErrorKind> {
// TODO: This should be automatically validated when creating the Module
2018-10-14 18:37:42 +00:00
if !validate(&buffer_source) {
return Err(ErrorKind::CompileError("Module not valid".to_string()));
}
let module =
2018-10-14 19:41:59 +00:00
Module::from_bytes(buffer_source, triple!("riscv64"), None)?;
// let isa = isa::lookup(module.info.triple)
// .unwrap()
// .finish(module.info.flags);
// for func in module.info.function_bodies.values() {
// verifier::verify_function(func, &*isa)
// .map_err(|errors| panic!(pretty_verifier_error(func, Some(&*isa), None, errors)))
// .unwrap();
// };
Ok(module)
2018-10-14 11:59:11 +00:00
// Ok(environ)
2018-10-13 17:22:57 +00:00
// let now = Instant::now();
// let isa = construct_isa();
// println!("instantiate::init {:?}", now.elapsed());
// // if !validate(&buffer_source) {
// // return Err(ErrorKind::CompileError("Module not valid".to_string()));
// // }
// println!("instantiate::validation {:?}", now.elapsed());
// let mut module = Module::new();
// let environ = ModuleEnvironment::new(&*isa, &mut module);
// let translation = environ.translate(&buffer_source).map_err(|e| ErrorKind::CompileError(e.to_string()))?;
// println!("instantiate::compile and link {:?}", now.elapsed());
// let compilation = compile_and_link_module(&*isa, &translation)?;
// // let (compilation, relocations) = compile_module(&translation, &*isa)?;
// println!("instantiate::instantiate {:?}", now.elapsed());
// let mut instance = Instance::new(
// translation.module,
// &compilation,
// &translation.lazy.data_initializers,
// );
// println!("instantiate::execute {:?}", now.elapsed());
// let x = execute(&module, &compilation, &mut instance)?;
// // let instance = Instance {
// // tables: Vec::new(),
// // memories: Vec::new(),
// // globals: Vec::new(),
// // };
// Ok(ResultObject {
// module,
// compilation,
// instance: instance,
// })
}
/// The WebAssembly.compile() function compiles a WebAssembly.Module
/// from WebAssembly binary code. This function is useful if it
/// is necessary to a compile a module before it can be instantiated
/// (otherwise, the WebAssembly.instantiate() function should be used).
/// Params:
/// * `buffer_source`: A `Vec<u8>` containing the
/// binary code of the .wasm module you want to compile.
/// Errors:
/// If the operation fails, the Result rejects with a
/// WebAssembly.CompileError.
2018-10-14 19:41:59 +00:00
pub fn compile(buffer_source: Vec<u8>) -> Result<Module, Error> {
2018-10-13 17:22:57 +00:00
unimplemented!();
// let isa = construct_isa();
// let mut module = Module::new();
// let environ = ModuleEnvironment::new(&*isa, &mut module);
// let translation = environ.translate(&buffer_source).map_err(|e| ErrorKind::CompileError(e.to_string()))?;
// // compile_module(&translation, &*isa)?;
// compile_and_link_module(&*isa, &translation)?;
// Ok(module)
}
/// The WebAssembly.validate() function validates a given typed
/// array of WebAssembly binary code, returning whether the bytes
/// form a valid wasm module (true) or not (false).
/// Params:
/// * `buffer_source`: A `Vec<u8>` containing the
/// binary code of the .wasm module you want to compile.
pub fn validate(buffer_source: &Vec<u8>) -> bool {
wasmparser::validate(buffer_source, None)
}