Skip to content

n64: fix a typo in ISViewer address range #1806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2025
Merged

n64: fix a typo in ISViewer address range #1806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ares/n64/cartridge/cartridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ auto Cartridge::connect() -> void {

rtc.load();

if(rom.size <= 0x03fe'ffff) {
if(rom.size <= 0x03ff'0000) {
isviewer.ram.allocate(64_KiB);
isviewer.tracer = node->append<Node::Debugger::Tracer::Notification>("ISViewer", "Cartridge");
isviewer.tracer->setAutoLineBreak(false);
Expand Down
4 changes: 2 additions & 2 deletions ares/n64/pi/bus.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ inline auto PI::busRead(u32 address) -> u32 {
if(cartridge.flash) return cartridge.flash.read<Size>(address);
return unmapped;
}
if(cartridge.isviewer.enabled() && address >= 0x13f0'0000 && address <= 0x13ff'ffff) {
if(cartridge.isviewer.enabled() && address >= 0x13ff'0000 && address <= 0x13ff'ffff) {
return cartridge.isviewer.read<Size>(address);
}
if(address <= 0x1000'0000 + cartridge.rom.size - 1) {
Expand Down Expand Up @@ -94,7 +94,7 @@ inline auto PI::busWrite(u32 address, u32 data) -> void {
if(cartridge.flash) return cartridge.flash.write<Size>(address, data);
return;
}
if(address >= 0x13f0'0000 && address <= 0x13ff'ffff) {
if(address >= 0x13ff'0000 && address <= 0x13ff'ffff) {
if(cartridge.isviewer.enabled()) {
writeForceFinish(); //Debugging channel for homebrew, be gentle
return cartridge.isviewer.write<Size>(address, data);
Expand Down
Loading