--- nono/lib/monitor_id.cpp	2026/04/29 17:05:19	1.1.1.6
+++ nono/lib/monitor_id.cpp	2026/04/29 17:05:48	1.1.1.12
@@ -4,6 +4,9 @@
 
 /*static*/ const std::vector<MonitorManager::MonitorInfo>
 MonitorManager::info {
+	{ ID_MONITOR_zeroth_dummy_for_wxmac, },
+	{ ID_MONITOR_ACCSTAT,	VMCap::NONE,	{ "accstat" } },
+	{ ID_MONITOR_AREASET,	VMCap::NONE,	{ "areaset" } },
 	{ ID_MONITOR_ATC0,	VMCap::NONE,	{ "atc0" } },
 	{ ID_MONITOR_ATC1,	VMCap::NONE,	{ "atc1" } },
 	{ ID_MONITOR_ATC2,	VMCap::NONE,	{ "atc2" } },
@@ -25,13 +28,16 @@ MonitorManager::info {
 	{ ID_MONITOR_CRTC,	VMCap::NONE,	{ "crtc" } },
 	{ ID_MONITOR_DMAC,	VMCap::NONE,	{ "dmac" } },
 	{ ID_MONITOR_FDC,	VMCap::NONE,	{ "fdc" } },
-	{ ID_MONITOR_HOSTCOM,	VMCap::NONE,	{ "hostcom" } },
+	{ ID_MONITOR_HOSTCOM0,	VMCap::NONE,	{ "hostcom0" } },
+	{ ID_MONITOR_HOSTCOM1,	VMCap::NONE,	{ "hostcom1" } },
+	{ ID_MONITOR_HOSTCOM2,	VMCap::NONE,	{ "hostcom2" } },
 	{ ID_MONITOR_HOSTNET0,	VMCap::NONE,	{ "hostnet0" } },
 	{ ID_MONITOR_HOSTNET1,	VMCap::NONE,	{ "hostnet1" } },
 	{ ID_MONITOR_INTERRUPT,	VMCap::NONE,	{ "interrupt" } },
 	{ ID_MONITOR_KEYBOARD,	VMCap::NONE,	{ "keyboard" } },
 	{ ID_MONITOR_LANCE,	VMCap::NONE,	{ "lance" } },
 	{ ID_MONITOR_LCD,	VMCap::NONE,	{ "lcd" } },
+	{ ID_MONITOR_LOG,	VMCap::NONE,	{ "log" } },
 	{ ID_MONITOR_LUNAVC,	VMCap::NONE,	{ "video" } },
 	{ ID_MONITOR_MAINBUS,	VMCap::NONE,	{ "mainbus" } },
 	{ ID_MONITOR_MEMDUMP0,	VMCap::NONE,	{ "memdump0" } },
@@ -41,6 +47,7 @@ MonitorManager::info {
 	{ ID_MONITOR_MFP,	VMCap::NONE,	{ "mfp" } },
 	{ ID_MONITOR_MK48T02,	VMCap::NONE,	{ "mk48t02", "rtc" } },
 	{ ID_MONITOR_MPUATC,	VMCap::NONE,	{ "mpuatc" } },
+	{ ID_MONITOR_MPUCACHE,	VMCap::NONE,	{ "mpucache" } },
 	{ ID_MONITOR_MPUREG,	VMCap::NONE,	{ "mpureg" } },
 	{ ID_MONITOR_NEREID,	VMCap::NONE,	{ "nereid" } },
 	{ ID_MONITOR_PIO,	VMCap::NONE,	{ "pio" } },
@@ -53,9 +60,24 @@ MonitorManager::info {
 	{ ID_MONITOR_SCHEDULER,	VMCap::NONE,	{ "scheduler" } },
 	{ ID_MONITOR_SCSIDEVS,	VMCap::NONE,	{ "scsidevs" } },
 	{ ID_MONITOR_SIO,	VMCap::NONE,	{ "sio" } },
+	{ ID_MONITOR_SLIRP,	VMCap::NONE,	{ "slirp" } },
 	{ ID_MONITOR_SPC,	VMCap::NONE,	{ "spc" } },
+	{ ID_MONITOR_SSG,	VMCap::NONE,	{ "ssg" } },
 	{ ID_MONITOR_SYSCLK,	VMCap::NONE,	{ "sysclk" } },
+	{ ID_MONITOR_SYSPORT,	VMCap::NONE,	{ "sysport" } },
+	{ ID_MONITOR_VIRTIO_BLOCK0,	VMCap::NONE,	{ "vblk0" } },
+	{ ID_MONITOR_VIRTIO_BLOCK1,	VMCap::NONE,	{ "vblk1" } },
+	{ ID_MONITOR_VIRTIO_BLOCK2,	VMCap::NONE,	{ "vblk2" } },
+	{ ID_MONITOR_VIRTIO_BLOCK3,	VMCap::NONE,	{ "vblk3" } },
+	{ ID_MONITOR_VIRTIO_BLOCK4,	VMCap::NONE,	{ "vblk4" } },
+	{ ID_MONITOR_VIRTIO_BLOCK5,	VMCap::NONE,	{ "vblk5" } },
+	{ ID_MONITOR_VIRTIO_BLOCK6,	VMCap::NONE,	{ "vblk6" } },
+	{ ID_MONITOR_VIRTIO_BLOCK7,	VMCap::NONE,	{ "vblk7" } },
+	{ ID_MONITOR_VIRTIO_ENTROPY,	VMCap::NONE,	{ "virtio_entropy" } },
+	{ ID_MONITOR_VIRTIO_NET,	VMCap::NONE,	{ "vnet" } },
+	{ ID_MONITOR_VIRTIO_SCSI,	VMCap::NONE,	{ "vscsi" } },
 	{ ID_MONITOR_WXHOSTINFO,	VMCap::NONE,	{ "wxhostinfo" } },
+	{ ID_MONITOR_XPASCI,	VMCap::LUNA,	{ "xpasci" } },
 	{ ID_MONITOR_XPMEMDUMP0,	VMCap::NONE,	{ "xpmemdump0" } },
 	{ ID_MONITOR_XPMEMDUMP1,	VMCap::NONE,	{ "xpmemdump1" } },
 	{ ID_MONITOR_XPMEMDUMP2,	VMCap::NONE,	{ "xpmemdump2" } },
@@ -75,14 +97,14 @@ MonitorManager::info {
 	{ ID_SUBWIN_CACHE7,	VMCap::M88K,	{ "cache7" } },
 	{ ID_SUBWIN_DIPSW,	VMCap::LUNA|VMCap::NEWS,	{ "dipsw" } },
 	{ ID_SUBWIN_EXHIST,	VMCap::ALL,	{ "exhist" } },
+	{ ID_SUBWIN_GVRAM,	VMCap::X68030,	{ "gvram" } },
 	{ ID_SUBWIN_LCDPANEL,	VMCap::LUNA,	{ "lcdpanel" } },
-	{ ID_SUBWIN_LOG,	VMCap::ALL,	{ "log" } },
 	{ ID_SUBWIN_LOGSETTING,	VMCap::ALL,	{ "logsetting" } },
 	{ ID_SUBWIN_LUNAFB,	VMCap::LUNA,	{ "bitmap" } },
-	{ ID_SUBWIN_PALETTE,	VMCap::LUNA,	{ "palette" } },
+	{ ID_SUBWIN_NEWSIO,	VMCap::NEWS,	{ "newsio" } },
+	{ ID_SUBWIN_PALETTE,	VMCap::LUNA|VMCap::X68030,	{ "palette" } },
 	{ ID_SUBWIN_ROM,	VMCap::LUNA|VMCap::X68030,	{ "rom" } },
-	{ ID_SUBWIN_SOFTKEY,	VMCap::ALL,	{ "softkey" } },
-	{ ID_SUBWIN_TEXTPAL,	VMCap::X68030,	{ "textpalette", "palette" } },
+	{ ID_SUBWIN_SOFTKEY,	VMCap::LUNA|VMCap::X68030,	{ "softkey" } },
 	{ ID_SUBWIN_TVRAM,	VMCap::X68030,	{ "tvram" } },
 	{ ID_SUBWIN_VECTOR,	VMCap::ALL,	{ "vector" } },
 	{ ID_SUBWIN_X68KIO,	VMCap::X68030,	{ "x68kio" } },
@@ -90,8 +112,10 @@ MonitorManager::info {
 	{ ID_SUBWIN_XPEXHIST,	VMCap::LUNA,	{ "xpexhist" } },
 };
 
-/*static*/ const std::vector<std::pair<int, const char *>>
+/*static*/ const std::vector<std::pair<uint, const char *>>
 Monitor::idtext {
+	{ ID_MONITOR_ACCSTAT, "ID_MONITOR_ACCSTAT" },
+	{ ID_MONITOR_AREASET, "ID_MONITOR_AREASET" },
 	{ ID_MONITOR_ATC0, "ID_MONITOR_ATC0" },
 	{ ID_MONITOR_ATC1, "ID_MONITOR_ATC1" },
 	{ ID_MONITOR_ATC2, "ID_MONITOR_ATC2" },
@@ -124,7 +148,10 @@ Monitor::idtext {
 	{ ID_MONITOR_DMAC, "ID_MONITOR_DMAC" },
 	{ ID_SUBWIN_EXHIST, "ID_SUBWIN_EXHIST" },
 	{ ID_MONITOR_FDC, "ID_MONITOR_FDC" },
-	{ ID_MONITOR_HOSTCOM, "ID_MONITOR_HOSTCOM" },
+	{ ID_SUBWIN_GVRAM, "ID_SUBWIN_GVRAM" },
+	{ ID_MONITOR_HOSTCOM0, "ID_MONITOR_HOSTCOM0" },
+	{ ID_MONITOR_HOSTCOM1, "ID_MONITOR_HOSTCOM1" },
+	{ ID_MONITOR_HOSTCOM2, "ID_MONITOR_HOSTCOM2" },
 	{ ID_MONITOR_HOSTNET0, "ID_MONITOR_HOSTNET0" },
 	{ ID_MONITOR_HOSTNET1, "ID_MONITOR_HOSTNET1" },
 	{ ID_MONITOR_INTERRUPT, "ID_MONITOR_INTERRUPT" },
@@ -132,7 +159,7 @@ Monitor::idtext {
 	{ ID_MONITOR_LANCE, "ID_MONITOR_LANCE" },
 	{ ID_MONITOR_LCD, "ID_MONITOR_LCD" },
 	{ ID_SUBWIN_LCDPANEL, "ID_SUBWIN_LCDPANEL" },
-	{ ID_SUBWIN_LOG, "ID_SUBWIN_LOG" },
+	{ ID_MONITOR_LOG, "ID_MONITOR_LOG" },
 	{ ID_SUBWIN_LOGSETTING, "ID_SUBWIN_LOGSETTING" },
 	{ ID_SUBWIN_LUNAFB, "ID_SUBWIN_LUNAFB" },
 	{ ID_MONITOR_LUNAVC, "ID_MONITOR_LUNAVC" },
@@ -144,8 +171,10 @@ Monitor::idtext {
 	{ ID_MONITOR_MFP, "ID_MONITOR_MFP" },
 	{ ID_MONITOR_MK48T02, "ID_MONITOR_MK48T02" },
 	{ ID_MONITOR_MPUATC, "ID_MONITOR_MPUATC" },
+	{ ID_MONITOR_MPUCACHE, "ID_MONITOR_MPUCACHE" },
 	{ ID_MONITOR_MPUREG, "ID_MONITOR_MPUREG" },
 	{ ID_MONITOR_NEREID, "ID_MONITOR_NEREID" },
+	{ ID_SUBWIN_NEWSIO, "ID_SUBWIN_NEWSIO" },
 	{ ID_SUBWIN_PALETTE, "ID_SUBWIN_PALETTE" },
 	{ ID_MONITOR_PIO, "ID_MONITOR_PIO" },
 	{ ID_MONITOR_RENDERER, "ID_MONITOR_RENDERER" },
@@ -158,14 +187,28 @@ Monitor::idtext {
 	{ ID_MONITOR_SCHEDULER, "ID_MONITOR_SCHEDULER" },
 	{ ID_MONITOR_SCSIDEVS, "ID_MONITOR_SCSIDEVS" },
 	{ ID_MONITOR_SIO, "ID_MONITOR_SIO" },
+	{ ID_MONITOR_SLIRP, "ID_MONITOR_SLIRP" },
 	{ ID_SUBWIN_SOFTKEY, "ID_SUBWIN_SOFTKEY" },
 	{ ID_MONITOR_SPC, "ID_MONITOR_SPC" },
+	{ ID_MONITOR_SSG, "ID_MONITOR_SSG" },
 	{ ID_MONITOR_SYSCLK, "ID_MONITOR_SYSCLK" },
-	{ ID_SUBWIN_TEXTPAL, "ID_SUBWIN_TEXTPAL" },
+	{ ID_MONITOR_SYSPORT, "ID_MONITOR_SYSPORT" },
 	{ ID_SUBWIN_TVRAM, "ID_SUBWIN_TVRAM" },
 	{ ID_SUBWIN_VECTOR, "ID_SUBWIN_VECTOR" },
+	{ ID_MONITOR_VIRTIO_BLOCK0, "ID_MONITOR_VIRTIO_BLOCK0" },
+	{ ID_MONITOR_VIRTIO_BLOCK1, "ID_MONITOR_VIRTIO_BLOCK1" },
+	{ ID_MONITOR_VIRTIO_BLOCK2, "ID_MONITOR_VIRTIO_BLOCK2" },
+	{ ID_MONITOR_VIRTIO_BLOCK3, "ID_MONITOR_VIRTIO_BLOCK3" },
+	{ ID_MONITOR_VIRTIO_BLOCK4, "ID_MONITOR_VIRTIO_BLOCK4" },
+	{ ID_MONITOR_VIRTIO_BLOCK5, "ID_MONITOR_VIRTIO_BLOCK5" },
+	{ ID_MONITOR_VIRTIO_BLOCK6, "ID_MONITOR_VIRTIO_BLOCK6" },
+	{ ID_MONITOR_VIRTIO_BLOCK7, "ID_MONITOR_VIRTIO_BLOCK7" },
+	{ ID_MONITOR_VIRTIO_ENTROPY, "ID_MONITOR_VIRTIO_ENTROPY" },
+	{ ID_MONITOR_VIRTIO_NET, "ID_MONITOR_VIRTIO_NET" },
+	{ ID_MONITOR_VIRTIO_SCSI, "ID_MONITOR_VIRTIO_SCSI" },
 	{ ID_MONITOR_WXHOSTINFO, "ID_MONITOR_WXHOSTINFO" },
 	{ ID_SUBWIN_X68KIO, "ID_SUBWIN_X68KIO" },
+	{ ID_MONITOR_XPASCI, "ID_MONITOR_XPASCI" },
 	{ ID_MONITOR_XPMEMDUMP0, "ID_MONITOR_XPMEMDUMP0" },
 	{ ID_MONITOR_XPMEMDUMP1, "ID_MONITOR_XPMEMDUMP1" },
 	{ ID_MONITOR_XPMEMDUMP2, "ID_MONITOR_XPMEMDUMP2" },