Skip to content

Commit e99c9c5

Browse files
authored
n64: fix a typo in ISViewer address range (#1806)
Added in 1478637. This basically prevented ROM size between 0x3f0'0000 and 0x3ff'0000 to work correctly in Ares.
1 parent 9c273ab commit e99c9c5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ares/n64/cartridge/cartridge.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ auto Cartridge::connect() -> void {
4747

4848
rtc.load();
4949

50-
if(rom.size <= 0x03fe'ffff) {
50+
if(rom.size <= 0x03ff'0000) {
5151
isviewer.ram.allocate(64_KiB);
5252
isviewer.tracer = node->append<Node::Debugger::Tracer::Notification>("ISViewer", "Cartridge");
5353
isviewer.tracer->setAutoLineBreak(false);

ares/n64/pi/bus.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ inline auto PI::busRead(u32 address) -> u32 {
4444
if(cartridge.flash) return cartridge.flash.read<Size>(address);
4545
return unmapped;
4646
}
47-
if(cartridge.isviewer.enabled() && address >= 0x13f0'0000 && address <= 0x13ff'ffff) {
47+
if(cartridge.isviewer.enabled() && address >= 0x13ff'0000 && address <= 0x13ff'ffff) {
4848
return cartridge.isviewer.read<Size>(address);
4949
}
5050
if(address <= 0x1000'0000 + cartridge.rom.size - 1) {
@@ -94,7 +94,7 @@ inline auto PI::busWrite(u32 address, u32 data) -> void {
9494
if(cartridge.flash) return cartridge.flash.write<Size>(address, data);
9595
return;
9696
}
97-
if(address >= 0x13f0'0000 && address <= 0x13ff'ffff) {
97+
if(address >= 0x13ff'0000 && address <= 0x13ff'ffff) {
9898
if(cartridge.isviewer.enabled()) {
9999
writeForceFinish(); //Debugging channel for homebrew, be gentle
100100
return cartridge.isviewer.write<Size>(address, data);

0 commit comments

Comments
 (0)