Changeset 8c15255 in mainline for kernel/arch/ia32/src

Timestamp:

2011-08-18T21:32:56Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

ac7f81d

Parents:

f4fa6d9

Message:

Add support for i486/vortex86 processor

Location:

kernel/arch/ia32/src

Files:

• asm.S (modified) (1 diff)
• cpu/cpu.c (modified) (1 diff)
• proc/scheduler.c (modified) (1 diff)
• syscall.c (modified) (2 diffs)

kernel/arch/ia32/src/asm.S

@@ -405 +405 @@
         xorl %eax, %eax
         cmpl $(GDT_SELECTOR(KTEXT_DES)), ISTATE_OFFSET_CS(%esp)
+#ifdef PROCESSOR_i486
+        jz 0f
+        movl %eax, %ebp
+0:
+#else
         cmovnzl %eax, %ebp
+#endif
 
         movl %ebp, ISTATE_OFFSET_EBP_FRAME(%esp)

kernel/arch/ia32/src/cpu/cpu.c

@@ -118 +118 @@
                 );
         }
-        
+
+#ifndef PROCESSOR_i486
         if (CPU->arch.fi.bits.sep) {
                 /* Setup fast SYSENTER/SYSEXIT syscalls */
                 syscall_setup_cpu();
         }
+#endif
 }
 

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

@@ -60 +60 @@
         uintptr_t kstk = (uintptr_t) &THREAD->kstack[STACK_SIZE];
         
+#ifndef PROCESSOR_i486
         if (CPU->arch.fi.bits.sep) {
                 /* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */
                 write_msr(IA32_MSR_SYSENTER_ESP, kstk - sizeof(istate_t));
         }
+#endif
         
         /* Set kernel stack for CPL3 -> CPL0 switch via interrupt */

kernel/arch/ia32/src/syscall.c

@@ -39 +39 @@
 #include <arch/pm.h>
 
+#ifndef PROCESSOR_i486
 /** Enable & setup support for SYSENTER/SYSEXIT */
 void syscall_setup_cpu(void)
@@ -49 +50 @@
         write_msr(IA32_MSR_SYSENTER_EIP, (uint32_t) sysenter_handler);
 }
+#endif
 
 /** @}