implement sys_putchar

Author: ComradeProgrammer

include/env.h

@@ -2,7 +2,8 @@
 #define _ENV_H_
 #include<trapframe.h>
 #include<queue.h>
-#define UTOP 0x7f400000
+//#define UTOP 0x7f400000
+#define UTOP 0xe0000000
 #define LOG2NENV	10
 #define NENV (1<<10)
 #define USTACKTOP (UTOP - 2*BY2PG)

include/syscall_lib.h

@@ -0,0 +1,9 @@
+#ifndef _SYSCALL_LIB_H_
+#define _SYSCALL_LIB_H_
+
+#define __SYSCALL_BASE 9527
+#define __NR_SYSCALLS 20
+
+#define SYS_putchar ((__SYSCALL_BASE ) + (0 ) )
+
+#endif

init/main.c

@@ -27,7 +27,7 @@ void main() {
      env_create(&(user_mainb),0,1);
 
 
-    enable_irq();
+    //enable_irq();
     enable_interrupt_controller();
     timer_init();
     printf(">>>timer interrupt started!\n");  

lib/Makefile

@@ -7,7 +7,7 @@ INCLUDES := -I./ -I../ -I../include/
 
 .PHONY: clean
 
-all: print.o printf.o helpfunct.o env.o entry.o handleirq.o irq.o unimplement.o sched.o timer.o 
+all: print.o printf.o helpfunct.o env.o entry.o handleirq.o irq.o unimplement.o sched.o timer.o syscall_lib.o syscall_all.o msyscall.o
 
 clean:
 	rm -rf *~ *.o

lib/entry.S

@@ -70,7 +70,7 @@ b \label
 	ldr x16,[sp,#8*34]//pc
 	msr elr_el1,x16
 	add	sp, sp, #280		
-	eret
+	//eret
 .endm
 
 
@@ -97,7 +97,7 @@ vectors:
 	handler	fiq_invalid_el1h			// FIQ EL1h
 	handler	error_invalid_el1h			// Error EL1h
 
-	handler	sync_invalid_el0_64			// Synchronous 64-bit EL0
+	handler	el0_sync		// Synchronous 64-bit EL0
 	handler	el0_irq			// IRQ 64-bit EL0
 	handler	fiq_invalid_el0_64			// FIQ 64-bit EL0
 	handler	error_invalid_el0_64			// Error 64-bit EL0
@@ -163,9 +163,8 @@ el0_irq:
 	CLI
 	ldr x16,=0x82000000//TIMESTACK
 	mov sp,x16
-	//saveall
-
-	sub	sp, sp, #280
+	saveall
+	/*sub	sp, sp, #280
 	stp	x0, x1, [sp, #16 * 0]
 	stp	x2, x3, [sp, #16 * 1]
 	stp	x4, x5, [sp, #16 * 2]
@@ -182,6 +181,7 @@ el0_irq:
 	stp	x26, x27, [sp, #16 * 13]
 	stp	x28, x29, [sp, #16 * 14]
 	str	x30, [sp, #16 * 15] 
+
 	mrs x16,sp_el0
 	str x16,[sp,#8*31]
 	mrs x16,elr_el1
@@ -190,13 +190,88 @@ el0_irq:
 
 	mrs x16,spsr_el1
 	str x16,[sp,#8*33]
-
+*/
 
 	bl handle_irq
 	restore 
 	STI
 	eret 
 
+el0_sync:
+.extern sys_call_table
+.extern invalid_syscall
+	CLI
+	ldr x16,=0x81fff000//TIMESTACK
+	mov sp,x16
+	saveall
+	/*sub	sp, sp, #280
+	stp	x0, x1, [sp, #16 * 0]
+	stp	x2, x3, [sp, #16 * 1]
+	stp	x4, x5, [sp, #16 * 2]
+	stp	x6, x7, [sp, #16 * 3]
+	stp	x8, x9, [sp, #16 * 4]
+	stp	x10, x11, [sp, #16 * 5]
+	stp	x12, x13, [sp, #16 * 6]
+	stp	x14, x15, [sp, #16 * 7]
+	stp	x16, x17, [sp, #16 * 8]
+	stp	x18, x19, [sp, #16 * 9]
+	stp	x20, x21, [sp, #16 * 10]
+	stp	x22, x23, [sp, #16 * 11]
+	stp	x24, x25, [sp, #16 * 12]
+	stp	x26, x27, [sp, #16 * 13]
+	stp	x28, x29, [sp, #16 * 14]
+	str	x30, [sp, #16 * 15] 
+
+	mrs x16,sp_el0
+	str x16,[sp,#8*31]
+	mrs x16,elr_el1
+	str x16,[sp,#8*32]
+	str x16,[sp,#8*34]//pc
+
+	mrs x16,spsr_el1
+	str x16,[sp,#8*33]*/
+
+	ldr x17,=9527
+	sub x0,x0,x17
+	cmp  x0,#1//===========1 syscalls
+	b.ge invalid_syscall
+
+	adr x17,sys_call_table
+	add x17,x17,x0,lsl #3
+	ldr x17,[x17]
+	blr x17
+
+	/*ldp	x0, x1, [sp, #16 * 0]
+	ldp	x2, x3, [sp, #16 * 1]
+	ldp	x4, x5, [sp, #16 * 2]
+	ldp	x6, x7, [sp, #16 * 3]
+	ldp	x8, x9, [sp, #16 * 4]
+	ldp	x10, x11, [sp, #16 * 5]
+	ldp	x12, x13, [sp, #16 * 6]
+	ldp	x14, x15, [sp, #16 * 7]
+	ldp	x16, x17, [sp, #16 * 8]
+	ldp	x18, x19, [sp, #16 * 9]
+	ldp	x20, x21, [sp, #16 * 10]
+	ldp	x22, x23, [sp, #16 * 11]
+	ldp	x24, x25, [sp, #16 * 12]
+	ldp	x26, x27, [sp, #16 * 13]
+	ldp	x28, x29, [sp, #16 * 14]
+	ldr	x30, [sp, #16 * 15] 
+	
+	ldr x16,[sp,#8*31]
+	msr sp_el0,x16
+
+	ldr x16,[sp,#8*33]
+	msr spsr_el1,x16
+
+	ldr x16,[sp,#8*34]//pc
+	msr elr_el1,x16
+	add	sp, sp, #280*/
+	restore		
+	//STI
+	eret 
+
+
 .globl irq_vector_init
 .extern vectors
 irq_vector_init:

lib/env.c

@@ -135,13 +135,15 @@ env_alloc(struct Env **new, unsigned long parent_id)
 		panic("fuck,env_create_priority:env_alloc failed");
 		return;
 	}
+	/*stack*/
 	struct Page *p = NULL;
 	r=page_alloc(&p);
 	p->pp_ref++;
 	if(r<0){
 		printf("env_create:page_alloc failed\n");
 		return;
 	}	
+	printf("fuck %x\n",e->env_pgdir);
 	r=page_insert(e->env_pgdir,p,USTACKTOP-BY2PG,PTE_V);
     /*Step 2: assign priority to the new env. */
 	e->env_pri=priority;
@@ -168,6 +170,7 @@ extern void env_pop_tf(struct Trapframe *tf,unsigned long* pgdir);
 
 void env_run(struct Env *e)
 {
+	extern void tlb_invalidate();
 	struct Trapframe *old=(struct Trapframe*)(TIMESTACK-sizeof(struct Trapframe));
 	/*Step 1: save register state of curenv. */
     /* Hint: if there is a environment running,you should do
@@ -186,7 +189,11 @@ void env_run(struct Env *e)
      * environment   registers and drop into user mode in the
      * the   environment.
      */
-
+	//printf("jump to %x of %x\n",curenv->env_tf.pc,curenv->env_id);
+	/*printf("pgdir %x,pmd %x\n",curenv->env_pgdir,(curenv->env_pgdir)[PUDX(USTACKTOP-BY2PG)]);
+	unsigned long* tmp=	PTE_ADDR((curenv->env_pgdir)[PUDX(USTACKTOP-BY2PG)]);
+	printf("pte%x\n",tmp[PMDX(USTACKTOP-BY2PG)]);*/
+	tlb_invalidate();
 	env_pop_tf(&(curenv->env_tf),curenv->env_pgdir);//---------
 
 }

lib/helpfunct.c

@@ -1,4 +1,5 @@
 #include<uart.h>
+#include<syscall_lib.h>
 void bcopy(const void *src, void *dst, unsigned long len)
 {
 	void *max;
@@ -45,11 +46,13 @@ void bzero(void *b, unsigned long len)
 }
 void user_maina(){
     while(1){
-        uart_send_boot('1');
+       syscall_putchar('1');
+		//uart_send_boot('1');
     }
 }
 void user_mainb(){
     while(1){
-        uart_send_boot('2');
+        //uart_send_boot('2');
+		syscall_putchar('2');
     }
 }

lib/msyscall.S

@@ -0,0 +1,4 @@
+.global msyscall
+msyscall:
+    svc #0
+    ret

lib/sched.c

@@ -1,7 +1,9 @@
 #include<env.h>
+#include<printf.h>
 int remaining_time;
 void sched_yield(){
     static int pos = -1;
+	//printf("sched!\n");
 	while(1){
 		pos = (pos+1)%NENV;
 		if(envs[pos].env_status==ENV_RUNNABLE){

lib/syscall_all.c

@@ -0,0 +1,8 @@
+#include<printf.h>
+#include<uart.h>
+int sys_putchar(long no,long ch){
+    
+    uart_send_boot(ch);
+    return 0;
+}
+long * const sys_call_table[] ={sys_putchar};

lib/syscall_lib.c

@@ -0,0 +1,12 @@
+#include<syscall_lib.h>
+#include<printf.h>
+
+void invalid_syscall(long a0){
+    printf("invalid syscall :%x\n",a0);
+    panic("error:syscall");
+}
+
+int syscall_putchar(char ch){
+    //printf("syscall:%c@%x\n",ch,&ch);
+    msyscall(SYS_putchar,(long)ch,0,0,0,0);
+}

lib/timer.S

@@ -2,7 +2,7 @@
 timer_init:
     mov x0,#0x3
     msr cntkctl_el1,x0
-    ldr x0,=(0x3b9aca0>>4)
+    ldr x0,=(0x3b9aca0>>6)
     //when the qemu start,the frequency is 0x3b9aca0 HZ
     //i don't know why i cannot change the frquency of it
     //doing so to so set 1s per exception