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

cranelift: Fix brz,brnz instructions in the interpreter

Browse Source
This commit is contained in:
Afonso Bordado
2021-07-02 13:53:24 +01:00
committed by Andrew Brown
parent d33f8337b3
commit 004af01a88
2 changed files with 208 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cranelift/interpreter/src/step.rs
View File

@@ -133,8 +133,16 @@ where
// Interpret a Cranelift instruction.
Ok(match inst.opcode() {
Opcode::Jump | Opcode::Fallthrough => ControlFlow::ContinueAt(branch(), args()?),
Opcode::Brz => branch_when(!arg(0)?.into_bool()?)?,
Opcode::Brnz => branch_when(arg(0)?.into_bool()?)?,
Opcode::Brz => branch_when(match arg(0)?.ty() {
ty if ty.is_bool() => !arg(0)?.into_bool()?,
ty if ty.is_int() => arg(0)?.into_int()? == 0,
_ => return Err(StepError::ValueError(ValueError::InvalidValue(types::B1))),
})?,
Opcode::Brnz => branch_when(match arg(0)?.ty() {
ty if ty.is_bool() => arg(0)?.into_bool()?,
ty if ty.is_int() => arg(0)?.into_int()? != 0,
_ => return Err(StepError::ValueError(ValueError::InvalidValue(types::B1))),
})?,
Opcode::BrIcmp => branch_when(icmp(inst.cond_code().unwrap(), &arg(1)?, &arg(2)?)?)?,
Opcode::Brif => branch_when(state.has_iflag(inst.cond_code().unwrap()))?,
Opcode::Brff => branch_when(state.has_fflag(inst.fp_cond_code().unwrap()))?,