20190622supress warning

Author: ComradeProgrammer

README.md

@@ -1,4 +0,0 @@
-# Report of "Raspberry Pi" Challenge Mission
-## Foreword
-I am extremely sorry that I have to write this report in English although my English is poor. It is because that when I finally start to write this report, I find some problems occured in my Ubuntu18.04LTS Operating System. I cannot install any Chinese input methods on Ubuntu, and I cannot fix this problem despite of all the efforts I poured on it. Because all the codes are written in this linux environment and I need to refer to my code to write this report, it's so difficult to shut down my computer and switch between Windows and Ubuntu again and again. <br>
-**I am extermely sorry for all the troubles I caused to the teachers and TAs. Thank you for your forgiveness and understanding**

include/env.h

@@ -41,6 +41,15 @@ struct Env {
 };
 extern struct Env *envs;
 extern struct Env *curenv;	 
-
 LIST_HEAD(Env_list, Env);
+
+unsigned long mkenvid(struct Env *e);
+int envid2env(unsigned long  envid, struct Env **penv, int checkperm);
+void env_init(void);
+int env_alloc(struct Env **new, unsigned long parent_id);
+void env_create_priority(unsigned char *binary, int size, int priority);
+void env_create(unsigned char *binary, int size);
+extern void env_pop_tf(struct Trapframe *tf,unsigned long* pgdir);
+void env_run(struct Env *e);
+void env_check();
 #endif // !_ENV_H_

include/printf.h renamed to include/os_printf.h

@@ -12,7 +12,7 @@
 #ifndef _printf_h_
 #define _printf_h_
 
-#include <stdarg.h>
+//#include <stdarg.h>
 void printf(char *fmt, ...);
 
 void _panic(const char *, int, const char *, ...)

include/pmap.h

@@ -2,7 +2,7 @@
 #define _PMAP_H_
 #include<mmu.h>
 #include<queue.h>
-#include<printf.h>
+#include<os_printf.h>
 
 
 LIST_HEAD(Page_list, Page);
@@ -38,8 +38,8 @@ extern struct Page *pages;
 
 
 void mips_detect_memory();
-static void *alloc(unsigned long n, unsigned long align, long clear);
-static unsigned long* boot_pgdir_walk(unsigned long* pud,unsigned long va,int create);
+//static void *alloc(unsigned long n, unsigned long align, long clear);
+//static unsigned long* boot_pgdir_walk(unsigned long* pud,unsigned long va,int create);
 void boot_map_segment(unsigned long* pgdir,unsigned long va,unsigned long size,
     unsigned long pa,unsigned long perm);
 void aarch64_vm_init();

include/syscall_lib.h

@@ -6,4 +6,6 @@
 
 #define SYS_putchar ((__SYSCALL_BASE ) + (0 ) )
 
+void invalid_syscall(long a0);
+int syscall_putchar(char ch);
 #endif

init/main.c

@@ -1,15 +1,18 @@
-#include <printf.h>
+#include <os_printf.h>
 #include<pmap.h>
 #include<mmu.h>
 #include<timerandirq.h>
 #include<helpfunct.h>
 #include<uart.h>
 #include<trapframe.h>
+#include<env.h>
 extern void printel();
+extern void irq_vector_init();
 extern void user_maina();
 extern void user_mainb();
+extern void enable_interrupt_controller();
 void main() {
-    unsigned long* tmp;
+    //unsigned long* tmp;
     printf(">>>main.c:\tmain is start ...>>>\n");
     printel();
     uart_init_boot();
@@ -20,21 +23,19 @@ void main() {
     mips_detect_memory();
     aarch64_vm_init();
     page_init();
-    irq_vector_init();
     env_init();
 
-    env_create(&(user_maina),0,1);
-     env_create(&(user_mainb),0,1);
-
+    env_create_priority((unsigned char *)(&(user_maina)),0,1);
+    env_create_priority((unsigned char *)(&(user_mainb)),0,1);
 
+    irq_vector_init();
     //enable_irq();
     enable_interrupt_controller();
     timer_init();
     printf(">>>timer interrupt started!\n");  
     //========TEST===========================
 
-    
-    //page_check();
+
     //========HALT==================================
 
     /*printf("HALT! ECHOING EVERYTHING BACK\n");

init/mmu.c

@@ -1,6 +1,6 @@
 #include<mmu.h>
 
-#include<printf.h>
+#include<os_printf.h>
 extern volatile unsigned char _data[];
 unsigned long freemem;
 void boot_mmu_setup(){

init/printel.c

@@ -1,4 +1,4 @@
-#include <printf.h>
+#include <os_printf.h>
 extern int get_el();
 void printel(){
     printf("Current exception level switched to: %d \r\n",get_el());

lib/entry.S

@@ -151,86 +151,25 @@ error_invalid_el0_32:
 	unimplement_entry  ERROR_INVALID_EL0_32
 
 el1_irq:
-	//unimplement_entry  IRQ_INVALID_EL1t
-	/*CLI
-	saveall
-	bl	handle_irq
-	restore
-	STI
-	eret*/
-
 el0_irq:
 	CLI
 	ldr x16,=0x82000000//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]
-*/
-
+	
 	bl handle_irq
 	restore 
-	STI
+	//STI
 	eret 
 
 el0_sync:
 .extern sys_call_table
 .extern invalid_syscall
 	CLI
-	ldr x16,=0x81fff000//TIMESTACK
+	ldr x16,=0x81fff000//kernel_sp
 	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
@@ -241,32 +180,6 @@ el0_sync:
 	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