portal/waffle
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Better interpreter error results

Browse source
This commit is contained in:
Chris Fallin 2023-04-17 16:01:54 -07:00
parent 174ca4c57c
commit 2c84906d77
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/interp.rs
View file

@ -26,7 +26,7 @@ type MultiVal = SmallVec<[ConstVal; 2]>;
pub enum InterpResult { pub enum InterpResult {
Ok(MultiVal), Ok(MultiVal),
Exit, Exit,
Trap, Trap(Func, Block, u32),
OutOfFuel, OutOfFuel,
TraceHandlerQuit, TraceHandlerQuit,
} }
@ -127,7 +127,7 @@ impl InterpContext {
} }
log::trace!("Interpreting block {}", frame.cur_block); log::trace!("Interpreting block {}", frame.cur_block);
for &inst in &body.blocks[frame.cur_block].insts { for (inst_idx, &inst) in body.blocks[frame.cur_block].insts.iter().enumerate() {
log::trace!("Evaluating inst {}", inst); log::trace!("Evaluating inst {}", inst);
let result = match &body.values[inst] { let result = match &body.values[inst] {
&ValueDef::Alias(_) => smallvec![], &ValueDef::Alias(_) => smallvec![],
@ -191,7 +191,11 @@ impl InterpContext {
Some(result) => result, Some(result) => result,
None => { None => {
log::trace!("const_eval failed on {:?} args {:?}", op, args); log::trace!("const_eval failed on {:?} args {:?}", op, args);
return InterpResult::Trap; return InterpResult::Trap(
frame.func,
frame.cur_block,
inst_idx as u32,
);
} }
}; };
smallvec![result] smallvec![result]
@ -227,8 +231,12 @@ impl InterpContext {
} }
match &body.blocks[frame.cur_block].terminator { match &body.blocks[frame.cur_block].terminator {
&Terminator::None => return InterpResult::Trap, &Terminator::None => {
&Terminator::Unreachable => return InterpResult::Trap, return InterpResult::Trap(frame.func, frame.cur_block, u32::MAX)
}
&Terminator::Unreachable => {
return InterpResult::Trap(frame.func, frame.cur_block, u32::MAX)
}
&Terminator::Br { ref target } => { &Terminator::Br { ref target } => {
frame.apply_target(body, target); frame.apply_target(body, target);
} }