arrdem/uxn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Break out step()

Browse source
This commit is contained in:
Reid 'arrdem' McKenzie 2022-12-23 00:13:19 -07:00
parent 09bb1854bf
commit b7ade42661
1 changed files with 287 additions and 282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/vm.rs
View file

@ -12,6 +12,7 @@ pub enum UxnError {
StackError(StackError),
MemoryError(MemoryError),
ExecutionLimit(u16),
Break,
ArithmeticOverflow,
ArithmeticUnderflow,
DivisionByZero,
@ -111,22 +112,6 @@ impl Uxn {
// Run one clock cycle (instruction)
pub fn step(&mut self) -> Result<(), UxnError> {
Ok(())
}
pub fn run(&mut self, limit: u16) -> Result<(), UxnError> {
let mut executed = 0;
'run: loop {
if executed == limit {
return Err(UxnError::ExecutionLimit(executed));
}
if self.is_halted() {
break;
}
executed += 1;
match self.lda1(self.pc) {
Err(e) => return Err(UxnError::MemoryError(e)),
Ok(opcode) => {
@ -189,7 +174,7 @@ impl Uxn {
match (kflag, rflag, sflag, icode) {
(0, 0, 0, 0x00) => {
// BRK
break 'run;
return Err(UxnError::Break);
}
(_, _, _, 0x00) => {
// LIT
@ -408,6 +393,26 @@ impl Uxn {
}
}
}
Ok(())
}
pub fn run(&mut self, limit: u16) -> Result<(), UxnError> {
let mut executed = 0;
loop {
if executed == limit {
return Err(UxnError::ExecutionLimit(executed));
}
if self.is_halted() {
break;
}
executed += 1;
match self.step() {
Err(e) => return Err(e),
Ok(()) => continue,
};
}
Ok(())
}