Changeset bf25efb in mainline

Timestamp:

2009-03-01T19:35:58Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

0d5a50c

Parents:

4b241f3

Message:

Rewrite rest of multiboot info parsing to C.

Location:

kernel/arch/ia32/src/boot

Files:

• boot.S (modified) (1 diff)
• cboot.c (modified) (1 diff)

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

@@ -105 +105 @@
         call map_kernel                                                 # map kernel and turn paging on
 
-        movl grub_eax, %eax
-        movl grub_ebx, %ebx
-        cmpl $MULTIBOOT_LOADER_MAGIC, %eax                              # compare GRUB signature
-        je valid_boot
-
-                xorl %ecx, %ecx                                                 # no memory map available
-                movl %ecx, e820counter
-
-                jmp invalid_boot
-
-        valid_boot:
-
-        movl grub_eax, %eax
-        movl grub_ebx, %ebx
-
-        # ia32_boot(grub_eax, grub_ebx)
-        pushl %ebx
-        pushl %eax
+        # ia32_cboot(grub_eax, grub_ebx)
+        pushl grub_ebx
+        pushl grub_eax
         call ia32_cboot         # Does not return.
 
         # Not reached.
-
-        invalid_boot:
 
         cli

kernel/arch/ia32/src/boot/cboot.c

@@ -53 +53 @@
         uint32_t i;
 
-        flags = mi->flags;
+        if (signature == MULTIBOOT_LOADER_MAGIC) {
+                flags = mi->flags;
+        } else {
+                /* No multiboot info available. */
+                flags = 0;
+        }
 
         /* Copy module information. */