Changeset c18e666 in mainline for kernel/arch/ia32/src/boot/boot.S

Timestamp:

2009-03-30T20:30:32Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0dd1d444

Parents:

18251cc

Message:

detect SYSENTER/SYSEXIT support on boot
(this serves as a hint for people who try to boot HelenOS on Bochs emulating plain Pentium,
unfortunatelly it also kills VirtualBox, as it does not support SYSENTER/SYSEXIT officially,
see ​http://www.virtualbox.org/ticket/1248)

File:

• kernel/arch/ia32/src/boot/boot.S (modified) (4 diffs)

kernel/arch/ia32/src/boot/boot.S

@@ -32 +32 @@
 #include <arch/mm/page.h>
 #include <arch/pm.h>
+#include <arch/cpuid.h>
 
 #define START_STACK (BOOT_OFFSET - BOOT_STACK_SIZE)
@@ -68 +69 @@
         movl %ebx, grub_ebx
         
-        xorl %eax, %eax
+        movl $(INTEL_CPUID_LEVEL), %eax
         cpuid
         cmp $0x0, %eax              # any function > 0?
         jbe pse_unsupported
-        movl $0x1, %eax             # basic function code 1
+        
+        movl $(INTEL_CPUID_STANDARD), %eax
         cpuid
-        bt $3, %edx                 # test if PSE is supported
+        bt $(INTEL_PSE), %edx
         jc pse_supported
         
@@ -82 +84 @@
         
         pse_supported:
+        
+        bt $(INTEL_SEP), %edx
+        jc sep_supported
+        
+                movl $sep_msg, %esi
+                jmp error_halt
+        
+        sep_supported:
 
 #include "vesa_prot.inc"
@@ -214 +224 @@
 pse_msg:
         .asciz "Page Size Extension not supported. System halted."
+
+sep_msg:
+        .asciz "SYSENTER/SYSEXIT not supported. System halted."