mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use throw_machine_stop macro

Browse Source
This commit is contained in:
Ralf Jung 2019-12-02 11:02:11 +01:00
parent c388361cc2
commit ab000997db
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shims/foreign_items.rs
View File

@ -154,8 +154,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
"exit" | "ExitProcess" => {
// it's really u32 for ExitProcess, but we have to put it into the `Exit` variant anyway
let code = this.read_scalar(args[0])?.to_i32()?;
let ti = Box::new(TerminationInfo::Exit(code.into()));
return Err(InterpError::MachineStop(ti).into());
throw_machine_stop!(TerminationInfo::Exit(code.into()));
}
_ => {
if let Some(p) = ret {

3
src/shims/intrinsics.rs
View File

@ -34,8 +34,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
// Handle diverging intrinsics.
let (dest, ret) = match intrinsic_name {
"abort" => {
let ti = Box::new(TerminationInfo::Abort);
return Err(InterpError::MachineStop(ti).into());
throw_machine_stop!(TerminationInfo::Abort);
}
"miri_start_panic" => return this.handle_miri_start_panic(args, unwind),
_ => {