Changeset f476e76 in mainline for kernel/arch/ia32/src/boot/boot.S

Timestamp:

2006-07-24T12:24:19Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d227101

Parents:

0356274

Message:

unify bootstrapping

File:

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

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

@@ -37 +37 @@
 .section K_TEXT_START, "ax"
 
-KTEXT=8
-KDATA=16
-
 .code32
 .align 4
@@ -57 +54 @@
         lgdt KA2PA(bootstrap_gdtr)              # initialize Global Descriptor Table register
 
-        movw $KDATA, %cx
+        movw $selector(KDATA_DES), %cx
         movw %cx, %es
         movw %cx, %fs
@@ -64 +61 @@
         movw %cx, %ss
         
-        jmpl $KTEXT, $multiboot_meeting_point
+        jmpl $selector(KTEXT_DES), $multiboot_meeting_point
         multiboot_meeting_point:
         
@@ -385 +382 @@
 9:
         
-        ljmpl $KTEXT, $(vesa_init_protect - vesa_init + VESA_INIT_SEGMENT << 4)
+        ljmpl $selector(KTEXT_DES), $(vesa_init_protect - vesa_init + VESA_INIT_SEGMENT << 4)
 
 0:# No prefered mode found
@@ -412 +409 @@
         popl %esp
 
-        movw $KDATA, %cx
+        movw $selector(KDATA_DES), %cx
         movw %cx, %es
         movw %cx, %fs
@@ -419 +416 @@
         movw %cx, %ss
         
-        jmpl $KTEXT, $vesa_meeting_point
+        jmpl $selector(KTEXT_DES), $vesa_meeting_point
 
 .align 4