Changeset 72146 in vbox for trunk/src/VBox

Timestamp:

May 7, 2018 3:22:35 PM (7 years ago)

Author:

vboxsync

Message:

bs3kit: Made g_fBs3TrapNoV86Assist only apply to #GP assist, not to the V86 syscall stuff.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• bs3-cmn-TrapDefaultHandler.c (modified) (5 diffs)
• bs3kit.h (modified) (1 diff)

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

@@ -104 +104 @@
         switch (pTrapFrame->Ctx.rdx.u8)
         {
-            case 0: ASMSetCR0(uValue); break;
-            case 2: ASMSetCR2(uValue); break;
-            case 3: ASMSetCR3(uValue); break;
-            case 4: ASMSetCR4(uValue); break;
+            case 0: ASMSetCR0(uValue); pTrapFrame->Ctx.cr0.u32 = uValue; break;
+            case 2: ASMSetCR2(uValue); pTrapFrame->Ctx.cr2.u32 = uValue; break;
+            case 3: ASMSetCR3(uValue); pTrapFrame->Ctx.cr3.u32 = uValue; break;
+            case 4: ASMSetCR4(uValue); pTrapFrame->Ctx.cr4.u32 = uValue; break;
             default: Bs3Panic();
         }
@@ -126 +126 @@
     }
     else if (uSyscallNo == BS3_SYSCALL_SET_TR)
+    {
         Bs3RegSetTr(pTrapFrame->Ctx.rdx.u16);
+        pTrapFrame->Ctx.tr = pTrapFrame->Ctx.rdx.u16;
+    }
     else if (uSyscallNo == BS3_SYSCALL_GET_TR)
         pTrapFrame->Ctx.rax.u16 = ASMGetTR();
     else if (uSyscallNo == BS3_SYSCALL_SET_LDTR)
+    {
         Bs3RegSetLdtr(pTrapFrame->Ctx.rdx.u16);
+        pTrapFrame->Ctx.ldtr = pTrapFrame->Ctx.rdx.u16;
+    }
     else if (uSyscallNo == BS3_SYSCALL_GET_LDTR)
         pTrapFrame->Ctx.rax.u16 = ASMGetLDTR();
@@ -148 +154 @@
     //                  pTrapFrame->Ctx.cs, pTrapFrame->Ctx.rip.u32, pTrapFrame->Ctx.rflags.u32, pTrapFrame->Ctx.ss,
     //                  pTrapFrame->Ctx.rsp.u32, g_fBs3TrapNoV86Assist, 42);
-    if (   (pTrapFrame->Ctx.rflags.u32 & X86_EFL_VM)
-        && !g_fBs3TrapNoV86Assist)
+    if ((pTrapFrame->Ctx.rflags.u32 & X86_EFL_VM))
     {
         bool                    fHandled    = true;
@@ -165 +170 @@
          * Deal with GPs in V8086 mode.
          */
-        if (pTrapFrame->bXcpt == X86_XCPT_GP)
+        if (   pTrapFrame->bXcpt == X86_XCPT_GP
+            && !g_fBs3TrapNoV86Assist)
         {
             bOpCode = *pbCode++;
@@ -259 +265 @@
          */
         else if (   pTrapFrame->bXcpt == X86_XCPT_UD
+                 && pTrapFrame->Ctx.cs == BS3_SEL_TEXT16
+                 && pTrapFrame->Ctx.rax.u16 <= BS3_SYSCALL_LAST
                  && pbCode[0] == 0xf0
                  && pbCode[1] == 0xcd
-                 && pbCode[2] == BS3_TRAP_SYSCALL
-                 && pTrapFrame->Ctx.cs == BS3_SEL_TEXT16)
+                 && pbCode[2] == BS3_TRAP_SYSCALL)
         {
             pbCode += 3;

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

@@ -844 +844 @@
 /** Get the LDT register (value returned in ax). */
 #define BS3_SYSCALL_GET_LDTR    UINT16_C(0x000f)
+/** The last system call value. */
+#define BS3_SYSCALL_LAST        BS3_SYSCALL_GET_LDTR
 /** @} */