Changeset 48326 in vbox for trunk/src/VBox

Timestamp:

Sep 5, 2013 8:41:59 PM (11 years ago)

Author:

vboxsync

Message:

VMM: Nits.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0Mixed.mac (modified) (2 diffs)
• HMVMXR0.cpp (modified) (1 diff)

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

@@ -80 +80 @@
     sgdt    [xSP]
     mov     xAX, xBX
-    and     al, 0F8h                                ; Mask away TI and RPL bits, get descriptor offset.
+    and     eax, X86_SEL_MASK_OFF_RPL               ; Mask away TI and RPL bits leaving only the descriptor offset.
     add     xAX, [xSP + 2]                          ; eax <- GDTR.address + descriptor offset.
-    and     dword [ss:xAX + 4], ~0200h              ; Clear busy flag (2nd type2 bit).
+    and     dword [ss:xAX + 4], ~RT_BIT(9)          ; Clear the busy flag in TSS desc (bits 0-7=base, bit 9=busy bit).
     ltr     bx
     add     xSP, xCB * 2
@@ -343 +343 @@
     sgdt    [xSP]
     mov     xAX, xBX
-    and     al, 0F8h                                ; Mask away TI and RPL bits, get descriptor offset.
-    add     xAX, [xSP + 2]                          ; eax <- GDTR.address + descriptor offset.
-    and     dword [xAX + 4], ~0200h                 ; Clear busy flag (2nd type2 bit).
+    and     eax, X86_SEL_MASK_OFF_RPL           ; Mask away TI and RPL bits leaving only the descriptor offset.
+    add     xAX, [xSP + 2]                      ; eax <- GDTR.address + descriptor offset.
+    and     dword [xAX + 4], ~RT_BIT(9)         ; Clear the busy flag in TSS desc (bits 0-7=base, bit 9=busy bit).
     ltr     bx
     add     xSP, xCB * 2

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -4063 +4063 @@
         {
             pVCpu->hm.s.vmx.pfnStartVM = VMXR0SwitcherStartVM64;
-            /** @todo this isn't necessary, but I'm still seeing tripple faults. */
+            /** @todo this isn't necessary, but I'm still seeing triple faults. */
             VMCPU_FF_SET(pVCpu, VMCPU_FF_TO_R3);
             pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_VMX_EXIT_CTLS;