Index: /trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp
===================================================================
--- /trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp	(revision 59208)
+++ /trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp	(revision 59209)
@@ -407,152 +407,150 @@
 const DBGCSXEVT g_aDbgcSxEvents[] =
 {
-    { DBGFEVENT_INTERRUPT_HARDWARE,         "hwint",        NULL,       kDbgcSxEventKind_Interrupt, kDbgcEvtState_Disabled },
-    { DBGFEVENT_INTERRUPT_SOFTWARE,         "swint",        NULL,       kDbgcSxEventKind_Interrupt, kDbgcEvtState_Disabled },
-    { DBGFEVENT_TRIPLE_FAULT,               "triplefault",  NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Enabled },
-    { DBGFEVENT_XCPT_DE,                    "xcpt_de",      "de",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_DB,                    "xcpt_db",      "db",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_02,                    "xcpt_02",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_BP,                    "xcpt_bp",      "bp",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_OF,                    "xcpt_of",      "of",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_BR,                    "xcpt_br",      "br",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_UD,                    "xcpt_ud",      "ud",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_NM,                    "xcpt_nm",      "nm",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_DF,                    "xcpt_df",      "df",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_09,                    "xcpt_09",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_TS,                    "xcpt_ts",      "ts",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_NP,                    "xcpt_np",      "np",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_SS,                    "xcpt_ss",      "ss",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_GP,                    "xcpt_gp",      "gp",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_PF,                    "xcpt_pf",      "pf",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_0f,                    "xcpt_0f",      "xcpt0f",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_MF,                    "xcpt_mf",      "mf",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_AC,                    "xcpt_ac",      "ac",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_MC,                    "xcpt_mc",      "mc",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_XF,                    "xcpt_xf",      "xf",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_VE,                    "xcpt_vd",      "ve",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_15,                    "xcpt_15",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_16,                    "xcpt_16",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_17,                    "xcpt_17",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_18,                    "xcpt_18",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_19,                    "xcpt_19",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_1a,                    "xcpt_1a",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_1b,                    "xcpt_1b",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_1c,                    "xcpt_1c",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_1d,                    "xcpt_1d",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_SX,                    "xcpt_sx",      "sx",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_XCPT_1f,                    "xcpt_1f",      "xcpt1f",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-    { DBGFEVENT_INSTR_HALT,                 "instr_halt",   "hlt",      kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
-#if 0 /** @todo later */
-    { DBGFEVENT_INSTR_MWAIT,                "",
-    { DBGFEVENT_INSTR_MONITOR,              "",
-    { DBGFEVENT_INSTR_CPUID,                "",
-    { DBGFEVENT_INSTR_INVD,                 "",
-    { DBGFEVENT_INSTR_WBINVD,               "",
-    { DBGFEVENT_INSTR_INVLPG,               "",
-    { DBGFEVENT_INSTR_RDTSC,                "",
-    { DBGFEVENT_INSTR_RDTSCP,               "",
-    { DBGFEVENT_INSTR_RDPMC,                "",
-    { DBGFEVENT_INSTR_RDMSR,                "",
-    { DBGFEVENT_INSTR_WRMSR,                "",
-    { DBGFEVENT_INSTR_CRX_READ,             "",
-    { DBGFEVENT_INSTR_CRX_WRITE,            "",
-    { DBGFEVENT_INSTR_DRX_READ,             "",
-    { DBGFEVENT_INSTR_DRX_WRITE,            "",
-    { DBGFEVENT_INSTR_PAUSE,                "",
-    { DBGFEVENT_INSTR_XSETBV,               "",
-    { DBGFEVENT_INSTR_SIDT,                 "",
-    { DBGFEVENT_INSTR_LIDT,                 "",
-    { DBGFEVENT_INSTR_SGDT,                 "",
-    { DBGFEVENT_INSTR_LGDT,                 "",
-    { DBGFEVENT_INSTR_SLDT,                 "",
-    { DBGFEVENT_INSTR_LLDT,                 "",
-    { DBGFEVENT_INSTR_STR,                  "",
-    { DBGFEVENT_INSTR_LTR,                  "",
-    { DBGFEVENT_INSTR_GETSEC,               "",
-    { DBGFEVENT_INSTR_RSM,                  "",
-    { DBGFEVENT_INSTR_RDRAND,               "",
-    { DBGFEVENT_INSTR_RDSEED,               "",
-    { DBGFEVENT_INSTR_XSAVES,               "",
-    { DBGFEVENT_INSTR_XRSTORS,              "",
-    { DBGFEVENT_INSTR_VMM_CALL,             "",
-    { DBGFEVENT_INSTR_VMX_VMCLEAR           "",
-    { DBGFEVENT_INSTR_VMX_VMLAUNCH,         "",
-    { DBGFEVENT_INSTR_VMX_VMPTRLD,          "",
-    { DBGFEVENT_INSTR_VMX_VMPTRST,          "",
-    { DBGFEVENT_INSTR_VMX_VMREAD,           "",
-    { DBGFEVENT_INSTR_VMX_VMRESUME,         "",
-    { DBGFEVENT_INSTR_VMX_VMWRITE,          "",
-    { DBGFEVENT_INSTR_VMX_VMXOFF,           "",
-    { DBGFEVENT_INSTR_VMX_VMXON,            "",
-    { DBGFEVENT_INSTR_VMX_VMFUNC,           "",
-    { DBGFEVENT_INSTR_VMX_INVEPT,           "",
-    { DBGFEVENT_INSTR_VMX_INVVPID,          "",
-    { DBGFEVENT_INSTR_VMX_INVPCID,          "",
-    { DBGFEVENT_INSTR_SVM_VMRUN             "",
-    { DBGFEVENT_INSTR_SVM_VMLOAD,           "",
-    { DBGFEVENT_INSTR_SVM_VMSAVE,           "",
-    { DBGFEVENT_INSTR_SVM_STGI,             "",
-    { DBGFEVENT_INSTR_SVM_CLGI,             "",
-    { DBGFEVENT_EXIT_TASK_SWITCH            "",
-    { DBGFEVENT_EXIT_HALT,                  "",
-    { DBGFEVENT_EXIT_MWAIT,                 "",
-    { DBGFEVENT_EXIT_MONITOR,               "",
-    { DBGFEVENT_EXIT_CPUID,                 "",
-    { DBGFEVENT_EXIT_INVD,                  "",
-    { DBGFEVENT_EXIT_WBINVD,                "",
-    { DBGFEVENT_EXIT_INVLPG,                "",
-    { DBGFEVENT_EXIT_RDTSC,                 "",
-    { DBGFEVENT_EXIT_RDTSCP,                "",
-    { DBGFEVENT_EXIT_RDPMC,                 "",
-    { DBGFEVENT_EXIT_RDMSR,                 "",
-    { DBGFEVENT_EXIT_WRMSR,                 "",
-    { DBGFEVENT_EXIT_CRX_READ,              "",
-    { DBGFEVENT_EXIT_CRX_WRITE,             "",
-    { DBGFEVENT_EXIT_DRX_READ,              "",
-    { DBGFEVENT_EXIT_DRX_WRITE,             "",
-    { DBGFEVENT_EXIT_PAUSE,                 "",
-    { DBGFEVENT_EXIT_XSETBV,                "",
-    { DBGFEVENT_EXIT_SIDT,                  "",
-    { DBGFEVENT_EXIT_LIDT,                  "",
-    { DBGFEVENT_EXIT_SGDT,                  "",
-    { DBGFEVENT_EXIT_LGDT,                  "",
-    { DBGFEVENT_EXIT_SLDT,                  "",
-    { DBGFEVENT_EXIT_LLDT,                  "",
-    { DBGFEVENT_EXIT_STR,                   "",
-    { DBGFEVENT_EXIT_LTR,                   "",
-    { DBGFEVENT_EXIT_GETSEC,                "",
-    { DBGFEVENT_EXIT_RSM,                   "",
-    { DBGFEVENT_EXIT_RDRAND,                "",
-    { DBGFEVENT_EXIT_RDSEED,                "",
-    { DBGFEVENT_EXIT_XSAVES,                "",
-    { DBGFEVENT_EXIT_XRSTORS,               "",
-    { DBGFEVENT_EXIT_VMM_CALL,              "",
-    { DBGFEVENT_EXIT_VMX_VMCLEAR            "",
-    { DBGFEVENT_EXIT_VMX_VMLAUNCH,          "",
-    { DBGFEVENT_EXIT_VMX_VMPTRLD,           "",
-    { DBGFEVENT_EXIT_VMX_VMPTRST,           "",
-    { DBGFEVENT_EXIT_VMX_VMREAD,            "",
-    { DBGFEVENT_EXIT_VMX_VMRESUME,          "",
-    { DBGFEVENT_EXIT_VMX_VMWRITE,           "",
-    { DBGFEVENT_EXIT_VMX_VMXOFF,            "",
-    { DBGFEVENT_EXIT_VMX_VMXON,             "",
-    { DBGFEVENT_EXIT_VMX_VMFUNC,            "",
-    { DBGFEVENT_EXIT_VMX_INVEPT,            "",
-    { DBGFEVENT_EXIT_VMX_INVVPID,           "",
-    { DBGFEVENT_EXIT_VMX_INVPCID,           "",
-    { DBGFEVENT_EXIT_VMX_EPT_VIOLATION,     "",
-    { DBGFEVENT_EXIT_VMX_EPT_MISCONFIG,     "",
-    { DBGFEVENT_EXIT_VMX_VAPIC_ACCESS,      "",
-    { DBGFEVENT_EXIT_VMX_VAPIC_WRITE,       "",
-    { DBGFEVENT_EXIT_SVM_VMRUN              "",
-    { DBGFEVENT_EXIT_SVM_VMLOAD,            "",
-    { DBGFEVENT_EXIT_SVM_VMSAVE,            "",
-    { DBGFEVENT_EXIT_SVM_STGI,              "",
-    { DBGFEVENT_EXIT_SVM_CLGI,              "",
-    { DBGFEVENT_IOPORT_UNASSIGNED,          "",
-    { DBGFEVENT_IOPORT_UNUSED,              "",
-    { DBGFEVENT_MEMORY_UNASSIGNED,          "",
-    { DBGFEVENT_MEMORY_ROM_WRITE,           "",
-#endif
+    { DBGFEVENT_INTERRUPT_HARDWARE,     "hwint",                NULL,       kDbgcSxEventKind_Interrupt, kDbgcEvtState_Disabled },
+    { DBGFEVENT_INTERRUPT_SOFTWARE,     "swint",                NULL,       kDbgcSxEventKind_Interrupt, kDbgcEvtState_Disabled },
+    { DBGFEVENT_TRIPLE_FAULT,           "triplefault",          NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Enabled },
+    { DBGFEVENT_XCPT_DE,                "xcpt_de",              "de",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_DB,                "xcpt_db",              "db",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_02,                "xcpt_02",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_BP,                "xcpt_bp",              "bp",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_OF,                "xcpt_of",              "of",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_BR,                "xcpt_br",              "br",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_UD,                "xcpt_ud",              "ud",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_NM,                "xcpt_nm",              "nm",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_DF,                "xcpt_df",              "df",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_09,                "xcpt_09",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_TS,                "xcpt_ts",              "ts",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_NP,                "xcpt_np",              "np",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_SS,                "xcpt_ss",              "ss",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_GP,                "xcpt_gp",              "gp",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_PF,                "xcpt_pf",              "pf",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_0f,                "xcpt_0f",              "xcpt0f",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_MF,                "xcpt_mf",              "mf",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_AC,                "xcpt_ac",              "ac",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_MC,                "xcpt_mc",              "mc",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_XF,                "xcpt_xf",              "xf",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_VE,                "xcpt_vd",              "ve",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_15,                "xcpt_15",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_16,                "xcpt_16",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_17,                "xcpt_17",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_18,                "xcpt_18",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_19,                "xcpt_19",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_1a,                "xcpt_1a",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_1b,                "xcpt_1b",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_1c,                "xcpt_1c",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_1d,                "xcpt_1d",              NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_SX,                "xcpt_sx",              "sx",       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_XCPT_1f,                "xcpt_1f",              "xcpt1f",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_HALT,             "instr_halt",           "hlt",      kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_MWAIT,            "instr_mwait",          "mwait",    kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_MONITOR,          "instr_monitor",        "monitor",  kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_CPUID,            "instr_cpuid",          "cpuid",    kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_INVD,             "instr_invd",           "invd",     kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_WBINVD,           "instr_wbinvd",         "wbinvd",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_INVLPG,           "instr_invlpg",         "invlpg",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_RDTSC,            "instr_rdtsc",          "rdtsc",    kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_RDTSCP,           "instr_rdtscp",         "rdtscp",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_RDPMC,            "instr_rdpmc",          "rdpmc",    kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_RDMSR,            "instr_rdmsr",          "rdmsr",    kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_WRMSR,            "instr_wrmsr",          "wrmsr",    kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_CRX_READ,         "instr_crx_read",       "crx_read", kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_CRX_WRITE,        "instr_crx_write",      "crx_write",kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_DRX_READ,         "instr_drx_read",       "drx_read", kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_DRX_WRITE,        "instr_drx_write",      "drx_write",kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_PAUSE,            "instr_pause",          "pause",    kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_XSETBV,           "instr_xsetbv",         "xsetbv",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_SIDT,             "instr_sidt",           "sidt",     kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_LIDT,             "instr_lidt",           "lidt",     kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_SGDT,             "instr_sgdt",           "sgdt",     kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_LGDT,             "instr_lgdt",           "lgdt",     kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_SLDT,             "instr_sldt",           "sldt",     kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_LLDT,             "instr_lldt",           "lldt",     kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_STR,              "instr_str",            "str",      kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_LTR,              "instr_ltr",            "ltr",      kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_GETSEC,           "instr_getsec",         "getsec",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_RSM,              "instr_rsm",            "rsm",      kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_RDRAND,           "instr_rdrand",         "rdrand",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_RDSEED,           "instr_rdseed",         "rdseed",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_XSAVES,           "instr_xsaves",         "xsaves",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_XRSTORS,          "instr_xrstors",        "xrstors",  kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMM_CALL,         "instr_vmm_call",       "vmm_call", kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_VMCLEAR,      "instr_vmx_vmclear",    "vmclear",  kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_VMLAUNCH,     "instr_vmx_vmlaunch",   "vmlaunch", kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_VMPTRLD,      "instr_vmx_vmptrld",    "vmptrld",  kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_VMPTRST,      "instr_vmx_vmptrst",    "vmptrst",  kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_VMREAD,       "instr_vmx_vmread",     "vmread",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_VMRESUME,     "instr_vmx_vmresume",   "vmresume", kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_VMWRITE,      "instr_vmx_vmwrite",    "vmwrite",  kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_VMXOFF,       "instr_vmx_vmxoff",     "vmxoff",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_VMXON,        "instr_vmx_vmxon",      "vmxon",    kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_VMFUNC,       "instr_vmx_vmfunc",     "vmfunc",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_INVEPT,       "instr_vmx_invept",     "invept",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_INVVPID,      "instr_vmx_invvpid",    "invvpid",  kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_VMX_INVPCID,      "instr_vmx_invpcid",    "invpcid",  kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_SVM_VMRUN,        "instr_svm_vmrun",      "vmrun",    kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_SVM_VMLOAD,       "instr_svm_vmload",     "vmload",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_SVM_VMSAVE,       "instr_svm_vmsave",     "vmsave",   kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_SVM_STGI,         "instr_svm_stgi",       "stgi",     kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_INSTR_SVM_CLGI,         "instr_svm_clgi",       "clgi",     kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_TASK_SWITCH,       "exit_task_switch",  "task_switch", kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_HALT,              "exit_halt",            NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_MWAIT,             "exit_mwait",           NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_MONITOR,           "exit_monitor",         NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_CPUID,             "exit_cpuid",           NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_INVD,              "exit_invd",            NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_WBINVD,            "exit_wbinvd",          NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_INVLPG,            "exit_invlpg",          NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_RDTSC,             "exit_rdtsc",           NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_RDTSCP,            "exit_rdtscp",          NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_RDPMC,             "exit_rdpmc",           NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_RDMSR,             "exit_rdmsr",           NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_WRMSR,             "exit_wrmsr",           NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_CRX_READ,          "exit_crx_read",        NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_CRX_WRITE,         "exit_crx_write",       NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_DRX_READ,          "exit_drx_read",        NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_DRX_WRITE,         "exit_drx_write",       NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_PAUSE,             "exit_pause",           NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_XSETBV,            "exit_xsetbv",          NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_SIDT,              "exit_sidt",            NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_LIDT,              "exit_lidt",            NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_SGDT,              "exit_sgdt",            NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_LGDT,              "exit_lgdt",            NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_SLDT,              "exit_sldt",            NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_LLDT,              "exit_lldt",            NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_STR,               "exit_str",             NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_LTR,               "exit_ltr",             NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_GETSEC,            "exit_getsec",          NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_RSM,               "exit_rsm",             NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_RDRAND,            "exit_rdrand",          NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_RDSEED,            "exit_rdseed",          NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_XSAVES,            "exit_xsaves",          NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_XRSTORS,           "exit_xrstors",         NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMM_CALL,          "exit_vmm_call",        NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VMCLEAR,       "exit_vmx_vmclear",     NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VMLAUNCH,      "exit_vmx_vmlaunch",    NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VMPTRLD,       "exit_vmx_vmptrld",     NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VMPTRST,       "exit_vmx_vmptrst",     NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VMREAD,        "exit_vmx_vmread",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VMRESUME,      "exit_vmx_vmresume",    NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VMWRITE,       "exit_vmx_vmwrite",     NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VMXOFF,        "exit_vmx_vmxoff",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VMXON,         "exit_vmx_vmxon",       NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VMFUNC,        "exit_vmx_vmfunc",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_INVEPT,        "exit_vmx_invept",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_INVVPID,       "exit_vmx_invvpid",     NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_INVPCID,       "exit_vmx_invpcid",     NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_EPT_VIOLATION, "exit_vmx_ept_violation", "eptvio", kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_EPT_MISCONFIG, "exit_vmx_ept_misconfig", "eptmis", kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VAPIC_ACCESS,  "exit_vmx_vapic_access", NULL,      kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_VMX_VAPIC_WRITE,   "exit_vmx_vapic_write", NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_SVM_VMRUN,         "exit_svm_vmrun",       NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_SVM_VMLOAD,        "exit_svm_vmload",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_SVM_VMSAVE,        "exit_svm_vmsave",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_SVM_STGI,          "exit_svm_stgi",        NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_EXIT_SVM_CLGI,          "exit_svm_clgi",        NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_IOPORT_UNASSIGNED,      "pio_unassigned",       NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_IOPORT_UNUSED,          "pio_unused",           NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_MEMORY_UNASSIGNED,      "mmio_unassigned",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
+    { DBGFEVENT_MEMORY_ROM_WRITE,       "rom_write",            NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled },
 };
 /** Number of entries in g_aDbgcSxEvents.  */
@@ -4617,7 +4615,7 @@
 
     if (pEvtCfg && pEvtCfg->cchCmd > 0)
-        DBGCCmdHlpPrintf(pCmdHlp, "%-18s  %-7s  \"%s\"\n", pszName, pszState, pEvtCfg->szCmd);
+        DBGCCmdHlpPrintf(pCmdHlp, "%-22s  %-7s  \"%s\"\n", pszName, pszState, pEvtCfg->szCmd);
     else
-        DBGCCmdHlpPrintf(pCmdHlp, "%-18s  %s\n", pszName, pszState);
+        DBGCCmdHlpPrintf(pCmdHlp, "%-22s  %s\n", pszName, pszState);
 }
 
