Changeset 54474 in vbox

Timestamp:

Feb 25, 2015 9:20:30 AM (10 years ago)

Author:

vboxsync

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

98580

Message:

VMMSwitcher: fixed two typos which prevented proper handling of the local APIC in x2APIC mode for 64-bit guests on 32-bit hosts and raw mode on 32-bit hosts

Location:

trunk/src/VBox/VMM/VMMSwitcher

Files:

• AMD64andLegacy.mac (modified) (4 diffs)
• LegacyandAMD64.mac (modified) (4 diffs)
• PAEand32Bit.mac (modified) (4 diffs)

trunk/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac

@@ -109 +109 @@
     je      gth64_x2apic
 
-    ; Legacy APIC mode:
+    ; Legacy xAPIC mode:
     mov     r8, [rdx + r8 + CPUMCPU.pvApicBase]
     shr     ecx, 1
@@ -133 +133 @@
     jmp     gth64_apic_done
 
-    ; X2 APIC mode:
+    ; x2APIC mode:
 gth64_x2apic:
     mov     r8, rax                     ; save rax
@@ -338 +338 @@
     cmp     byte [rdx + r8 + CPUMCPU.fX2Apic], 1
     je      htg_x2apic
+
+    ; Legacy xAPIC mode:
     mov     rbx, [rdx + r8 + CPUMCPU.pvApicBase]
     or      rbx, rbx
@@ -400 +402 @@
     jmp     htg_apic_done
 
-    ; X2APIC?
+    ; x2APIC mode:
 htg_x2apic:
     mov     r15, rdx                    ; save rdx

trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac

@@ -178 +178 @@
     je      gth_x2apic
 
+    ; Legacy xAPIC mode:
     mov     edx, [edx + CPUMCPU.pvApicBase]
     shr     ecx, 1
@@ -201 +202 @@
     jmp     gth_apic_done
 
+    ; x2APIC mode:
 gth_x2apic:
     ;DEBUG_CMOS_STACK32 7ch
@@ -324 +326 @@
 
 %ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
+    ; Block Local APIC NMI vectors
     DEBUG32_S_CHAR('f')
     DEBUG32_S_CHAR(';')
-    cmp     byte [edx + CPUMCPU.pvApicBase], 1
+    cmp     byte [edx + CPUMCPU.fX2Apic], 1
     je      htg_x2apic
 
+    ; Legacy xAPIC mode:
     mov     ebx, [edx + CPUMCPU.pvApicBase]
     or      ebx, ebx
@@ -390 +394 @@
     jmp     htg_apic_done
 
+    ; x2APIC mode:
 htg_x2apic:
     mov     esi, edx                    ; Save edx.

trunk/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac

@@ -91 +91 @@
     je      gth_x2apic
 
+    ; Legacy xAPIC mode:
     mov     edx, [edx + CPUMCPU.pvApicBase]
     shr     ecx, 1
@@ -114 +115 @@
     jmp     gth_apic_done
 
+    ; x2APIC mode:
 gth_x2apic:
     push    eax                         ; save eax
@@ -218 +220 @@
     pop     dword [edx + CPUMCPU.Host.eflags]
 
+%ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
     ; Block Local APIC NMI vectors
-%ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
-    cmp     byte [edx + CPUMCPU.pvApicBase], 1
+    cmp     byte [edx + CPUMCPU.fX2Apic], 1
     je      htg_x2apic
 
+    ; Legacy xAPIC mode:
     mov     ebx, [edx + CPUMCPU.pvApicBase]
     or      ebx, ebx
@@ -286 +289 @@
     jmp     htg_apic_done
 
+    ; x2APIC mode:
 htg_x2apic:
     mov     esi, edx                    ; Save edx.