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

Make FuncEnvironment independent from ModuleEnvironment (formerly WasmRuntime).

Browse Source 
This renames WasmRuntime to ModuleEnvironment, and makes several changes
to allow for more flexible compilation.

ModuleEnvironment no longer derives from FuncEnvironment, and no longer
has the `begin_translation` and `next_translation` functions, so that
independent `FuncEnvironment` instances can operate within the same
module.

Also, this obviates the rest of TranslationResult, as it moves processing
of function bodies into the environment. The DummyEnvironment implementation
gives an example of decoding the function bodies as they are parsed, however
other implementation strategies are now possible.
This commit is contained in:
Dan Gohman
2017-10-10 15:21:29 -07:00
parent d4c0c5babc
commit 733870aee4
9 changed files with 245 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/wasm/src/func_translator.rs
View File

@@ -233,7 +233,7 @@ fn cur_srcloc(reader: &BinaryReader) -> ir::SourceLoc {
mod tests {
use cretonne::{ir, Context};
use cretonne::ir::types::I32;
use runtime::{DummyRuntime, FuncEnvironment};
use runtime::{DummyEnvironment, FuncEnvironment};
use super::FuncTranslator;
#[test]
@@ -252,7 +252,7 @@ mod tests {
];
let mut trans = FuncTranslator::new();
let mut runtime = DummyRuntime::default();
let runtime = DummyEnvironment::default();
let mut ctx = Context::new();
ctx.func.name = ir::FunctionName::new("small1");
@@ -263,9 +263,11 @@ mod tests {
ir::ArgumentType::new(I32),
);
trans.translate(&BODY, &mut ctx.func, &mut runtime).unwrap();
trans
.translate(&BODY, &mut ctx.func, &mut runtime.func_env())
.unwrap();
dbg!("{}", ctx.func.display(None));
ctx.verify(runtime.flags()).unwrap();
ctx.verify(runtime.func_env().flags()).unwrap();
}
#[test]
@@ -285,7 +287,7 @@ mod tests {
];
let mut trans = FuncTranslator::new();
let mut runtime = DummyRuntime::default();
let runtime = DummyEnvironment::default();
let mut ctx = Context::new();
ctx.func.name = ir::FunctionName::new("small2");
@@ -296,9 +298,11 @@ mod tests {
ir::ArgumentType::new(I32),
);
trans.translate(&BODY, &mut ctx.func, &mut runtime).unwrap();
trans
.translate(&BODY, &mut ctx.func, &mut runtime.func_env())
.unwrap();
dbg!("{}", ctx.func.display(None));
ctx.verify(runtime.flags()).unwrap();
ctx.verify(runtime.func_env().flags()).unwrap();
}
#[test]
@@ -327,7 +331,7 @@ mod tests {
];
let mut trans = FuncTranslator::new();
let mut runtime = DummyRuntime::default();
let runtime = DummyEnvironment::default();
let mut ctx = Context::new();
ctx.func.name = ir::FunctionName::new("infloop");
@@ -335,8 +339,10 @@ mod tests {
ir::ArgumentType::new(I32),
);
trans.translate(&BODY, &mut ctx.func, &mut runtime).unwrap();
trans
.translate(&BODY, &mut ctx.func, &mut runtime.func_env())
.unwrap();
dbg!("{}", ctx.func.display(None));
ctx.verify(runtime.flags()).unwrap();
ctx.verify(runtime.func_env().flags()).unwrap();
}
}