koniifer/ableos
1
1
Fork 1
forked from AbleOS/ableos
Code Pull requests Activity

Fixed immediate ops

Browse source
This commit is contained in:
Erin 2023-11-13 00:12:18 +01:00
parent aca8045a98
commit c5c8d23470
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
hbvm/src/vmrun.rs
View file

@ -19,7 +19,7 @@ macro_rules! handler {
($self:expr, |$ty:ident ($($ident:pat),* $(,)?)| $expr:expr) => {{ ($self:expr, |$ty:ident ($($ident:pat),* $(,)?)| $expr:expr) => {{
let $ty($($ident),*) = $self.decode::<$ty>(); let $ty($($ident),*) = $self.decode::<$ty>();
#[allow(clippy::no_effect)] let e = $expr; #[allow(clippy::no_effect)] let e = $expr;
$self.bump_pc::<$ty, true>(); $self.bump_pc::<$ty>();
e e
}}; }};
} }
@ -57,11 +57,11 @@ where
unsafe { unsafe {
match self.memory.prog_read::<u8>(self.pc as _) { match self.memory.prog_read::<u8>(self.pc as _) {
UN => { UN => {
self.bump_pc::<OpsN, true>(); self.bump_pc::<OpsN>();
return Err(VmRunError::Unreachable); return Err(VmRunError::Unreachable);
} }
TX => { TX => {
self.bump_pc::<OpsN, true>(); self.bump_pc::<OpsN>();
return Ok(VmRunOk::End); return Ok(VmRunOk::End);
} }
NOP => handler!(self, |OpsN()| ()), NOP => handler!(self, |OpsN()| ()),
@ -217,7 +217,7 @@ where
// We are done, shift program counter // We are done, shift program counter
core::task::Poll::Ready(Ok(())) => { core::task::Poll::Ready(Ok(())) => {
self.copier = None; self.copier = None;
self.bump_pc::<OpsRRH, true>(); self.bump_pc::<OpsRRH>();
} }
// Error, shift program counter (for consistency) // Error, shift program counter (for consistency)
// and yield error // and yield error
@ -270,7 +270,7 @@ where
if self.read_reg(a0).cast::<u64>() != self.read_reg(a1).cast::<u64>() { if self.read_reg(a0).cast::<u64>() != self.read_reg(a1).cast::<u64>() {
self.pc = self.pcrel(ja, 3); self.pc = self.pcrel(ja, 3);
} else { } else {
self.bump_pc::<OpsRRP, true>(); self.bump_pc::<OpsRRP>();
} }
} }
JLTS => self.cond_jmp::<u64>(Ordering::Less), JLTS => self.cond_jmp::<u64>(Ordering::Less),
@ -283,11 +283,11 @@ where
self.timer = self.timer.wrapping_add(1); self.timer = self.timer.wrapping_add(1);
} }
self.bump_pc::<OpsN, true>(); self.bump_pc::<OpsN>();
return Ok(VmRunOk::Ecall); return Ok(VmRunOk::Ecall);
} }
EBP => { EBP => {
self.bump_pc::<OpsN, true>(); self.bump_pc::<OpsN>();
return Ok(VmRunOk::Breakpoint); return Ok(VmRunOk::Breakpoint);
} }
FADD32 => self.binary_op::<f32>(ops::Add::add), FADD32 => self.binary_op::<f32>(ops::Add::add),
@ -373,10 +373,8 @@ where
/// Bump instruction pointer /// Bump instruction pointer
#[inline(always)] #[inline(always)]
fn bump_pc<T: Copy, const PAST_OP: bool>(&mut self) { fn bump_pc<T: Copy>(&mut self) {
self.pc = self self.pc = self.pc.wrapping_add(core::mem::size_of::<T>());
.pc
.wrapping_add(core::mem::size_of::<T>() + PAST_OP as usize);
} }
/// Decode instruction operands /// Decode instruction operands
@ -442,17 +440,19 @@ where
tg, tg,
op(self.read_reg(a0).cast::<T>(), self.read_reg(a1).cast::<T>()), op(self.read_reg(a0).cast::<T>(), self.read_reg(a1).cast::<T>()),
); );
self.bump_pc::<OpsRRR, true>(); self.bump_pc::<OpsRRR>();
} }
/// Perform binary operation over register and immediate /// Perform binary operation over register and immediate
#[inline(always)] #[inline(always)]
unsafe fn binary_op_imm<T: ValueVariant>(&mut self, op: impl Fn(T, T) -> T) { unsafe fn binary_op_imm<T: ValueVariant>(&mut self, op: impl Fn(T, T) -> T) {
let OpsRR(tg, reg) = self.decode(); #[derive(Clone, Copy)]
let imm: T = self.decode(); #[repr(packed)]
struct OpsRRImm<I>(OpsRR, I);
let OpsRRImm::<T>(OpsRR(tg, reg), imm) = self.decode();
self.write_reg(tg, op(self.read_reg(reg).cast::<T>(), imm)); self.write_reg(tg, op(self.read_reg(reg).cast::<T>(), imm));
self.bump_pc::<OpsRR, false>(); self.bump_pc::<OpsRRImm<T>>();
self.bump_pc::<T, true>();
} }
/// Perform binary operation over register and shift immediate /// Perform binary operation over register and shift immediate
@ -466,7 +466,7 @@ where
self.read_reg(a1).cast::<u32>(), self.read_reg(a1).cast::<u32>(),
), ),
); );
self.bump_pc::<OpsRRR, true>(); self.bump_pc::<OpsRRR>();
} }
/// Perform binary operation over register and shift immediate /// Perform binary operation over register and shift immediate
@ -474,7 +474,7 @@ where
unsafe fn binary_op_ims<T: ValueVariant>(&mut self, op: impl Fn(T, u32) -> T) { unsafe fn binary_op_ims<T: ValueVariant>(&mut self, op: impl Fn(T, u32) -> T) {
let OpsRRB(tg, reg, imm) = self.decode(); let OpsRRB(tg, reg, imm) = self.decode();
self.write_reg(tg, op(self.read_reg(reg).cast::<T>(), imm.into())); self.write_reg(tg, op(self.read_reg(reg).cast::<T>(), imm.into()));
self.bump_pc::<OpsRRW, true>(); self.bump_pc::<OpsRRW>();
} }
/// Fused division-remainder /// Fused division-remainder
@ -540,7 +540,7 @@ where
{ {
self.pc = self.pcrel(ja, 3); self.pc = self.pcrel(ja, 3);
} else { } else {
self.bump_pc::<OpsRRP, true>(); self.bump_pc::<OpsRRP>();
} }
} }