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

Rename to wasmtime. It's wasmtime!

Browse Source 
Also, update to Cretonne 0.13.0.
This commit is contained in:
Dan Gohman
2018-07-02 16:20:22 -07:00
parent 73639e4557
commit c612d48b33
14 changed files with 87 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.rs
View File

@@ -1,4 +1,4 @@
//! CLI tool to use the functions provided by the [wasmstandalone](../wasmstandalone/index.html)
//! CLI tool to use the functions provided by the [wasmtime](../wasmtime/index.html)
//! crate.
//!
//! Reads Wasm binary files (one Wasm module per file), translates the functions' code to Cretonne
@@ -9,8 +9,8 @@ extern crate cretonne_codegen;
extern crate cretonne_native;
extern crate cretonne_wasm;
extern crate docopt;
extern crate wasmstandalone_execute;
extern crate wasmstandalone_runtime;
extern crate wasmtime_execute;
extern crate wasmtime_runtime;
#[macro_use]
extern crate serde_derive;
extern crate tempdir;
@@ -29,8 +29,8 @@ use std::path::Path;
use std::path::PathBuf;
use std::process::{exit, Command};
use tempdir::TempDir;
use wasmstandalone_execute::{compile_module, execute};
use wasmstandalone_runtime::{Instance, Module, ModuleEnvironment};
use wasmtime_execute::{compile_module, execute};
use wasmtime_runtime::{Instance, Module, ModuleEnvironment};
const USAGE: &str = "
Wasm to Cretonne IL translation utility.
@@ -38,8 +38,8 @@ Takes a binary WebAssembly module and returns its functions in Cretonne IL forma
The translation is dependent on the environment chosen.
Usage:
wasmstandalone [-mop] <file>...
wasmstandalone --help | --version
wasmtime [-mop] <file>...
wasmtime --help | --version
Options:
-o, --optimize runs optimization passes on the translated functions

10
src/wasm2obj.rs
View File

@@ -8,8 +8,8 @@ extern crate cretonne_codegen;
extern crate cretonne_native;
extern crate cretonne_wasm;
extern crate docopt;
extern crate wasmstandalone_obj;
extern crate wasmstandalone_runtime;
extern crate wasmtime_obj;
extern crate wasmtime_runtime;
#[macro_use]
extern crate serde_derive;
extern crate faerie;
@@ -26,7 +26,7 @@ use std::io::prelude::*;
use std::path::Path;
use std::path::PathBuf;
use std::process;
use wasmstandalone_obj::emit_module;
use wasmtime_obj::emit_module;
const USAGE: &str = "
Wasm to native object translation utility.
@@ -90,8 +90,8 @@ fn handle_module(path: PathBuf, output: &str) -> Result<(), String> {
});
let isa = isa_builder.finish(settings::Flags::new(flag_builder));
let mut module = wasmstandalone_runtime::Module::new();
let mut environ = wasmstandalone_runtime::ModuleEnvironment::new(&*isa, &mut module);
let mut module = wasmtime_runtime::Module::new();
let mut environ = wasmtime_runtime::ModuleEnvironment::new(&*isa, &mut module);
translate_module(&data, &mut environ).map_err(|e| e.to_string())?;
let mut obj = Artifact::new(isa.triple().clone(), String::from(output));