Rewrite interpreter generically (#2323)
* Rewrite interpreter generically This change re-implements the Cranelift interpreter to use generic values; this makes it possible to do abstract interpretation of Cranelift instructions. In doing so, the interpretation state is extracted from the `Interpreter` structure and is accessed via a `State` trait; this makes it possible to not only more clearly observe the interpreter's state but also to interpret using a dummy state (e.g. `ImmutableRegisterState`). This addition made it possible to implement more of the Cranelift instructions (~70%, ignoring the x86-specific instructions). * Replace macros with closures
This commit is contained in:
@@ -237,6 +237,7 @@ impl UnboxedValues {
|
||||
DataValue::F32(f) => ptr::write(p as *mut Ieee32, *f),
|
||||
DataValue::F64(f) => ptr::write(p as *mut Ieee64, *f),
|
||||
DataValue::V128(b) => ptr::write(p as *mut [u8; 16], *b),
|
||||
_ => unimplemented!(),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,9 @@
|
||||
|
||||
use crate::subtest::{Context, SubTest};
|
||||
use cranelift_codegen::{self, ir};
|
||||
use cranelift_interpreter::environment::Environment;
|
||||
use cranelift_interpreter::interpreter::{ControlFlow, Interpreter};
|
||||
use cranelift_interpreter::environment::FunctionStore;
|
||||
use cranelift_interpreter::interpreter::{Interpreter, InterpreterState};
|
||||
use cranelift_interpreter::step::ControlFlow;
|
||||
use cranelift_reader::{parse_run_command, TestCommand};
|
||||
use log::trace;
|
||||
use std::borrow::Cow;
|
||||
@@ -39,16 +40,16 @@ impl SubTest for TestInterpret {
|
||||
if let Some(command) = parse_run_command(comment.text, &func.signature)? {
|
||||
trace!("Parsed run command: {}", command);
|
||||
|
||||
let mut env = Environment::default();
|
||||
env.add(func.name.to_string(), func.clone().into_owned());
|
||||
let interpreter = Interpreter::new(env);
|
||||
let mut env = FunctionStore::default();
|
||||
env.add(func.name.to_string(), &func);
|
||||
|
||||
command
|
||||
.run(|func_name, args| {
|
||||
// Because we have stored function names with a leading %, we need to re-add it.
|
||||
let func_name = &format!("%{}", func_name);
|
||||
match interpreter.call_by_name(func_name, args) {
|
||||
Ok(ControlFlow::Return(results)) => Ok(results),
|
||||
let state = InterpreterState::default().with_function_store(env);
|
||||
match Interpreter::new(state).call_by_name(func_name, args) {
|
||||
Ok(ControlFlow::Return(results)) => Ok(results.to_vec()),
|
||||
Ok(_) => {
|
||||
panic!("Unexpected returned control flow--this is likely a bug.")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user