| /trunk/kernel/arch/ia32/include/syscall.h |
|---|
| File deleted |
| \ No newline at end of file |
| Property changes: |
| Deleted: svn:special |
| -* |
| \ No newline at end of property |
| /trunk/kernel/arch/ia32/include/asm.h |
|---|
| 247,22 → 247,6 |
| return v; |
| } |
| /** Write to MSR */ |
| static inline void write_msr(uint32_t msr, uint64_t value) |
| { |
| asm volatile ("wrmsr" : : "c" (msr), "a" ((uint32_t)(value)), |
| "d" ((uint32_t)(value >> 32))); |
| } |
| static inline uint64_t read_msr(uint32_t msr) |
| { |
| uint32_t ax, dx; |
| asm volatile ("rdmsr" : "=a"(ax), "=d"(dx) : "c" (msr)); |
| return ((uint64_t)dx << 32) | ax; |
| } |
| /** Return base address of current stack |
| * |
| * Return the base address of the current stack. |
| /trunk/kernel/arch/ia32/include/cpu.h |
|---|
| 35,21 → 35,12 |
| #ifndef KERN_ia32_CPU_H_ |
| #define KERN_ia32_CPU_H_ |
| #include <arch/pm.h> |
| #include <arch/asm.h> |
| #define EFLAGS_IF (1 << 9) |
| #define EFLAGS_RF (1 << 16) |
| #define CR4_OSFXSR_MASK (1<<9) |
| /* Support for SYSENTER and SYSEXIT */ |
| #define IA32_MSR_SYSENTER_CS 0x174 |
| #define IA32_MSR_SYSENTER_ESP 0x175 |
| #define IA32_MSR_SYSENTER_EIP 0x176 |
| #ifndef __ASM__ |
| #include <arch/pm.h> |
| #include <arch/asm.h> |
| typedef struct { |
| int vendor; |
| int family; |
| 60,8 → 51,9 |
| count_t iomapver_copy; /** Copy of TASK's I/O Permission bitmap generation count. */ |
| } cpu_arch_t; |
| #endif |
| #define CR4_OSFXSR_MASK (1<<9) |
| #endif |
| /** @} |
| /trunk/kernel/arch/ia32/Makefile.inc |
|---|
| 160,5 → 160,4 |
| arch/$(ARCH)/src/boot/boot.S \ |
| arch/$(ARCH)/src/boot/memmap.c \ |
| arch/$(ARCH)/src/fpu_context.c \ |
| arch/$(ARCH)/src/debugger.c \ |
| arch/$(ARCH)/src/syscall.c |
| arch/$(ARCH)/src/debugger.c |
| /trunk/kernel/arch/ia32/src/syscall.c |
|---|
| File deleted |
| /trunk/kernel/arch/ia32/src/asm.S |
|---|
| 147,45 → 147,6 |
| popfl |
| .endm |
| /* |
| * The SYSENTER syscall mechanism can be used for syscalls with |
| * four or fewer arguments. To pass these four arguments, we |
| * use four registers: EDX, ECX, EBX, ESI. The syscall number |
| * is passed in EAX. We use EDI to remember the return address |
| * and EBP to remember the stack. The INT-based syscall mechanism |
| * can actually handle six arguments plus the syscall number |
| * entirely in registers. |
| */ |
| .global sysenter_handler |
| sysenter_handler: |
| pushl %ebp # remember user stack |
| pushl %edi # remember return user address |
| pushl %gs # remember TLS |
| pushl %eax # syscall number |
| subl $8, %esp # unused sixth and fifth argument |
| pushl %esi # fourth argument |
| pushl %ebx # third argument |
| pushl %ecx # second argument |
| pushl %edx # first argument |
| movw $16, %ax |
| movw %ax, %ds |
| movw %ax, %es |
| cld |
| call syscall_handler |
| addl $28, %esp # remove arguments from stack |
| pop %gs # restore TLS |
| pop %edx # prepare return EIP for SYSEXIT |
| pop %ecx # prepare userspace ESP for SYSEXIT |
| sysexit # return to userspace |
| ## Declare interrupt handlers |
| # |
| # Declare interrupt handlers for n interrupt |
| /trunk/kernel/arch/ia32/src/proc/scheduler.c |
|---|
| 58,14 → 58,8 |
| */ |
| void before_thread_runs_arch(void) |
| { |
| uintptr_t kstk = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE - |
| CPU->arch.tss->esp0 = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE - |
| SP_DELTA]; |
| /* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */ |
| write_msr(IA32_MSR_SYSENTER_ESP, kstk); |
| /* Set kernel stack for CPL3 -> CPL0 switch via interrupt */ |
| CPU->arch.tss->esp0 = kstk; |
| CPU->arch.tss->ss0 = selector(KDATA_DES); |
| /* Set up TLS in GS register */ |
| /trunk/kernel/arch/ia32/src/cpu/cpu.c |
|---|
| 42,7 → 42,6 |
| #include <fpu_context.h> |
| #include <arch/smp/apic.h> |
| #include <arch/syscall.h> |
| /* |
| * Identification of CPUs. |
| 124,9 → 123,6 |
| : "i" (CR4_OSFXSR_MASK|(1<<10)) |
| ); |
| } |
| /* Setup fast SYSENTER/SYSEXIT syscalls */ |
| syscall_setup_cpu(); |
| } |
| void cpu_identify(void) |