| /trunk/kernel/arch/ia32/include/pm.h |
|---|
| 58,7 → 58,7 |
| #endif /* CONFIG_FB */ |
| #define selector(des) ((des) << 3) |
| #define gdtselector(des) ((des) << 3) |
| #define PL_KERNEL 0 |
| #define PL_USER 3 |
| /trunk/kernel/arch/ia32/src/syscall.c |
|---|
| 44,7 → 44,7 |
| extern void sysenter_handler(void); |
| /* 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); |
| } |
| /trunk/kernel/arch/ia32/src/pm.c |
|---|
| 127,7 → 127,7 |
| d = &idt[i]; |
| d->unused = 0; |
| d->selector = selector(KTEXT_DES); |
| d->selector = gdtselector(KTEXT_DES); |
| d->access = AR_PRESENT | AR_INTERRUPT; /* masking interrupt */ |
| 214,7 → 214,7 |
| * As of this moment, the current CPU has its own GDT pointing |
| * 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. */ |
| clean_AM_flag(); /* Disable alignment check */ |
| /trunk/kernel/arch/ia32/src/ddi/ddi.c |
|---|
| 156,7 → 156,7 |
| * type must be changed to describe inactive TSS. |
| */ |
| gdt_p[TSS_DES].access = AR_PRESENT | AR_TSS | DPL_KERNEL; |
| tr_load(selector(TSS_DES)); |
| tr_load(gdtselector(TSS_DES)); |
| /* |
| * Update the generation count so that faults caused by |
| /trunk/kernel/arch/ia32/src/proc/scheduler.c |
|---|
| 65,7 → 65,7 |
| /* 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 */ |
| set_tls_desc(THREAD->arch.tls); |
| /trunk/kernel/arch/ia32/src/userspace.c |
|---|
| 74,13 → 74,13 |
| "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"); |
| /* Unreachable */ |