T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrating to wabt::wat2wasm (#29)

Browse Source 
* Add test_environ_translate

* Migrating to wabt::wat2wasm
This commit is contained in:
Frank Rehberger
2018-11-30 17:44:44 +01:00
committed by Dan Gohman
parent ff25397c9e
commit ec940ee8af
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@@ -28,13 +28,10 @@ wasmtime-obj = { path = "lib/obj" }
docopt = "1.0.1" docopt = "1.0.1"
serde = "1.0.75" serde = "1.0.75"
serde_derive = "1.0.75" serde_derive = "1.0.75"
tempdir = "*"
faerie = "0.6.0" faerie = "0.6.0"
target-lexicon = { version = "0.2.0", default-features = false } target-lexicon = { version = "0.2.0", default-features = false }
pretty_env_logger = "0.2.5" pretty_env_logger = "0.2.5"
file-per-thread-logger = "0.1.1" file-per-thread-logger = "0.1.1"
[dev-dependencies]
wabt = "0.7" wabt = "0.7"
[workspace] [workspace]

24
src/main.rs
View File

@@ -44,9 +44,6 @@ extern crate wasmtime_execute;
extern crate serde_derive; extern crate serde_derive;
extern crate file_per_thread_logger; extern crate file_per_thread_logger;
extern crate pretty_env_logger; extern crate pretty_env_logger;
extern crate tempdir;
#[cfg(test)]
extern crate wabt; extern crate wabt;
use cranelift_codegen::isa::TargetIsa; use cranelift_codegen::isa::TargetIsa;
@@ -62,8 +59,7 @@ use std::io::prelude::*;
use std::io::stdout; use std::io::stdout;
use std::path::Path; use std::path::Path;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::{exit, Command}; use std::process::exit;
use tempdir::TempDir;
use wasmtime_environ::{Module, ModuleEnvironment}; use wasmtime_environ::{Module, ModuleEnvironment};
use wasmtime_execute::{compile_and_link_module, execute, finish_instantiation, Instance}; use wasmtime_execute::{compile_and_link_module, execute, finish_instantiation, Instance};
@@ -148,23 +144,9 @@ fn main() {
fn handle_module(args: &Args, path: PathBuf, isa: &TargetIsa) -> Result<(), String> { fn handle_module(args: &Args, path: PathBuf, isa: &TargetIsa) -> Result<(), String> {
let mut data = read_to_end(path.clone()).map_err(|err| String::from(err.description()))?; let mut data = read_to_end(path.clone()).map_err(|err| String::from(err.description()))?;
// if data is using wat-format, first convert data to wasm
if !data.starts_with(&[b'\0', b'a', b's', b'm']) { if !data.starts_with(&[b'\0', b'a', b's', b'm']) {
let tmp_dir = TempDir::new("cranelift-wasm").unwrap(); data = wabt::wat2wasm(data).map_err(|err| String::from(err.description()))?;
let file_path = tmp_dir.path().join("module.wasm");
File::create(file_path.clone()).unwrap();
Command::new("wat2wasm")
.arg(path.clone())
.arg("-o")
.arg(file_path.to_str().unwrap())
.output()
.or_else(|e| {
if let io::ErrorKind::NotFound = e.kind() {
return Err(String::from("wat2wasm not found"));
} else {
return Err(String::from(e.description()));
}
})?;
data = read_to_end(file_path).map_err(|err| String::from(err.description()))?;
} }
let mut module = Module::new(); let mut module = Module::new();
let environ = ModuleEnvironment::new(isa, &mut module); let environ = ModuleEnvironment::new(isa, &mut module);