Changeset 0160b1c8 in mainline

Timestamp:

2009-03-13T12:28:12Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

99d6fd0

Parents:

afdce6eb

Message:

rename selector() to gdtselector() to unify with amd64

Location:

kernel/arch/ia32

Files:

• include/pm.h (modified) (1 diff)
• src/ddi/ddi.c (modified) (1 diff)
• src/pm.c (modified) (2 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

@@ -59 +59 @@
 
 
-#define selector(des)   ((des) << 3)
+#define gdtselector(des)        ((des) << 3)
 
 #define PL_KERNEL       0

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

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

kernel/arch/ia32/src/pm.c

@@ -128 +128 @@
 
                 d->unused = 0;
-                d->selector = selector(KTEXT_DES);
+                d->selector = gdtselector(KTEXT_DES);
 
                 d->access = AR_PRESENT | AR_INTERRUPT;  /* masking interrupt */
@@ -215 +215 @@
          * to its own TSS. We just need to load the TR register.
          */
-        tr_load(selector(TSS_DES));
+        tr_load(gdtselector(TSS_DES));
         
         clean_IOPL_NT_flags();    /* Disable I/O on nonprivileged levels and clear NT flag. */

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

@@ -66 +66 @@
         /* Set kernel stack for CPL3 -> CPL0 switch via interrupt */
         CPU->arch.tss->esp0 = kstk;
-        CPU->arch.tss->ss0 = selector(KDATA_DES);
+        CPU->arch.tss->ss0 = gdtselector(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, selector(KTEXT_DES));
+        write_msr(IA32_MSR_SYSENTER_CS, gdtselector(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" (selector(UDATA_DES) | PL_USER),
+                : [udata_des] "i" (gdtselector(UDATA_DES) | PL_USER),
                   [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
                   [ipl] "r" (ipl),
-                  [utext_des] "i" (selector(UTEXT_DES) | PL_USER),
+                  [utext_des] "i" (gdtselector(UTEXT_DES) | PL_USER),
                   [entry] "r" (kernel_uarg->uspace_entry),
                   [uarg] "r" (kernel_uarg->uspace_uarg),
-                  [tls_des] "r" (selector(TLS_DES))
+                  [tls_des] "r" (gdtselector(TLS_DES))
                 : "eax");