FranLMSP/snes
1
0
Fork 0
mirror of https://github.com/FranLMSP/snes.git synced 2026-10-03 07:55:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

read_external function

Browse Source
This commit is contained in:
FranLMSP
2023-07-07 19:13:31 -05:00
parent e7a40db745
commit e6d97f7203
5 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
snes-frontend/src/cpu.rs
+10 -11
View File
@@ -7,22 +7,21 @@ pub struct CPUDisassembler {
}
impl CPUDisassembler {
// TODO FIXME: please do not mutate the emulator state to fetch upcoming instructions
pub fn get_next_instruction(emulator: &mut Emulator) -> String {
let opcode = emulator.bus.read(emulator.cpu.registers.get_pc_address());
pub fn get_next_instruction(emulator: &Emulator) -> String {
let opcode = emulator.bus.read_external(emulator.cpu.registers.get_pc_address());
let is_cpu_16bit = emulator.cpu.registers.is_16bit_mode();
let is_index_16bit = emulator.cpu.registers.is_16bit_index();
let next_byte = emulator.bus.read(emulator.cpu.registers.get_pc_address() + 1);
let next_second_byte = emulator.bus.read(emulator.cpu.registers.get_pc_address() + 2);
let next_third_byte = emulator.bus.read(emulator.cpu.registers.get_pc_address() + 3);
let next_byte = emulator.bus.read_external(emulator.cpu.registers.get_pc_address() + 1);
let next_second_byte = emulator.bus.read_external(emulator.cpu.registers.get_pc_address() + 2);
let next_third_byte = emulator.bus.read_external(emulator.cpu.registers.get_pc_address() + 3);
let next_word = {
(emulator.bus.read(emulator.cpu.registers.get_pc_address() + 1) as u16) |
((emulator.bus.read(emulator.cpu.registers.get_pc_address() + 2) as u16) << 8)
(emulator.bus.read_external(emulator.cpu.registers.get_pc_address() + 1) as u16) |
((emulator.bus.read_external(emulator.cpu.registers.get_pc_address() + 2) as u16) << 8)
};
let next_word_long = {
(emulator.bus.read(emulator.cpu.registers.get_pc_address() + 1) as u32) |
((emulator.bus.read(emulator.cpu.registers.get_pc_address() + 2) as u32) << 8) |
((emulator.bus.read(emulator.cpu.registers.get_pc_address() + 3) as u32) << 16)
(emulator.bus.read_external(emulator.cpu.registers.get_pc_address() + 1) as u32) |
((emulator.bus.read_external(emulator.cpu.registers.get_pc_address() + 2) as u32) << 8) |
((emulator.bus.read_external(emulator.cpu.registers.get_pc_address() + 3) as u32) << 16)
};
match opcode {
// ADC
snes-frontend/src/main.rs
+1 -1
View File
@@ -404,7 +404,7 @@ fn main() {
let mut address_row = format!("{:04X} | ", address);
for page in (page_start..=page_end).rev() {
let bus_address = ((page as u32) << 16) | (address as u32);
address_row = format!("{}{:02X} ", address_row, emulator.bus.read(bus_address));
address_row = format!("{}{:02X} ", address_row, emulator.bus.read_external(bus_address));
}
ui.text(address_row);
}