MightyPork/crsn
1
1
Fork 2
Code Issues 15 Pull Requests Releases Wiki Activity

cleanup, auto deref Wd, Wr, RdObj

Browse Source
This commit is contained in:
MightyPork
2020-10-10 15:45:01 +02:00
parent 7a3cb539e1
commit 982ba27ed3
7 changed files with 119 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crsn_arith/src/exec.rs
+48 -48
View File
@@ -19,13 +19,13 @@ impl OpTrait for ArithOp {
match self {
ArithOp::Test { a } => {
state.clear_status();
let res = state.read(*a)?;
let res = state.read(a)?;
state.update_status(res);
}
ArithOp::Compare { a, b } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*b)?;
let x = state.read(a)?;
let y = state.read(b)?;
state.set_flag(Cond::Equal, x == y);
state.set_flag(Cond::Lower, x < y);
state.set_flag(Cond::Greater, x > y);
@@ -36,9 +36,9 @@ impl OpTrait for ArithOp {
}
ArithOp::RangeTest { val, a, b } => {
state.clear_status();
let val = state.read(*val)?;
let a = state.read(*a)?;
let b = state.read(*b)?;
let val = state.read(val)?;
let a = state.read(a)?;
let b = state.read(b)?;
state.set_flag(Cond::Equal, val >= a && val <= b);
state.set_flag(Cond::Lower, val < a);
state.set_flag(Cond::Greater, val > b);
@@ -46,8 +46,8 @@ impl OpTrait for ArithOp {
}
ArithOp::Add { dst, a, b } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*b)?;
let x = state.read(a)?;
let y = state.read(b)?;
let (res, ov) = if let Some(v) = x.checked_add(y) {
(v, false)
} else {
@@ -55,12 +55,12 @@ impl OpTrait for ArithOp {
};
state.update_status(res);
state.set_flag(Cond::Overflow, ov);
state.write(*dst, res)?;
state.write(dst, res)?;
}
ArithOp::Sub { dst, a, b } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*b)?;
let x = state.read(a)?;
let y = state.read(b)?;
let (res, ov) = if let Some(v) = x.checked_sub(y) {
(v, false)
} else {
@@ -68,12 +68,12 @@ impl OpTrait for ArithOp {
};
state.update_status(res);
state.set_flag(Cond::Overflow, ov);
state.write(*dst, res)?;
state.write(dst, res)?;
}
ArithOp::Mul { dst, a, b } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*b)?;
let x = state.read(a)?;
let y = state.read(b)?;
let res = if let Some(v) = x.checked_mul(y) {
v
} else {
@@ -81,12 +81,12 @@ impl OpTrait for ArithOp {
x.wrapping_mul(y)
};
state.update_status(res);
state.write(*dst, res)?;
state.write(dst, res)?;
}
ArithOp::Div { dst, rem, a, div } => {
state.clear_status();
let x = state.read(*a)?;
let d = state.read(*div)?;
let x = state.read(a)?;
let d = state.read(div)?;
if d == 0 {
state.set_flag(Cond::Invalid, true);
} else {
@@ -97,14 +97,14 @@ impl OpTrait for ArithOp {
};
state.update_status(res);
state.set_flag(Cond::Overflow, ov);
state.write(*dst, res)?;
state.write(*rem, remainder)?;
state.write(dst, res)?;
state.write(rem, remainder)?;
}
}
ArithOp::Mod { dst, a, div } => {
state.clear_status();
let x = state.read(*a)?;
let d = state.read(*div)?;
let x = state.read(a)?;
let d = state.read(div)?;
if d == 0 {
state.set_flag(Cond::Invalid, true);
} else {
@@ -115,90 +115,90 @@ impl OpTrait for ArithOp {
};
state.update_status(remainder);
state.set_flag(Cond::Overflow, ov);
state.write(*dst, remainder)?;
state.write(dst, remainder)?;
}
}
ArithOp::And { dst, a, b } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*b)?;
let x = state.read(a)?;
let y = state.read(b)?;
let res = x & y;
state.update_status(res);
state.write(*dst, res)?;
state.write(dst, res)?;
}
ArithOp::Or { dst, a, b } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*b)?;
let x = state.read(a)?;
let y = state.read(b)?;
let res = x | y;
state.update_status(res);
state.write(*dst, res)?;
state.write(dst, res)?;
}
ArithOp::Xor { dst, a, b } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*b)?;
let x = state.read(a)?;
let y = state.read(b)?;
let res = x ^ y;
state.update_status(res);
state.write(*dst, res)?;
state.write(dst, res)?;
}
ArithOp::Cpl { dst, a } => {
state.clear_status();
let x = state.read(*a)?;
let x = state.read(a)?;
let res = !x;
state.update_status(res);
state.write(*dst, res)?;
state.write(dst, res)?;
}
ArithOp::Rol { dst, a, n } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*n)?;
let x = state.read(a)?;
let y = state.read(n)?;
if y > u32::MAX as u64 {
state.set_flag(Cond::Invalid, true);
} else {
let res = x.rotate_left(y as u32);
state.update_status(res);
state.write(*dst, res)?;
state.write(dst, res)?;
}
}
ArithOp::Ror { dst, a, n } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*n)?;
let x = state.read(a)?;
let y = state.read(n)?;
if y > u32::MAX as u64 {
state.set_flag(Cond::Invalid, true);
} else {
let res = x.rotate_right(y as u32);
state.update_status(res);
state.write(*dst, res)?;
state.write(dst, res)?;
}
}
ArithOp::Lsl { dst, a, n } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*n)?;
let x = state.read(a)?;
let y = state.read(n)?;
let res = x << y;
state.update_status(res);
state.write(*dst, res)?;
state.write(dst, res)?;
}
ArithOp::Lsr { dst, a, n } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*n)?;
let x = state.read(a)?;
let y = state.read(n)?;
let res = x >> y;
state.update_status(res);
state.write(*dst, res)?;
state.write(dst, res)?;
}
ArithOp::Asr { dst, a, n } => {
state.clear_status();
let x = state.read(*a)?;
let y = state.read(*n)?;
let x = state.read(a)?;
let y = state.read(n)?;
if y > u32::MAX as u64 {
state.set_flag(Cond::Invalid, true);
} else {
let res = x.signed_shr(y as u32);
state.update_status(res);
state.write(*dst, res)?;
state.write(dst, res)?;
}
}
}