Merge pull request #4 from Richard-Qin-001/dev/shell

Rebuilt the system's underlying structure; it is now stable enough to merge. 

The system now supports a read-only file system and has a simple shell implemented.

1 files changed, 5 insertions, 50 deletions

diff --git a/include/kernel/proc.h b/include/kernel/proc.h
index b557267..cbf2902 100644
--- a/include/kernel/proc.h
+++ b/include/kernel/proc.h
@@ -1,56 +1,8 @@
 #pragma once
 #include "common/types.h"
-#include "kernel/trap.h"
+#include "kernel/proc_def.h"
 #include "kernel/spinlock.h"
 
-struct Context
-{
-    uint64 ra;
-    uint64 sp;
-
-    uint64 s0;
-    uint64 s1;
-    uint64 s2;
-    uint64 s3;
-    uint64 s4;
-    uint64 s5;
-    uint64 s6;
-    uint64 s7;
-    uint64 s8;
-    uint64 s9;
-    uint64 s10;
-    uint64 s11;
-};
-
-enum ProcState{
-    UNUSED,
-    USED,
-    SLEEPING,
-    RUNNABLE,
-    RUNNING,
-    ZOMBIE,
-};
-
-struct Proc
-{
-    struct Context context;
-    struct Trapframe *tf;
-
-    uint64 *pagetable;
-
-    enum ProcState state;
-    int pid;
-
-    void* kstack;
-    char name[16];
-    uint64 sz;
-
-    struct Proc *parent;
-    void *chan;
-    int xstate;
-};
-
-
 namespace ProcManager
 {
     void init();
@@ -62,8 +14,11 @@ namespace ProcManager
     void user_init();
     void exit(int status);
     int wait(uint64 addr);
-    void sleep(void *chan, struct spinlock *lk);
+
+    void sleep(void *chan, Spinlock *lk);
     void wakeup(void *chan);
+
+    int growproc(int n);
 }
 
 void forkret();