IntoTheNight/holey-bytes
1
0
Fork 0
forked from AbleOS/holey-bytes
Code Issues Pull requests Packages Projects Releases Wiki Activity

VM exceptions

Browse source
This commit is contained in:
Erin 2023-06-08 00:27:53 +02:00 committed by ondra05
parent 859e14daa6
commit fce7a96e50
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hbvm/src/vm/mod.rs
View file

@ -36,7 +36,7 @@ macro_rules! load {
*$self.reg_mut(tg) = $self *$self.reg_mut(tg) = $self
.memory .memory
.load::<$size>($self.reg(a0).int() + offset) .load::<$size>($self.reg(a0).int() + offset)
.unwrap(); .ok_or(Exception::LoadAccess)?;
}}; }};
} }
@ -46,7 +46,7 @@ macro_rules! store {
$self $self
.memory .memory
.store::<$size>($self.reg(a0).int() + offset, *$self.reg(src)) .store::<$size>($self.reg(a0).int() + offset, *$self.reg(src))
.unwrap(); .map_err(|_| Exception::StoreAccess)?;
}}; }};
} }
@ -74,11 +74,11 @@ impl<'a> Vm<'a> {
Ok(unsafe { Self::new_unchecked(program) }) Ok(unsafe { Self::new_unchecked(program) })
} }
pub fn run(&mut self) { pub fn run(&mut self) -> Result<(), Exception> {
use hbbytecode::opcode::*; use hbbytecode::opcode::*;
loop { loop {
let Some(&opcode) = self.program.get(self.pc) let Some(&opcode) = self.program.get(self.pc)
else { return }; else { return Ok(()) };
unsafe { unsafe {
match opcode { match opcode {