More code reorganization.

This commit is contained in:
Dan Gohman
2018-08-03 13:45:46 -07:00
parent 6659ef7018
commit 831b481f13
10 changed files with 177 additions and 180 deletions

View File

@@ -29,8 +29,8 @@ use std::path::Path;
use std::path::PathBuf;
use std::process::{exit, Command};
use tempdir::TempDir;
use wasmtime_execute::{compile_and_link_module, execute};
use wasmtime_runtime::{Instance, Module, ModuleEnvironment};
use wasmtime_execute::{compile_and_link_module, execute, Instance};
use wasmtime_runtime::{Module, ModuleEnvironment};
const USAGE: &str = "
Wasm to Cranelift IL translation utility.
@@ -125,8 +125,8 @@ fn handle_module(args: &Args, path: PathBuf, isa: &TargetIsa) -> Result<(), Stri
let instance = match compile_and_link_module(isa, &translation) {
Ok(compilation) => {
let mut instance =
Instance::new(compilation.module, &translation.lazy.data_initializers);
execute(&compilation, &mut instance)?;
Instance::new(translation.module, &translation.lazy.data_initializers);
execute(&translation.module, &compilation, &mut instance)?;
instance
}
Err(s) => {