--- nono/debugger/debugger_m88xx0.cpp 2026/04/29 17:05:28 1.1.1.12 +++ nono/debugger/debugger_m88xx0.cpp 2026/04/29 17:05:41 1.1.1.14 @@ -329,7 +329,7 @@ DebuggerMD_m88xx0::ShowRegister(FILE *co if (MatchCMMUCmd(args[0], "ra", &cmmu_id)) { Monitor *mon = gMonitorManager->Find(ID_MONITOR_ATC(cmmu_id)); if (mon) { - parent->ShowMonitor(*mon); + parent->ShowMonitor(mon); return true; } goto notfound; @@ -340,7 +340,7 @@ DebuggerMD_m88xx0::ShowRegister(FILE *co if (MatchCMMUCmd(args[0], "rm", &cmmu_id)) { Monitor *mon = gMonitorManager->Find(ID_MONITOR_CMMU(cmmu_id)); if (mon) { - parent->ShowMonitor(*mon); + parent->ShowMonitor(mon); return true; } goto notfound; @@ -671,12 +671,12 @@ DebuggerMD_m88xx0::Disassemble(DebuggerM const auto& e = brhist->entry[brhist->top]; if (e.from + 4 == cpu->reg.xip) { // 直前の位置にあるブランチが遅延ブランチかどうか調べる - if ((e.inst & 0xfc000000) == 0xf4000000) { + if ((e.info & 0xfc000000) == 0xf4000000) { // jmp, jsr - delay = (e.inst >> 10) & 1; - } else if (0xc0000000 <= e.inst && e.inst < 0xfc000000) { + delay = (e.info >> 10) & 1; + } else if (0xc0000000 <= e.info && e.info < 0xfc000000) { // br, bsr, bcnd - delay = (e.inst >> 26) & 1; + delay = (e.info >> 26) & 1; } } }