--- nono/wx/wxmainframe.cpp 2026/04/29 17:04:42 1.1.1.6 +++ nono/wx/wxmainframe.cpp 2026/04/29 17:04:51 1.1.1.8 @@ -20,6 +20,7 @@ #include "bt454.h" #include "debugger.h" #include "dmac.h" +#include "interrupt.h" #include "keyboard.h" #include "lance.h" #include "lcd.h" @@ -34,7 +35,6 @@ #include "scheduler.h" #include "sio.h" #include "spc.h" -#include "sysctlr.h" #include "vm.h" static void wxmainframe_poweroff_callback(); @@ -150,17 +150,17 @@ WXMainFrame::WXMainFrame(wxWindow *paren menuMonitor->AppendSubMenu(menuMPU, "MP&U"); AppendIf(menuMonitor, MEMDUMP, _("&Memory Dump")); + AppendIf(menuMonitor, INTERRUPT, _("&Interrupt")); AppendIf(menuMonitor, SPC, "S&PC"); AppendIf(menuMonitor, RTC, "&RTC"); AppendIf(menuMonitor, DMAC, "DM&AC"); AppendIf(menuMonitor, MFP, "M&FP"); - AppendIf(menuMonitor, SCC, "S&CC"); - AppendIf(menuMonitor, SIO, "S&IO"); + AppendIf(menuMonitor, SCC, "SCC(&Z)"); + AppendIf(menuMonitor, SIO, "SIO(&U)"); AppendIf(menuMonitor, PIO0, "PIO0"); AppendIf(menuMonitor, LUNAKEYBOARD, _("&Keyboard/Mouse")); AppendIf(menuMonitor, LANCE, "Lance(&E)"); AppendIf(menuMonitor, LCD, "LCD(&J)"); - AppendIf(menuMonitor, SYSCTLR, _("System Controller?(&Q)")); AppendIf(menuMonitor, BITMAP, _("&Bitmap Control")); AppendIf(menuMonitor, BITMAP0, _("Bitmap #&0")); @@ -260,10 +260,6 @@ WXMainFrame::OnCreate(wxCommandEvent& ev gMPU680x0->SetHaltCallback(wxmainframe_halt_callback, this); } - // 時刻開始? - // なるべく VM が開始する直前にしたい。 - gRTC->InitRTC(); - // VM 実行開始 gVM->PowerButton(); } @@ -550,6 +546,9 @@ WXMainFrame::DoWindow(int id, bool enabl case WinID_MONITOR_MEMDUMP: windows[id].reset(new WXMemdumpWindow(this, id)); break; + case WinID_MONITOR_INTERRUPT: + SetMonitor(_("Interrupt"), gInterrupt.get()); + break; case WinID_MONITOR_SPC: SetMonitor("SPC", gSPC.get()); break; @@ -580,9 +579,6 @@ WXMainFrame::DoWindow(int id, bool enabl case WinID_MONITOR_LANCE: SetMonitor("Lance", dynamic_cast(gEthernet.get())); break; - case WinID_MONITOR_SYSCTLR: - SetMonitor(_("System Controller?"), gSysCtlr.get()); - break; case WinID_MONITOR_HOSTINFO: SetMonitor(_("Host Information"), gHostInfo.get()); break; @@ -704,6 +700,7 @@ WXMainFrame::monitor_info[WinID_MAX] = { { "cache7", VMF_M88K }, // Cache#7 { "cache6", VMF_M88K }, // Cache#6 { "memdump", VMF_ALL }, // MEMDUMP + { "interrupt", VMF_ALL }, // INTERRUPT { "spc", VMF_ALL }, // SPC { "rtc", VMF_ALL }, // RTC { "dmac", VMF_X68K }, // DMAC @@ -714,7 +711,6 @@ WXMainFrame::monitor_info[WinID_MAX] = { { "keyboard", VMF_LUNA }, // LunaKeyboard { "lcd", VMF_LUNA }, // LCD (Monitor) { "lance", VMF_LUNA }, // LANCE - { "sysctlr", VMF_LUNA88K }, // SYSCTLR { "bitmap", VMF_LUNA }, // BITMAP { "bitmap0", VMF_LUNA }, // BITMAP0 { "hostinfo", VMF_ALL }, // HOSTINFO