Changeset cb4b61d in mainline

Timestamp:

2005-04-17T18:09:26Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7eade45

Parents:

2968fe29

Message:

Added before_thread_runs() to cope with TSS of user space tasks.

Files:

• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/src/cpu/cpu.c (modified) (1 diff)
• arch/ia32/src/interrupt.c (modified) (2 diffs)
• arch/ia32/src/pm.c (modified) (1 diff)
• arch/ia32/src/proc/scheduler.c (added)
• arch/ia32/src/userspace.c (modified) (1 diff)
• arch/mips/src/fake.s (modified) (1 diff)
• include/proc/scheduler.h (modified) (1 diff)
• src/Makefile.config (modified) (1 diff)
• src/proc/scheduler.c (modified) (1 diff)
• src/proc/thread.c (modified) (1 diff)

arch/ia32/Makefile.inc

@@ -23 +23 @@
         arch/delay.s \
         arch/asm.s \
+        arch/proc/scheduler.c \
         arch/smp/ap.S \
         arch/smp/apic.c \

arch/ia32/src/cpu/cpu.c

@@ -105 +105 @@
 }
 
-void cpu_print_report(struct cpu* m)
+void cpu_print_report(cpu_t* m)
 {
         printf("cpu%d: (%s family=%d model=%d stepping=%d) %dMHz\n",

arch/ia32/src/interrupt.c

@@ -35 +35 @@
 #include <arch/asm.h>
 #include <mm/tlb.h>
+#include <arch.h>
 
 /*
@@ -91 +92 @@
 void syscall(__u8 n, __u32 stack[])
 {
-        printf("syscall... ");
-        thread_sleep(1);
+        printf("cpu%d: syscall\n", CPU->id);
+        thread_usleep(600);
 }
 

arch/ia32/src/pm.c

@@ -66 +66 @@
 struct tss *tss_p = NULL;
 
-/* gdtr changes everytime new CPU is initialized */
+/* gdtr is changed by kmp before next CPU is initialized */
 struct ptr_16_32 gdtr __attribute__ ((section ("K_DATA_START"))) = { .limit = sizeof(gdt), .base = (__address) gdt };
 struct ptr_16_32 idtr __attribute__ ((section ("K_DATA_START")))= { .limit = sizeof(idt), .base = (__address) idt };

arch/ia32/src/userspace.c

@@ -39 +39 @@
         
         pri = cpu_priority_high();
-        
-        /*
-         * Prepare TSS stack selector and pointers for next syscall.
-         */
-        CPU->arch.tss->esp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-8];
-        CPU->arch.tss->ss0 = selector(KDATA_DES);
-        
+
         __asm__ volatile (""
             "pushl %0\n"

arch/mips/src/fake.s

@@ -33 +33 @@
 .global asm_delay_loop
 .global userspace
+.global before_thread_runs
 
+before_thread_runs:
 userspace:
 calibrate_delay_loop:

include/proc/scheduler.h

@@ -56 +56 @@
 extern void kcpulb(void *arg);
 
+/*
+ * To be defined by architectures:
+ */
+ 
+extern void before_thread_runs(void);
+
 #endif

src/Makefile.config

@@ -6 +6 @@
 
 # Support for symetric multiprocessors
-SMP=__SMP__
+#SMP=__SMP__
 
 # Improved support for hyperthreading

src/proc/scheduler.c

@@ -202 +202 @@
                          * This is the place where threads leave scheduler();
                          */
+                        before_thread_runs();
                         spinlock_unlock(&THREAD->lock);
                         cpu_priority_restore(THREAD->saved_context.pri);

src/proc/thread.c

@@ -70 +70 @@
         void *arg = THREAD->thread_arg;
 
+        before_thread_runs();
+
         /* this is where each thread wakes up after its creation */
         spinlock_unlock(&THREAD->lock);