Changeset 1d3d2cf in mainline for kernel/arch/ia32

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

Files:

• include/pm.h (modified) (2 diffs)
• src/asm.S (modified) (4 diffs)
• src/boot/boot.S (modified) (3 diffs)
• src/boot/vesa_real.inc (modified) (2 diffs)
• src/boot/vesa_ret.inc (modified) (2 diffs)
• src/ddi/ddi.c (modified) (1 diff)
• src/pm.c (modified) (3 diffs)
• src/proc/scheduler.c (modified) (1 diff)
• src/syscall.c (modified) (1 diff)
• src/userspace.c (modified) (1 diff)

kernel/arch/ia32/include/pm.h

@@ -58 +58 @@
 #endif /* CONFIG_FB */
 
-#define gdtselector(des)  ((des) << 3)
+#define GDT_SELECTOR(des)  ((des) << 3)
 
 #define PL_KERNEL  0
@@ -153 +153 @@
 
 extern ptr_16_32_t gdtr;
-extern ptr_16_32_t bootstrap_gdtr;
 extern ptr_16_32_t protected_ap_gdtr;
 extern tss_t *tss_p;

kernel/arch/ia32/src/asm.S

@@ -225 +225 @@
          * Switch to kernel selectors.
          */
-        movw $(gdtselector(KDATA_DES)), %ax
+        movw $(GDT_SELECTOR(KDATA_DES)), %ax
         movw %ax, %ds
         movw %ax, %es
@@ -304 +304 @@
          * Switch to kernel selectors.
          */
-        movl $(gdtselector(KDATA_DES)), %eax
+        movl $(GDT_SELECTOR(KDATA_DES)), %eax
         movl %eax, %ds
         movl %eax, %es
@@ -407 +407 @@
          * Switch to kernel selectors.
          */
-        movl $(gdtselector(KDATA_DES)), %eax
+        movl $(GDT_SELECTOR(KDATA_DES)), %eax
         movl %eax, %ds
         movl %eax, %es
@@ -416 +416 @@
          */
         xorl %eax, %eax
-        cmpl $(gdtselector(KTEXT_DES)), ISTATE_OFFSET_CS(%esp)
+        cmpl $(GDT_SELECTOR(KTEXT_DES)), ISTATE_OFFSET_CS(%esp)
         cmovnzl %eax, %ebp
 

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

kernel/arch/ia32/src/ddi/ddi.c

@@ -153 +153 @@
          */
         gdt_p[TSS_DES].access = AR_PRESENT | AR_TSS | DPL_KERNEL;
-        tr_load(gdtselector(TSS_DES));
+        tr_load(GDT_SELECTOR(TSS_DES));
         
         /*

kernel/arch/ia32/src/pm.c

@@ -86 +86 @@
 
 /* gdtr is changed by kmp before next CPU is initialized */
-ptr_16_32_t bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((uintptr_t) gdt) };
 ptr_16_32_t gdtr = { .limit = sizeof(gdt), .base = (uintptr_t) gdt };
 
@@ -128 +127 @@
 
                 d->unused = 0;
-                d->selector = gdtselector(KTEXT_DES);
+                d->selector = GDT_SELECTOR(KTEXT_DES);
 
                 if (i == VECTOR_SYSCALL) {
@@ -283 +282 @@
          * to its own TSS. We just need to load the TR register.
          */
-        tr_load(gdtselector(TSS_DES));
+        tr_load(GDT_SELECTOR(TSS_DES));
         
         clean_IOPL_NT_flags();    /* Disable I/O on nonprivileged levels and clear NT flag. */

kernel/arch/ia32/src/proc/scheduler.c

@@ -67 +67 @@
         /* Set kernel stack for CPL3 -> CPL0 switch via interrupt */
         CPU->arch.tss->esp0 = kstk;
-        CPU->arch.tss->ss0 = gdtselector(KDATA_DES);
+        CPU->arch.tss->ss0 = GDT_SELECTOR(KDATA_DES);
         
         /* Set up TLS in GS register */

kernel/arch/ia32/src/syscall.c

@@ -45 +45 @@
 
         /* set kernel mode CS selector */
-        write_msr(IA32_MSR_SYSENTER_CS, gdtselector(KTEXT_DES));
+        write_msr(IA32_MSR_SYSENTER_CS, GDT_SELECTOR(KTEXT_DES));
         /* set kernel mode entry point */
         write_msr(IA32_MSR_SYSENTER_EIP, (uint32_t) sysenter_handler);

kernel/arch/ia32/src/userspace.c

@@ -75 +75 @@
                 "iret\n"
                 :
-                : [udata_des] "i" (gdtselector(UDATA_DES) | PL_USER),
+                : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
                   [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
                   [ipl] "r" (ipl),
-                  [utext_des] "i" (gdtselector(UTEXT_DES) | PL_USER),
+                  [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
                   [entry] "r" (kernel_uarg->uspace_entry),
                   [uarg] "r" (kernel_uarg->uspace_uarg),
-                  [tls_des] "r" (gdtselector(TLS_DES))
+                  [tls_des] "r" (GDT_SELECTOR(TLS_DES))
                 : "eax");