Changeset 18060 in vbox

Timestamp:

Mar 18, 2009 12:42:06 PM (16 years ago)

Author:

vboxsync

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

44694

Message:

VT-x: restore TR properly as VT-x sets the limit back to 0x67 after a world switch. (kills XP hibernation)

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac

@@ -117 +117 @@
     push    xAX
 
+    ; The TR limit is reset to 0x67; restore it manually
+    str     eax
+    push    xAX
+
     ; VMX only saves the base of the GDTR & IDTR and resets the limit to 0xffff; we must restore the limit correctly!
     sub     xSP, xS*2
@@ -123 +127 @@
     sub     xSP, xS*2
     sidt    [xSP]
-
+    
 %ifdef VBOX_WITH_DR6_EXPERIMENT
     ; Restore DR6 - experiment, not safe!
@@ -177 +181 @@
 
     push    xDI
-    mov     xDI, [xSP + xS * 2]         ; pCtx (*2 to skip the saved LDTR)
+    mov     xDI, [xSP + xS * 3]         ; pCtx (*3 to skip the saved LDTR + TR)
 
     mov     [ss:xDI + CPUMCTX.eax], eax
@@ -198 +202 @@
 %endif
 
+    ; Restore TSS selector; must mark it as not busy before using ltr (!)
+    ; ASSUME that this is supposed to be 'BUSY'. (saves 20-30 ticks on the T42p)
+    ; @todo get rid of sgdt
+    pop     xBX         ; saved TR
+    sub     xSP, xS*2
+    sgdt    [xSP]
+    mov     eax, ebx
+    and     al, 0F8h                                ; mask away TI and RPL bits, get descriptor offset.
+    add     eax, [xSP + 2]                          ; eax <- GDTR.address + descriptor offset.
+    and     dword [ss:eax + 4], ~0200h                 ; clear busy flag (2nd type2 bit)
+    ltr     bx
+    add     xSP, xS*2
+    
     pop     xAX         ; saved LDTR
     lldt    ax
-
+    
     add     xSP, xS      ; pCtx
 
@@ -246 +263 @@
     add     xSP, xS*2
 
+    ; Restore TSS selector; must mark it as not busy before using ltr (!)
+    ; ASSUME that this is supposed to be 'BUSY'. (saves 20-30 ticks on the T42p)
+    ; @todo get rid of sgdt
+    pop     xBX         ; saved TR
+    sub     xSP, xS*2
+    sgdt    [xSP]
+    mov     eax, ebx
+    and     al, 0F8h                                ; mask away TI and RPL bits, get descriptor offset.
+    add     eax, [xSP + 2]                          ; eax <- GDTR.address + descriptor offset.
+    and     dword [ss:eax + 4], ~0200h                 ; clear busy flag (2nd type2 bit)
+    ltr     bx
+    add     xSP, xS*2
+
     pop     xAX         ; saved LDTR
     lldt    ax
@@ -268 +298 @@
     add     xSP, xS*2
     lgdt    [xSP]
+    add     xSP, xS*2
+
+    ; Restore TSS selector; must mark it as not busy before using ltr (!)
+    ; ASSUME that this is supposed to be 'BUSY'. (saves 20-30 ticks on the T42p)
+    ; @todo get rid of sgdt
+    pop     xBX         ; saved TR
+    sub     xSP, xS*2
+    sgdt    [xSP]
+    mov     eax, ebx
+    and     al, 0F8h                                ; mask away TI and RPL bits, get descriptor offset.
+    add     eax, [xSP + 2]                          ; eax <- GDTR.address + descriptor offset.
+    and     dword [ss:eax + 4], ~0200h                 ; clear busy flag (2nd type2 bit)
+    ltr     bx
     add     xSP, xS*2