xenia/fox32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If popping directly to memory fails, don't change the stack pointer

Browse Source
This commit is contained in:
Ry 2022-10-10 18:39:14 -07:00
parent bfc0ae96d1
commit b496d2eb90
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/cpu.rs
View File

@ -2521,19 +2521,28 @@ impl Cpu {
Size::Byte => { Size::Byte => {
if should_run { if should_run {
let value = self.pop_stack_8()?; let value = self.pop_stack_8()?;
self.bus.memory.write_8(pointer, value)?; let success = self.bus.memory.write_8(pointer, value);
if let None = success {
self.stack_pointer = self.stack_pointer.overflowing_sub(1).0;
}
} }
} }
Size::Half => { Size::Half => {
if should_run { if should_run {
let value = self.pop_stack_16()?; let value = self.pop_stack_16()?;
self.bus.memory.write_16(pointer, value)?; let success = self.bus.memory.write_16(pointer, value);
if let None = success {
self.stack_pointer = self.stack_pointer.overflowing_sub(2).0;
}
} }
} }
Size::Word => { Size::Word => {
if should_run { if should_run {
let value = self.pop_stack_32()?; let value = self.pop_stack_32()?;
self.bus.memory.write_32(pointer, value)?; let success = self.bus.memory.write_32(pointer, value);
if let None = success {
self.stack_pointer = self.stack_pointer.overflowing_sub(4).0;
}
} }
} }
} }
@ -2545,19 +2554,28 @@ impl Cpu {
Size::Byte => { Size::Byte => {
if should_run { if should_run {
let value = self.pop_stack_8()?; let value = self.pop_stack_8()?;
self.bus.memory.write_8(pointer, value)?; let success = self.bus.memory.write_8(pointer, value);
if let None = success {
self.stack_pointer = self.stack_pointer.overflowing_sub(1).0;
}
} }
} }
Size::Half => { Size::Half => {
if should_run { if should_run {
let value = self.pop_stack_16()?; let value = self.pop_stack_16()?;
self.bus.memory.write_16(pointer, value)?; let success = self.bus.memory.write_16(pointer, value);
if let None = success {
self.stack_pointer = self.stack_pointer.overflowing_sub(2).0;
}
} }
} }
Size::Word => { Size::Word => {
if should_run { if should_run {
let value = self.pop_stack_32()?; let value = self.pop_stack_32()?;
self.bus.memory.write_32(pointer, value)?; let success = self.bus.memory.write_32(pointer, value);
if let None = success {
self.stack_pointer = self.stack_pointer.overflowing_sub(4).0;
}
} }
} }
} }