Changeset 60203 in vbox for trunk/src/VBox

Timestamp:

Mar 26, 2016 11:49:13 PM (9 years ago)

Author:

vboxsync

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

106237

Message:

bs3kit: updates

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• bs3-cpu-basic-2-template.c (modified) (2 diffs)
• bs3kit/bs3-c64-Trap64Generic.asm (modified) (5 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-template.c

@@ -386 +386 @@
      * Modify the gate CS value and run the handler at a different CPL.
      */
-# if BS3_MODE_IS_32BIT_SYS(TMPL_MODE) || BS3_MODE_IS_16BIT_SYS(TMPL_MODE)
     for (i = 0; i <= 3; i++)
     {
@@ -415 +414 @@
         }
     }
-#else
-i = 0; NOREF(i);
-#endif
 
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-c64-Trap64Generic.asm

@@ -119 +119 @@
         mov     rbp, rsp
         pushfq                          ; -08h
-        cli
         cld
         push    rdi
@@ -157 +156 @@
         mov     rbp, rsp
         pushfq                          ; -08h
-        cli
         cld
         push    rdi
@@ -241 +239 @@
         mov     ax, cs
         mov     [rdi + BS3TRAPFRAME.uHandlerCs], ax
-        and     ax, 3
-        mov     cx, ax
-        shl     ax, BS3_SEL_RING_SHIFT
-        or      ax, cx
+        AssertCompile(BS3_SEL_RING_SHIFT == 8)
+        and     al, 3
+        mov     ah, al
         add     ax, BS3_SEL_R0_DS64
         mov     ds, ax
@@ -279 +276 @@
         ; Control registers.
         ;
+        str     ax
+        mov     [rdi + BS3TRAPFRAME.Ctx + BS3REGCTX.tr], ax
+        sldt    ax
+        mov     [rdi + BS3TRAPFRAME.Ctx + BS3REGCTX.ldtr], ax
+
+        mov     ax, ss
+        test    al, 3
+        jnz     .skip_crX_because_cpl_not_0
+
         mov     rax, cr0
         mov     [rdi + BS3TRAPFRAME.Ctx + BS3REGCTX.cr0], rax
@@ -287 +293 @@
         mov     rax, cr4
         mov     [rdi + BS3TRAPFRAME.Ctx + BS3REGCTX.cr4], rax
-        str     ax
-        mov     [rdi + BS3TRAPFRAME.Ctx + BS3REGCTX.tr], ax
-        sldt    ax
-        mov     [rdi + BS3TRAPFRAME.Ctx + BS3REGCTX.ldtr], ax
+        jmp     .dispatch_to_handler
+
+.skip_crX_because_cpl_not_0:
+        or      byte [rdi + BS3TRAPFRAME.Ctx + BS3REGCTX.fbFlags], BS3REG_CTX_F_NO_CR
 
         ;
         ; Dispatch it to C code.
         ;
+.dispatch_to_handler:                   ; The double fault code joins us here.
         movzx   ebx, byte [rdi + BS3TRAPFRAME.bXcpt]
         lea     rax, [BS3_DATA16_WRT(_g_apfnBs3TrapHandlers_c64)]