Changeset 00aece0 in mainline for kernel/arch/ia32/src/boot/multiboot.S

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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:

Merge mainline changes.

File:

• kernel/arch/ia32/src/boot/multiboot.S (moved) (moved from kernel/arch/ia32/src/boot/boot.S ) (10 diffs)

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

@@ -2 +2 @@
  * Copyright (c) 2001 Jakub Jermar
  * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
  *
@@ -29 +30 @@
 
 #include <arch/boot/boot.h>
-#include <arch/boot/memmap.h>
 #include <arch/mm/page.h>
 #include <arch/pm.h>
+#include <genarch/multiboot/multiboot.h>
 #include <arch/cpuid.h>
 
@@ -91 +92 @@
         multiboot_meeting_point:
         
-        /* Save GRUB arguments */
-        movl %eax, grub_eax
-        movl %ebx, grub_ebx
+        /* Save multiboot arguments */
+        movl %eax, multiboot_eax
+        movl %ebx, multiboot_ebx
         
         pm_status $status_prot
@@ -124 +125 @@
                 /* Map kernel and turn paging on */
                 pm_status $status_non_pse
-                call map_kernel
+                call map_kernel_non_pse
         
         stack_init:
@@ -134 +135 @@
         pm2_status $status_prot3
         
-        /* Call arch_pre_main(grub_eax, grub_ebx) */
-        pushl grub_ebx
-        pushl grub_eax
+        /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
+        pushl multiboot_ebx
+        pushl multiboot_eax
         call arch_pre_main
         
@@ -195 +196 @@
  *
  */
-.global map_kernel
-map_kernel:
+.global map_kernel_non_pse
+map_kernel_non_pse:
         /* Paging features */
         movl %cr4, %ecx
@@ -299 +300 @@
 find_mem_for_pt:
         /* Check if multiboot info is present */
-        cmpl $MULTIBOOT_LOADER_MAGIC, grub_eax
+        cmpl $MULTIBOOT_LOADER_MAGIC, multiboot_eax
         je check_multiboot_map
                 
@@ -307 +308 @@
                 
                 /* Copy address of the multiboot info to ebx */
-                movl grub_ebx, %ebx
+                movl multiboot_ebx, %ebx
                 
                 /* Check if memory map flag is present */
@@ -701 +702 @@
         .space 4096, 0
 
+.global bootstrap_gdtr
 bootstrap_gdtr:
         .word GDT_SELECTOR(GDT_ITEMS)
         .long KA2PA(gdt)
 
-grub_eax:
+.global multiboot_eax
+multiboot_eax:
         .long 0
-grub_ebx:
+
+.global multiboot_ebx
+multiboot_ebx:
         .long 0
 
@@ -725 +730 @@
 status_vesa_copy:
         .asciz "[vesa_copy] "
-status_grub_cmdline:
-        .asciz "[grub_cmdline] "
+status_multiboot_cmdline:
+        .asciz "[multiboot_cmdline] "
 status_vesa_real:
         .asciz "[vesa_real] "