--- nono/vm/sysport.cpp 2026/04/29 17:04:42 1.1.1.4 +++ nono/vm/sysport.cpp 2026/04/29 17:04:50 1.1.1.5 @@ -10,6 +10,8 @@ #include "romimg_x68k.h" #include "sram.h" +std::unique_ptr gSysport; + SysportDevice::SysportDevice() { logname = "sysport"; @@ -30,11 +32,11 @@ SysportDevice::ResetHard() } uint64 -SysportDevice::Read(uint32 addr) +SysportDevice::Read(uint32 offset) { uint32 data; - switch (addr) { + switch (offset) { case SYSPORT::CONTRAST: data = 0xf0 | sysport.contrast; break; @@ -63,14 +65,14 @@ SysportDevice::Read(uint32 addr) default: __unreachable(); } - putlog(1, "$%06X -> $%02x", addr, data); + putlog(1, "$%06X -> $%02x", gMPU->GetPaddr(), data); return data; } uint64 -SysportDevice::Write(uint32 addr, uint32 data) +SysportDevice::Write(uint32 offset, uint32 data) { - switch (addr) { + switch (offset) { case SYSPORT::CONTRAST: sysport.contrast = data & 15; break; @@ -119,7 +121,7 @@ SysportDevice::Write(uint32 addr, uint32 break; case SYSPORT::POWEROFF: - putlog(0, "$E8E00F (POWEROFF) 未サポート書き込み %02x", data); + putlog(0, "$e8e00f (POWEROFF) 未サポート書き込み %02x", data); break; default: @@ -129,11 +131,11 @@ SysportDevice::Write(uint32 addr, uint32 } uint64 -SysportDevice::Peek(uint32 addr) +SysportDevice::Peek(uint32 offset) { uint32 data; - switch (addr) { + switch (offset) { case SYSPORT::CONTRAST: data = 0xf0 | sysport.contrast; break;