ethonion10/v86
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

c2rust cleanup: More booleans

Browse source
This commit is contained in:
Fabian 2020-12-31 19:14:29 -06:00
parent 653f56726b
commit 1c185b971e
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/rust/cpu2/instructions.rs
View file

@ -3167,11 +3167,11 @@ pub unsafe fn instr_F9() {
pub unsafe fn instr_FA_without_fault() -> bool {
// cli
if !*protected_mode
|| 0 != if 0 != *flags & FLAG_VM {
(getiopl() == 3) as i32
|| if 0 != *flags & FLAG_VM {
getiopl() == 3
}
else {
(getiopl() >= *cpl as i32) as i32
getiopl() >= *cpl as i32
}
{
*flags &= !FLAG_INTERRUPT;
@ -3179,11 +3179,11 @@ pub unsafe fn instr_FA_without_fault() -> bool {
}
else if false
&& getiopl() < 3
&& 0 != if 0 != *flags & FLAG_VM {
*cr.offset(4) & CR4_VME
&& if 0 != *flags & FLAG_VM {
0 != *cr.offset(4) & CR4_VME
}
else {
(*cpl == 3 && 0 != *cr.offset(4) & CR4_PVI) as i32
*cpl == 3 && 0 != *cr.offset(4) & CR4_PVI
}
{
*flags &= !FLAG_VIF;
@ -3205,11 +3205,11 @@ pub unsafe fn instr_FB() {
// sti
let old_if = *flags & FLAG_INTERRUPT;
if !*protected_mode
|| 0 != if 0 != *flags & FLAG_VM {
(getiopl() == 3) as i32
|| if 0 != *flags & FLAG_VM {
getiopl() == 3
}
else {
(getiopl() >= *cpl as i32) as i32
getiopl() >= *cpl as i32
}
{
*flags |= FLAG_INTERRUPT;
@ -3220,11 +3220,11 @@ pub unsafe fn instr_FB() {
else if false
&& getiopl() < 3
&& *flags & FLAG_VIP == 0
&& 0 != if 0 != *flags & FLAG_VM {
*cr.offset(4) & CR4_VME
&& if 0 != *flags & FLAG_VM {
0 != *cr.offset(4) & CR4_VME
}
else {
(*cpl == 3 && 0 != *cr.offset(4) & CR4_PVI) as i32
*cpl == 3 && 0 != *cr.offset(4) & CR4_PVI
}
{
*flags |= FLAG_VIF

8
src/rust/cpu2/sse_instr.rs
View file

@ -350,10 +350,10 @@ pub unsafe fn sse_comparison(op: i32, x: f64, y: f64) -> bool {
0 => return x == y,
1 => return x < y,
2 => return x <= y,
3 => return 0 != x.is_nan() as i32 || 0 != y.is_nan() as i32,
4 => return x != y || 0 != x.is_nan() as i32 || 0 != y.is_nan() as i32,
5 => return x >= y || 0 != x.is_nan() as i32 || 0 != y.is_nan() as i32,
6 => return x > y || 0 != x.is_nan() as i32 || 0 != y.is_nan() as i32,
3 => return x.is_nan() || y.is_nan(),
4 => return x != y || x.is_nan() || y.is_nan(),
5 => return x >= y || x.is_nan() || y.is_nan(),
6 => return x > y || x.is_nan() || y.is_nan(),
7 => return !x.is_nan() && !y.is_nan(),
_ => {
dbg_assert!(false);