Changeset 65366 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Timestamp:

Jan 18, 2017 7:34:34 PM (8 years ago)

Author:

vboxsync

Message:

bs3kit: More #PF testing.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• bs3-mode-CpuDetect.asm (modified) (1 diff)
• bs3kit.h (modified) (1 diff)
• bs3kit.mac (modified) (1 diff)

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

@@ -294 +294 @@
         test    edx, X86_CPUID_EXT_FEATURE_EDX_LONG_MODE
         jz      .no_long_mode
-        or      ax, BS3CPU_F_CPUID_EXT_LEAVES | BS3CPU_F_LONG_MODE
-        jmp     .return
+        or      ah, ((BS3CPU_F_CPUID_EXT_LEAVES | BS3CPU_F_LONG_MODE) >> 8)
+        jmp     .no_check_for_nx
 .no_long_mode:
-        or      ax, BS3CPU_F_CPUID_EXT_LEAVES
-        jmp     .return
+        or      ah, (BS3CPU_F_CPUID_EXT_LEAVES >> 8)
+.no_check_for_nx:
+        test    edx, X86_CPUID_EXT_FEATURE_EDX_NX
+        jz      .return
+        or      ax, BS3CPU_F_NX
+        jmp     .return
+
 .no_ext_leaves:
         pop     xAX                     ; restore PAE+PProOrNewer

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -3381 +3381 @@
 /** Flag indicating that the CPU supports long mode. */
 #define BS3CPU_F_LONG_MODE          UINT16_C(0x1000)
+/** Flag indicating that the CPU supports NX. */
+#define BS3CPU_F_NX                 UINT16_C(0x2000)
 /** @} */
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.mac

@@ -1703 +1703 @@
 %define BS3CPU_F_PSE_BIT            11
 %define BS3CPU_F_LONG_MODE          0x1000
+%define BS3CPU_F_LONG_MODE_BIT      12
+%define BS3CPU_F_NX                 0x2000
+%define BS3CPU_F_NX_BIT             13
 ;; @}