Changeset 7cb567cd in mainline for kernel/arch/ia32/src/boot

Timestamp:

2007-04-08T20:52:53Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e5dbbe5

Parents:

328f324b

Message:

map kernel pages explicitly as writable (this solves compatibility issues with Intel Core 2)
make VESA framebuffer initialization more robust

File:

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

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

@@ -64 +64 @@
         multiboot_meeting_point:
         
-        pushl %ebx                                                      # save parameters from GRUB
-        pushl %eax
+        movl %eax, grub_eax                                     # save parameters from GRUB
+        movl %ebx, grub_ebx
         
         xorl %eax, %eax  
@@ -105 +105 @@
         call map_kernel                                                 # map kernel and turn paging on
         
-        popl %eax
-        popl %ebx
+        movl grub_eax, %eax
+        movl grub_ebx, %ebx
         cmpl $MULTIBOOT_LOADER_MAGIC, %eax                              # compare GRUB signature
         je valid_boot
@@ -482 +482 @@
 .code32
 vesa_init_protect:
-        popl %esp
-
         movw $selector(KDATA_DES), %cx
         movw %cx, %es
@@ -491 +489 @@
         movw %cx, %ss
         
+        movl $START_STACK, %esp                 # initialize stack pointer
+
         jmpl $selector(KTEXT_DES), $vesa_meeting_point
 
@@ -503 +503 @@
         .space 4096, 0
 
+grub_eax:
+        .long 0
+
+grub_ebx:
+        .long 0
+
 pse_msg:
         .ascii "Page Size Extension not supported. System halted.\0"