Changeset 1d3d2cf in mainline for kernel/arch/ia32/src/boot

Timestamp:

2010-08-11T14:18:34Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

be3f94c

Parents:

482dde7

Message:

rename gdtselector to GDT_SELECTOR to make explicit it is a macro
unify how bootstrap_gdtr is defined on amd64 and ia32

Location:

kernel/arch/ia32/src/boot

Files:

• boot.S (modified) (3 diffs)
• vesa_real.inc (modified) (2 diffs)
• vesa_ret.inc (modified) (2 diffs)

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

@@ -78 +78 @@
         
         /* Initialize Global Descriptor Table register */
-        lgdtl KA2PA(bootstrap_gdtr)
+        lgdtl bootstrap_gdtr
         
         /* Kernel data + stack */
-        movw $gdtselector(KDATA_DES), %cx
+        movw $GDT_SELECTOR(KDATA_DES), %cx
         movw %cx, %es
         movw %cx, %fs
@@ -88 +88 @@
         movw %cx, %ss
         
-        jmpl $gdtselector(KTEXT_DES), $multiboot_meeting_point
+        jmpl $GDT_SELECTOR(KTEXT_DES), $multiboot_meeting_point
         multiboot_meeting_point:
         
@@ -514 +514 @@
 page_directory:
         .space 4096, 0
+
+bootstrap_gdtr:
+        .word GDT_SELECTOR(GDT_ITEMS)
+        .long KA2PA(gdt)
 
 grub_eax:

kernel/arch/ia32/src/boot/vesa_real.inc

@@ -30 +30 @@
 .code32
 vesa_init:
-        jmp $gdtselector(VESA_INIT_DES), $vesa_init_real - vesa_init
+        jmp $GDT_SELECTOR(VESA_INIT_DES), $vesa_init_real - vesa_init
 
 .code16
@@ -335 +335 @@
                 vesa_leave_real2:
                 
-                        ljmpl $gdtselector(KTEXT32_DES), $(vesa_init_protected - vesa_init + VESA_INIT_SEGMENT << 4)
+                        ljmpl $GDT_SELECTOR(KTEXT32_DES), $(vesa_init_protected - vesa_init + VESA_INIT_SEGMENT << 4)
         
         no_mode:

kernel/arch/ia32/src/boot/vesa_ret.inc

@@ -7 +7 @@
         
         /* Kernel data + stack */
-        movw $gdtselector(KDATA_DES), %cx
+        movw $GDT_SELECTOR(KDATA_DES), %cx
         movw %cx, %es
         movw %cx, %fs
@@ -14 +14 @@
         movw %cx, %ss
         
-        jmpl $gdtselector(KTEXT_DES), $vesa_meeting_point
+        jmpl $GDT_SELECTOR(KTEXT_DES), $vesa_meeting_point