preserve-emulation/gopher64
1
0
Fork 0
mirror of https://github.com/gopher64/gopher64.git synced 2026-07-11 01:25:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

small cleanup

Browse Source
This commit is contained in:
Logan McNaughton
2023-10-08 08:27:57 -06:00
parent c74d0e4c40
commit a8261e82a0
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/device/cpu.rs
+7 -5
View File
@@ -234,7 +234,8 @@ pub fn run(device: &mut device::Device) {
device.cpu.running = 1;
while device.cpu.running == 1 {
device.cpu.gpr[0] = 0; // gpr 0 is read only
let (phys_address, cached, err) = device::memory::translate_address(
let (cached, err);
(device.cpu.pc_phys, cached, err) = device::memory::translate_address(
device,
device.cpu.pc,
device::memory::AccessType::Read,
@@ -242,17 +243,18 @@ pub fn run(device: &mut device::Device) {
if err {
continue; // TLB exception
}
device.cpu.pc_phys = phys_address;
if cached {
device::cache::icache_fetch(device, phys_address)
device::cache::icache_fetch(device, device.cpu.pc_phys)
} else {
let opcode = device.memory.memory_map_read[(phys_address >> 16) as usize](
let opcode = device.memory.memory_map_read[(device.cpu.pc_phys >> 16) as usize](
device,
phys_address,
device.cpu.pc_phys,
device::memory::AccessSize::Word,
);
device::cpu::decode_opcode(device, opcode)(device, opcode);
}
match device.cpu.branch_state.state {
State::Step => device.cpu.pc += 4,
State::Take => {