Changeset dd80fc6 in mainline for arch/ia32/src/boot/boot.S

Timestamp:

2005-09-03T22:26:31Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5eb1379

Parents:

5260478

Message:

GRUB basic booting (IA-32)

File:

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

arch/ia32/src/boot/boot.S

@@ -53 +53 @@
         call memmap_arch_init
         
-        lgdt bsp_bootstrap_gdtr                                 # initialize Global Descriptor Table register
+        lgdt real_bootstrap_gdtr                                # initialize Global Descriptor Table register
         
         movl %cr0, %eax
@@ -94 +94 @@
         rep movsb
         
-        jmp protected
+        call main_bsp                   # never returns
+
+        cli
+        hlt
         
 multiboot_image_start:
-        movl BOOTSTRAP_OFFSET - 0x400, %esp             # initialize stack pointer
+        movl $BOOTSTRAP_OFFSET - 0x400, %esp                    # initialize stack pointer
         
-        lgdt gdtr                                                               # initialize Global Descriptor Table register
+        lgdt protected_bootstrap_gdtr - 0x80000000              # initialize Global Descriptor Table register
 
         movw $KDATA, %ax
@@ -105 +108 @@
         movw %ax, %gs
         movw %ax, %fs
-        movw %ax, %ds                                                   # kernel data + stack
+        movw %ax, %ds                                                                   # kernel data + stack
         movw %ax, %ss
         
-        jmpl $KTEXT, $multiboot_meeting_point
+        jmpl $KTEXT, $multiboot_meeting_point + BOOT_OFFSET
         multiboot_meeting_point:
         
-        call map_kernel                                                 # map kernel and turn paging on
+        call map_kernel                                                                 # map kernel and turn paging on
         
-protected:
-        call main_bsp           # never returns
+        call main_bsp - BOOT_OFFSET                                             # never returns
 
         cli