Changeset 103980 in vbox for trunk/src/VBox/ValidationKit/bootsectors

Timestamp:

Mar 21, 2024 9:37:32 AM (11 months ago)

Author:

vboxsync

Message:

ValKit/bs3kit,bs3-cpu-instr-3: Don't set g_uBs3TrapEipHint automatically in Bs3TrapSetJmpAndRestoreWithExtCtx as we don't know the actual trap/exit EIP and it may have a different value in the top word from pCtxRestore->rip. Instead the caller has to set it like with Bs3RegCtxRestore. bugref:9898

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• bs3-cpu-instr-3.c32 (modified) (6 diffs)
• bs3kit/bs3-cmn-TrapSetJmpAndRestoreWithExtCtx.c (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-3.c32

@@ -864 +864 @@
                              * Execute.
                              */
+                            g_uBs3TrapEipHint = Ctx.rip.u32 + (bXcptExpect == X86_XCPT_DB ? cbInstr + 1 : 0);
                             Bs3TrapSetJmpAndRestoreWithExtCtxAndRm(&Ctx, pExtCtx, &TrapFrame, pExtCtxOut);
 
@@ -9379 +9380 @@
                              * Execute.
                              */
+                            g_uBs3TrapEipHint = Ctx.rip.u32 + (bXcptExpect == X86_XCPT_DB ? cbInstr + 1 : 0);
                             Bs3TrapSetJmpAndRestoreWithExtCtxAndRm(&Ctx, pExtCtx, &TrapFrame, pExtCtxOut);
 
@@ -10201 +10203 @@
                              * Execute.
                              */
+                            g_uBs3TrapEipHint = Ctx.rip.u32 + (bXcptExpect == X86_XCPT_DB ? cbInstr + 1 : 0);
                             Bs3TrapSetJmpAndRestoreWithExtCtxAndRm(&Ctx, pExtCtx, &TrapFrame, pExtCtxOut);
 
@@ -12432 +12435 @@
                                  * Execute.
                                  */
+                                g_uBs3TrapEipHint = Ctx.rip.u32 + (bXcptExpect == X86_XCPT_DB ? cbInstr + 1 : 0);
                                 Bs3TrapSetJmpAndRestoreWithExtCtxAndRm(&Ctx, pExtCtx, &TrapFrame, pExtCtxOut);
 
@@ -12794 +12798 @@
                              * Execute.
                              */
+                            g_uBs3TrapEipHint = Ctx.rip.u32 + (bXcptExpect == X86_XCPT_DB ? cbInstr + 1 : 0);
                             Bs3TrapSetJmpAndRestoreWithExtCtxAndRm(&Ctx, pExtCtx, &TrapFrame, pExtCtxOut);
 
@@ -13337 +13342 @@
                              * Execute.
                              */
+                            g_uBs3TrapEipHint = Ctx.rip.u32 + (bXcptExpect == X86_XCPT_DB ? cbInstr + 1 : 0);
                             Bs3TrapSetJmpAndRestoreWithExtCtxAndRm(&Ctx, pExtCtx, &TrapFrame, pExtCtxOut);
 

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

@@ -50 +50 @@
     Bs3ExtCtxRestoreEx(pExtCtxRestore);
     if (Bs3TrapSetJmp(pTrapFrame))
-    {
-#if TMPL_BITS == 32
-        g_uBs3TrapEipHint = pCtxRestore->rip.u32;
-#endif
         Bs3RegCtxRestore(pCtxRestore, BS3REGCTXRESTORE_F_NO_V86_ASSIST);
-    }
     g_fBs3TrapNoV86Assist = false;
     Bs3ExtCtxSaveEx(pExtCtxTrap);