Changeset 1f5c9c96 in mainline for kernel/arch/amd64/src/boot/multiboot.S

Timestamp:

2011-12-02T17:29:43Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b8b1e631, c3887ad

Parents:

c48f6ab

Message:

implement multiboot v2 specification and use it in GRUB for UEFI

• improve multiboot v1 code, move defines to a common location
• rename VESA framebuffer stuff to generic "boot framebuffer"
• small collateral changes

File:

• kernel/arch/amd64/src/boot/multiboot.S (moved) (moved from kernel/arch/amd64/src/boot/boot.S ) (6 diffs)

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

@@ -30 +30 @@
 
 #include <arch/boot/boot.h>
-#include <arch/boot/memmap.h>
 #include <arch/mm/page.h>
 #include <arch/mm/ptl.h>
 #include <arch/pm.h>
+#include <genarch/multiboot/multiboot.h>
+#include <arch/cpuid.h>
 #include <arch/cpu.h>
-#include <arch/cpuid.h>
 
 #define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
@@ -101 +101 @@
         multiboot_meeting_point:
         
-        /* Save GRUB arguments */
-        movl %eax, grub_eax
-        movl %ebx, grub_ebx
+        /*
+         * Protected 32-bit. We want to reuse the code-seg descriptor,
+         * the Default operand size must not be 1 when entering long mode.
+         */
+        
+        /* Save multiboot arguments */
+        movl %eax, multiboot_eax
+        movl %ebx, multiboot_ebx
         
         pm_status $status_prot
@@ -149 +154 @@
         
 #include "vesa_prot.inc"
-        
-        /*
-         * Protected 32-bit. We want to reuse the code-seg descriptor,
-         * the Default operand size must not be 1 when entering long mode.
-         */
         
         pm2_status $status_prot2
@@ -422 +422 @@
         long_status $status_long
         
-        /* Call arch_pre_main(grub_eax, grub_ebx) */
+        /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
         xorq %rdi, %rdi
-        movl grub_eax, %edi
+        movl multiboot_eax, %edi
         xorq %rsi, %rsi
-        movl grub_ebx, %esi
+        movl multiboot_ebx, %esi
         
         movabsq $arch_pre_main, %rax
@@ -645 +645 @@
 .section K_DATA_START, "aw", @progbits
 
+.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
 
@@ -670 +673 @@
 status_vesa_copy:
         .asciz "[vesa_copy] "
-status_grub_cmdline:
-        .asciz "[grub_cmdline] "
+status_multiboot_cmdline:
+        .asciz "[multiboot_cmdline] "
 status_vesa_real:
         .asciz "[vesa_real] "