Changeset 59945 in vbox

Timestamp:

Mar 7, 2016 4:21:15 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit/bs3-mode-CpuDetect.asm: Carry PAE flag.

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-CpuDetect.asm (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-CpuDetect.asm

@@ -216 +216 @@
 
         ; Check for extended leaves and long mode.
+        push    xAX                     ; save PAE flag
         mov     eax, 0x80000000
         cpuid
@@ -224 +225 @@
         mov     eax, 0x80000001
         cpuid
+        pop     xAX                     ; restore PAE flag
         test    edx, X86_CPUID_EXT_FEATURE_EDX_LONG_MODE
         jz      .no_long_mode
-        mov     xAX, BS3CPU_PProOrNewer | BS3CPU_F_CPUID | BS3CPU_F_CPUID_EXT_LEAVES | BS3CPU_F_LONG_MODE
+        or      xAX, BS3CPU_PProOrNewer | BS3CPU_F_CPUID_EXT_LEAVES | BS3CPU_F_LONG_MODE
         jmp     .return
 .no_long_mode:
-        mov     xAX, BS3CPU_PProOrNewer | BS3CPU_F_CPUID | BS3CPU_F_CPUID_EXT_LEAVES
+        or      xAX, BS3CPU_PProOrNewer | BS3CPU_F_CPUID_EXT_LEAVES
         jmp     .return
 .no_ext_leaves:
-        mov     xAX, BS3CPU_PProOrNewer | BS3CPU_F_CPUID
+        pop     xAX                     ; restore PAE flag
+        or      al, BS3CPU_PProOrNewer
 
 CPU 8086