working generic scheduler handling code

mmrp · mmrp · commit 976cf66ae549 · 2012-06-05T01:39:05.000+05:30
from  to
user	user
user 	sys
user	svc

sys	sys
sys	user
sys	svc

svc	user
svc	svc
svc 	sys
diff --git a/arch/exception.S b/arch/exception.S
@@ -32,14 +32,19 @@ undefined_vec:
 
 
 swi_vec:
-	stmfd sp!,{r0-r12,lr}
+	stmfd sp,{r0-r14}^
+	sub sp, sp, #60
+	stmfd sp!, {lr}
 	# read the swi instruction
 	ldr r0, [lr, #-4]
 	# mask of the top 8 bits
 	bic r0, r0, #0xff000000
 	mov lr,pc
 	ldr pc,=syscall
-	ldmfd sp!,{r0-r12,pc}^
+	ldmfd sp!, {lr}
+	ldmfd sp, {r0-r14}^
+	add sp, sp, #60
+	movs pc, lr
 
 abort_data_vec:
 	b abort_data_vec
diff --git a/arch/switch.S b/arch/switch.S
@@ -31,7 +31,12 @@ save_process_context_in_irq:
 	b restore_process_regs
 
 save_process_context_sys:
-	mov pc, lr
+	mov r0, lr
+	msr cpsr_c, #IRQ_MD
+	ldr sp, =IRQ_STACK
+	mov lr, r0
+	stmfd sp!, {r0-r12, lr}
+	b save_process_context_in_irq
 
 save_process_context_svc:
 	mov r0, sp
@@ -42,7 +47,7 @@ save_process_context_svc:
 	mov r0, lr
 	mrs r1, cpsr
 	mrs r2, spsr
-	stmia sp!, {r0-r3}
+	stmia sp!, {r0-r2}
 		
 	ldr sp, =SVC_STACK
 	b restore_process_regs	
@@ -72,9 +77,8 @@ restore_process_svc_regs:
 	msr spsr, r5
 	ldr r13, =nxt_pcb_ptr
 	ldr sp, [r13]
-	ldmia sp!, {r0-r12}
-	ldmia sp!, {r0,r14}
-	mov sp, r0
+	ldmia sp, {r0-r14}
+/*	mov sp, r0*/
 	mov pc, lr		/* we are already in svc mode, do not use movs, it will change mode */
 
 
@@ -119,14 +123,5 @@ restore_process_sys_regs:
 
 
 		
-
-
-.global cur_pcb_ptr, nxt_pcb_ptr
-
-.data
-cur_pcb_ptr:
-	.word 0x00000000
-nxt_pcb_ptr:
-	.word 0x00000000
 outage_string:
 	.string "You moron, screwed up everything"
diff --git a/include/support.h b/include/support.h
@@ -1,7 +1,7 @@
 #ifndef __SUPPORT_H
 #define __SUPPORT_H
 #define log_info_str(str,...) \
-			printk("%20s:%20s:%d:%s: "str"\n", __FILE__, __func__, __LINE__,get_cpsr_info(),##__VA_ARGS__);
+			printk("%15s:%15s:%d:%s: "str"\n", __FILE__, __func__, __LINE__,get_cpsr_info(),##__VA_ARGS__);
 //			printk(str, ##__VA_ARGS__);
 #define log_info() printk("%s:%s:%d: %s\n", __FILE__, __func__, __LINE__, get_cpsr_info())
 
diff --git a/kernel/main.c b/kernel/main.c
@@ -21,6 +21,7 @@ void mem_init();
 void scheduler_init();
 int idle_thread();
 int normal_thread();
+int normal_thread1();
 
 #define QEMU_CMDLINE_ADDR 0x12c
 
@@ -50,6 +51,8 @@ int main()
 	
 
 	create_thread(normal_thread, "normal_thread", 0x110);
+	create_thread(normal_thread, "normal_thread1", 0x110);
+	create_thread(normal_thread1, "screw_up", 0x11f);
 	
 
 	__asm__ __volatile__("msr cpsr_c, #0x1f");
diff --git a/kernel/process.c b/kernel/process.c
@@ -4,26 +4,47 @@
 void dump_regs();
 int idle_thread()
 {
+//	set_stack_top(get_current()->usr_stack_top);
+	__asm__ __volatile__("mov sp, %0"::"r"(get_usr_stack()));
 	printk("In idle thread: %d\n", get_pid());
-	int i=0;
+	int i=100;
+	int stop;
 	while (1) {
 		sleep(1000, get_pid());
-		log_info_str("Running %s: %d", get_task_name(), i++);
-		dump_regs();
+		__asm__ __volatile("mov %0, sp" :"=r"(stop)::);
+		log_info_str("Running %s: %d, stop = %x", get_task_name(), i++, stop);
+	//	dump_regs();
 	}
 	return 0;
 }
 int normal_thread()
 {
 	printk("Normal thread %d\n", get_pid());
-	int i = 0;
+	int i = 20;
+	int stop = 0;
 	while (1) {
 		sleep(1000, get_pid());
-		dump_regs();
-		log_info_str("Running %s: pid = %d,%d", get_task_name(), get_pid(), i++);
+	//	dump_regs();
+		__asm__ __volatile("mov %0, sp" :"=r"(stop)::);
+		log_info_str("Running %s: pid = %d,%d, stop = %x", get_task_name(), get_pid(), i++, stop);
 	 	__asm__ __volatile__("swi #20"::);
-		log_info_str("back to user space id = %d\n", get_pid());
-		dump_regs();
+		log_info_str("back to user space %s: pid = %d,%d, stop = %x", get_task_name(), get_pid(), i++, stop);
+	//	dump_regs();
+	}
+	return 0;
+}
+
+int normal_thread1()
+{
+	printk("Normal thread1 %d\n", get_pid());
+	int i = 200;
+	int stop = 0;
+	while (1) {
+		__asm__ __volatile("mov %0, sp" :"=r"(stop)::);
+		log_info_str("before schedule %s: pid = %d,%d, stop = %x", get_task_name(), get_pid(), i++, stop);
+		schedule();
+		log_info_str("after schedule %s: pid = %d,%d, stop = %x", get_task_name(), get_pid(), i++, stop);
+	//	dump_regs();
 	}
 	return 0;
 }
diff --git a/kernel/sched.c b/kernel/sched.c
@@ -13,7 +13,10 @@
  */
 
 //extern int context_switch_req;
+#if 0
 extern int cur_pcb_ptr, nxt_pcb_ptr;
+#endif
+pcontext *cur_pcb_ptr, *nxt_pcb_ptr;
 static int sched_needed;
 
 extern void context_switch();
@@ -71,8 +74,8 @@ void schedule()
 
 	printk("***********Context switch ************\n");
 	unset_schedule_needed();
-	cur_pcb_ptr = (int)get_current();
-	nxt_pcb_ptr = (int)(get_current()->next);
+	cur_pcb_ptr = get_current();
+	nxt_pcb_ptr = (get_current()->next);
 	
 	switch (get_cur_mode()) {
 
diff --git a/kernel/syscall.c b/kernel/syscall.c
@@ -22,10 +22,8 @@ static long syscall_table[MAX_SYSCALL+1]= {0};
 void syscall(int no)
 {
 	log_info_str("In  syscall: %d before schedule", no);
-	dump_regs();
 	schedule();
-	dump_regs();
-	//log_info_str("In  syscall: %d after schedule", no);
+	log_info_str("In  syscall: %d after schedule", no);
 }
 
 void __div0(void)
diff --git a/kernel/task.c b/kernel/task.c
@@ -78,10 +78,13 @@ char *get_task_name()
 	return get_current()->name;
 
 }
-
+int get_usr_stack()
+{
+	return (long)((get_current())->usr_stack_top);
+}
 int get_svc_stack()
 {
-	return (get_current())->svc_stack_top;
+	return (long)((get_current())->svc_stack_top);
 }
 
 pcontext *common_thread_create(int pid, int (*thread_fn)(), const char *name, unsigned int mode)

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,8 @@ static long syscall_table[MAX_SYSCALL+1]= {0};`
`22`	`22`	`void syscall(int no)`
`23`	`23`	`{`
`24`	`24`	`log_info_str("In syscall: %d before schedule", no);`
`25`		`- dump_regs();`
`26`	`25`	`schedule();`
`27`		`- dump_regs();`
`28`		`- //log_info_str("In syscall: %d after schedule", no);`
	`26`	`+ log_info_str("In syscall: %d after schedule", no);`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`void __div0(void)`
Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,13 @@ char *get_task_name()`
`78`	`78`	`return get_current()->name;`
`79`	`79`
`80`	`80`	`}`
`81`		`-`
	`81`	`+int get_usr_stack()`
	`82`	`+{`
	`83`	`+ return (long)((get_current())->usr_stack_top);`
	`84`	`+}`
`82`	`85`	`int get_svc_stack()`
`83`	`86`	`{`
`84`		`- return (get_current())->svc_stack_top;`
	`87`	`+ return (long)((get_current())->svc_stack_top);`
`85`	`88`	`}`
`86`	`89`
`87`	`90`	`pcontext common_thread_create(int pid, int (thread_fn)(), const char *name, unsigned int mode)`