Changeset 3b3e776 in mainline for kernel/arch/amd64/src/boot/boot.S

Timestamp:

2010-02-05T10:57:50Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

0358da0

Parents:

3f085132 (diff), b4cbef1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged with head

File:

• kernel/arch/amd64/src/boot/boot.S (modified) (2 diffs)

kernel/arch/amd64/src/boot/boot.S

@@ -174 +174 @@
         call arch_pre_main
         
+        # create the first stack frame
+        pushq $0
+        movq %rsp, %rbp
+
         call main_bsp
         
@@ -329 +333 @@
 
 extended_cpuid_msg:
-        .asciz "Extended CPUID not supported. System halted."
+        .asciz "Error: Extended CPUID not supported -- CPU is not 64-bit. System halted."
 long_mode_msg:
-        .asciz "64 bit long mode not supported. System halted."
+        .asciz "Error: 64-bit long mode not supported. System halted."
 noexecute_msg:
-        .asciz "No-execute pages not supported. System halted."
+        .asciz "Error: No-execute pages not supported. System halted."
 fx_msg:
-        .asciz "FXSAVE/FXRESTORE instructions not supported. System halted."
+        .asciz "Error: FXSAVE/FXRESTORE instructions not supported. System halted."
 sse2_msg:
-        .asciz "SSE2 instructions not supported. System halted."
+        .asciz "Error: SSE2 instructions not supported. System halted."