randrews/vulcan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Ross Andrews
2022-03-12 15:39:29 -06:00
parent 90f2177e5b
commit 19eb4d57f3
14 changed files with 444 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcore/src/cpu.rs
+6 -6
View File
@@ -154,8 +154,8 @@ impl CPU {
Opcode::Store => self.memory.poke8(x, y.to_bytes()[0]),
Opcode::Storew => self.memory.poke24(x, y),
Opcode::Setsdp => {
self.dp = x.into();
self.sp = y.into()
self.dp = x;
self.sp = y
}
Opcode::Brz => {
if y == 0 {
@@ -195,7 +195,7 @@ impl CPU {
self.push_data(x);
self.push_data(z)
}
Opcode::Jmp => return self.pop_data().into(),
Opcode::Jmp => return self.pop_data(),
Opcode::Jmpr => {
let x = i32::from(self.pop_data());
return self.pc + x;
@@ -203,9 +203,9 @@ impl CPU {
Opcode::Call => {
let x = self.pop_data();
self.push_call(self.pc + instruction.length as i32);
return x.into();
return x;
}
Opcode::Ret => return self.pop_call().into(),
Opcode::Ret => return self.pop_call(),
Opcode::Hlt => self.halted = true,
Opcode::Load => {
let x = self.pop_data();
@@ -217,7 +217,7 @@ impl CPU {
}
Opcode::Inton => self.int_enabled = true,
Opcode::Intoff => self.int_enabled = false,
Opcode::Setiv => self.iv = self.pop_data().into(),
Opcode::Setiv => self.iv = self.pop_data(),
Opcode::Sdp => {
self.push_data(self.sp);
self.push_data(self.dp + 3) // The +3 accounts for the word we're about to push