Changeset 105099 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jul 2, 2024 12:46:58 PM (7 months ago)

Author:

vboxsync

Message:

ValKit/bs3-cpu-weird-1: Made the push/pop testcase work in LM16 mode and enabled all the testcases. bugref:10715

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• bs3-cpu-weird-1.c (modified) (1 diff)
• bs3kit/bs3-cmn-RegCtxRestore.asm (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-weird-1.c

@@ -57 +57 @@
 static const BS3TESTMODEBYONEENTRY g_aModeByOneTests[] =
 {
-#if 1/** @todo asserts in ring-0 on VT-x!  (It works when run directly on intel 6700K hardware.) */
-    { "dbg+inhibit+ringxfer", BS3_CMN_FAR_NM(bs3CpuWeird1_DbgInhibitRingXfer), 0 },
-#endif
-#if 0
-#if 1
-    { "pc wrapping", BS3_CMN_FAR_NM(bs3CpuWeird1_PcWrapping), 0 },
-#endif
-//    { "push/pop", BS3_CMN_FAR_NM(bs3CpuWeird1_PushPop), 0 },
-    { "push/pop sreg", BS3_CMN_FAR_NM(bs3CpuWeird1_PushPopSReg), 0 },
-#endif
+    { "dbg+inhibit+ringxfer",   BS3_CMN_FAR_NM(bs3CpuWeird1_DbgInhibitRingXfer),    0 },
+    { "pc wrapping",            BS3_CMN_FAR_NM(bs3CpuWeird1_PcWrapping),            0 },
+    { "push/pop",               BS3_CMN_FAR_NM(bs3CpuWeird1_PushPop),               0 },
+    { "push/pop sreg",          BS3_CMN_FAR_NM(bs3CpuWeird1_PushPopSReg),           0 },
 };
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-RegCtxRestore.asm

@@ -423 +423 @@
         jnz     .iretq_ok
         test    eax, X86LAR_F_D | X86LAR_F_L
-        jnz     .iretq_ok               ; Returning to a big of long SS needs not extra work.
+        jnz     .iretq_ok               ; Returning to a big or long SS needs not extra work.
 
         lar     eax, word [xBX + BS3REGCTX.cs]
@@ -431 +431 @@
 
         ; Convert ss:sp to a flat address.
+        movzx   ecx, cx                 ; 16-bit stacks are 16-bit, so chop the offset down.
         BS3_EXTERN_CMN Bs3SelFar32ToFlat32NoClobber
         call    Bs3SelFar32ToFlat32NoClobber