Changeset 97613 in vbox

Timestamp:

Nov 19, 2022 11:48:14 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154657

Message:

ValKit/bs3kit: Added a Bs3Trap64InitEx variant that allows more use of IST when needed (i.e. when putting garbage in ESP[31:16] when having a 16-bit stack). bugref:9898

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• bs3-cmn-Trap64Init.c (modified) (2 diffs)
• bs3kit-autostubs.kmk (modified) (1 diff)
• bs3kit-mangling-code-define.h (modified) (1 diff)
• bs3kit-mangling-code-undef.h (modified) (1 diff)
• bs3kit.h (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-Trap64Init.c

@@ -45 +45 @@
 BS3_CMN_DEF(void, Bs3Trap64Init,(void))
 {
-     X86TSS64 BS3_FAR *pTss;
-     unsigned iIdt;
+    Bs3Trap64InitEx(false);
+}
+
+#undef Bs3Trap64InitEx
+BS3_CMN_DEF(void, Bs3Trap64InitEx,(bool fMoreIstUsage))
+{
+    static const uint8_t s_aAssignments[] =
+    {
+        /* [X86_XCPT_DE] = */   3,
+        /* [X86_XCPT_DB] = */   2,
+        /* [X86_XCPT_NMI] = */  0,
+        /* [X86_XCPT_BP] = */   2,
+        /* [X86_XCPT_OF] = */   3,
+        /* [X86_XCPT_BR] = */   3,
+        /* [X86_XCPT_UD] = */   4,
+        /* [X86_XCPT_NM] = */   3,
+        /* [X86_XCPT_DF] = */   1,
+        /*        [0x09] = */   0,
+        /* [X86_XCPT_TS] = */   1,
+        /* [X86_XCPT_NP] = */   5,
+        /* [X86_XCPT_SS] = */   5,
+        /* [X86_XCPT_GP] = */   6,
+        /* [X86_XCPT_PF] = */   7,
+        /*        [0x0f] = */   0,
+        /* [X86_XCPT_MF] = */   0,
+        /* [X86_XCPT_AC] = */   3,
+        /* [X86_XCPT_MC] = */   0,
+        /* [X86_XCPT_XF] = */   0,
+        /* [X86_XCPT_VE] = */   0,
+        /* [X86_XCPT_CP] = */   6,
+    };
+    X86TSS64 BS3_FAR *pTss;
+    unsigned iIdt;
 
     /*
@@ -54 +85 @@
     for (iIdt = 0; iIdt < BS3_TRAP_SYSCALL; iIdt++)
         Bs3Trap64SetGate(iIdt, AMD64_SEL_TYPE_SYS_INT_GATE, 0 /*bDpl*/,
-                         BS3_SEL_R0_CS64, g_Bs3Trap64GenericEntriesFlatAddr + iIdt * 8, iIdt == X86_XCPT_DF /*bIst*/);
+                         BS3_SEL_R0_CS64, g_Bs3Trap64GenericEntriesFlatAddr + iIdt * 8,
+                         !fMoreIstUsage ? iIdt == X86_XCPT_DF : iIdt < RT_ELEMENTS(s_aAssignments) ? s_aAssignments[iIdt] : 0);
     for (iIdt = BS3_TRAP_SYSCALL + 1; iIdt < 256; iIdt++)
         Bs3Trap64SetGate(iIdt, AMD64_SEL_TYPE_SYS_INT_GATE, 0 /*bDpl*/,
-                         BS3_SEL_R0_CS64, g_Bs3Trap64GenericEntriesFlatAddr + iIdt * 8, 0 /*bIst*/);
+                         BS3_SEL_R0_CS64, g_Bs3Trap64GenericEntriesFlatAddr + iIdt * 8, 0);
 
     /*

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-autostubs.kmk

@@ -167 +167 @@
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap32Init)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap32SetGate)
+$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap64InitEx)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap64Init)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap64SetGate)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code-define.h

@@ -221 +221 @@
 #define Bs3Trap32SetGate BS3_CMN_MANGLER(Bs3Trap32SetGate)
 #define Bs3Trap64Init BS3_CMN_MANGLER(Bs3Trap64Init)
+#define Bs3Trap64InitEx BS3_CMN_MANGLER(Bs3Trap64InitEx)
 #define Bs3Trap64SetGate BS3_CMN_MANGLER(Bs3Trap64SetGate)
 #define Bs3TrapDefaultHandler BS3_CMN_MANGLER(Bs3TrapDefaultHandler)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code-undef.h

@@ -221 +221 @@
 #undef Bs3Trap32SetGate
 #undef Bs3Trap64Init
+#undef Bs3Trap64InitEx
 #undef Bs3Trap64SetGate
 #undef Bs3TrapDefaultHandler

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -3292 +3292 @@
 
 /**
+ * Initializes 64-bit trap handling, extended version.
+ *
+ * @remarks Does not install 64-bit trap handling, just initializes the
+ *          structures.
+ * @param   fMoreIstUsage   Use the interrupt stacks for more CPU exceptions.
+ *                          Default (false) is to only IST1 for the double fault
+ *                          handler and the rest uses IST0.
+ */
+BS3_CMN_PROTO_STUB(void, Bs3Trap64InitEx,(bool fMoreIstUsage));
+
+/**
  * Modifies the real-mode / V86 IVT entry specified by @a iIvt.
  *