--- nono/m88xx0/m88200.cpp 2026/04/29 17:05:47 1.1.1.16 +++ nono/m88xx0/m88200.cpp 2026/04/29 17:05:56 1.1.1.17 @@ -39,11 +39,11 @@ m88200::m88200(MPU88xx0Device *parent_, AddAlias(string_format("CMMU%u", id)); reg_monitor = gMonitorManager->Regist(ID_MONITOR_CMMU(id), this); - reg_monitor->func = ToMonitorCallback(&m88200::MonitorUpdateReg); + reg_monitor->SetCallback(&m88200::MonitorScreenReg); reg_monitor->SetSize(52, 8); atc_monitor = gMonitorManager->Regist(ID_MONITOR_ATC(id), this); - atc_monitor->func = ToMonitorCallback(&m88200::MonitorUpdateATC); + atc_monitor->SetCallback(&m88200::MonitorScreenATC); uint h = 44; #if defined(M88200_STAT) h += 16; @@ -51,7 +51,7 @@ m88200::m88200(MPU88xx0Device *parent_, atc_monitor->SetSize(77, h); cache_monitor = gMonitorManager->Regist(ID_SUBWIN_CACHE(id), this); - cache_monitor->func = ToMonitorCallback(&m88200::MonitorUpdateCache); + cache_monitor->SetCallback(&m88200::MonitorScreenCache); cache_monitor->SetSize(82, 23); // ログ表示用の名前 @@ -111,7 +111,7 @@ m88200::Reset() // モニター更新 (CMMU レジスタ) void -m88200::MonitorUpdateReg(Monitor *, TextScreen& screen) +m88200::MonitorScreenReg(Monitor *, TextScreen& screen) { uint32 baseaddr; uint32 reg; @@ -184,7 +184,7 @@ m88200::MonitorUpdateReg(Monitor *, Text // モニター更新 (ATC) void -m88200::MonitorUpdateATC(Monitor *, TextScreen& screen) +m88200::MonitorScreenATC(Monitor *, TextScreen& screen) { int x; int y; @@ -224,7 +224,7 @@ m88200::MonitorUpdateATC(Monitor *, Text const m88200BATC& b = batc[i]; if (b.IsValid()) { - screen.Print(x + 4, y, "%c:%04x'0000 %04x'0000 %c%c%c%c", + screen.Print(x + 4, y, "%c.%04x'0000 %04x'0000 %c%c%c%c", b.IsS() ? 'S' : 'U', b.lba >> 16, b.pba >> 16, (b.stat & DESC_WT) ? 'T' : '-', @@ -257,7 +257,7 @@ m88200::MonitorUpdateATC(Monitor *, Text const m88200PATC& p = patc[i]; if (p.IsValid()) { - screen.Print(x + 4, y, "%c:%05x'000 %05x'000 %c%c%c%c%c", + screen.Print(x + 4, y, "%c.%05x'000 %05x'000 %c%c%c%c%c", p.IsS() ? 'S' : 'U', p.lpa >> 12, p.pfa >> 12, (p.stat & DESC_WT) ? 'T' : '-', @@ -378,7 +378,7 @@ m88200::MonitorUpdateATC(Monitor *, Text // モニター更新 (キャッシュ、概要と詳細の両方、GUI から呼ばれる) // screen.userdata は注目しているセット番号。 void -m88200::MonitorUpdateCache(Monitor *, TextScreen& screen) +m88200::MonitorScreenCache(Monitor *, TextScreen& screen) { uint setidx = screen.userdata; @@ -1175,7 +1175,7 @@ m88200::load(uint32 addr) acc_laddr = addr; acc_read = true; if (__predict_false(Translate() == false)) { - putlog(2, "Translation BusError %c:$%08x", + putlog(2, "Translation BusError %c.$%08x", (IsSuper() ? 'S' : 'U'), acc_laddr); return BusData::BusErr; } @@ -1303,7 +1303,7 @@ m88200::Translate() // Logical address(LA) presented on PBus - putlog(3, "Translate %c:$%08x", (IsSuper() ? 'S' : 'U'), acc_laddr); + putlog(3, "Translate %c.$%08x", (IsSuper() ? 'S' : 'U'), acc_laddr); // Select Area Descriptor if (SelectAreaDesc() == false) { @@ -1762,7 +1762,7 @@ m88200::CreatePATCEntry() p.lpa |= PATC_S; } p.stat = acc_stat; - putlog(4, " %s %c:$%08x:$%08x stat=%s", __func__, + putlog(4, " %s %c.$%08x:$%08x stat=%s", __func__, p.IsS() ? 'S' : 'U', (p.lpa & 0xfffff000U), p.pfa, stat2str(p.stat).c_str());