Cleanup

earth/cpu_intr.c

@@ -21,13 +21,12 @@ void trap_entry() {
  asm("csrr %0, mcause" : "=r"(mcause));
 
  int id = mcause & 0x3FF;
- if (mcause & (1 << 31)) {
- (intr_handler != 0)? intr_handler(id) :
- FATAL("trap_entry: interrupt handler not registered");
- } else {
- (excp_handler != 0)? excp_handler(id) :
+ if (mcause & (1 << 31))
+ (intr_handler)? intr_handler(id) :
+ FATAL("trap_entry: intr_handler not registered");
+ else
+ (excp_handler)? excp_handler(id) :
  FATAL("trap_entry: exception handler not registered");
- }
 }
 
 int intr_enable() {

earth/cpu_mmu.c

@@ -120,8 +120,7 @@ void pagetable_identity_mapping(int pid) {
 }
 
 int page_table_map(int pid, int page_no, int frame_id) {
- if (pid >= MAX_ROOT_PAGE_TABLES)
- FATAL("page_table_map: too many page table allocations");
+ if (pid >= MAX_ROOT_PAGE_TABLES) FATAL("page_table_map: pid too large");
 
  /* Student's code goes here (page table translation). */
 
@@ -137,6 +136,12 @@ int page_table_map(int pid, int page_no, int frame_id) {
  /* Student's code ends here. */
 }
 
+int page_table_translate(int pid, int page_no) {
+ /* Student's code goes here (page table translation). */
+
+ /* Student's code ends here. */
+}
+
 int page_table_switch(int pid) {
  /* Student's code goes here (page table translation). */
 
@@ -183,5 +188,6 @@ void mmu_init() {
 
  earth->mmu_map = page_table_map;
  earth->mmu_switch = page_table_switch;
+ earth->mmu_translate = page_table_translate;
  }
 }

grass/grass.c

@@ -45,6 +45,5 @@ int main() {
 
  void (*sys_proc_entry)() = (void*)APPS_ENTRY;
  asm("mv a0, %0" ::"r"(APPS_ARG));
- asm("mv a1, %0" ::"r"(APPS_ARG + 4));
  sys_proc_entry();
 }

grass/process.h

@@ -10,7 +10,6 @@ struct process{
 
  void *mepc; /* machine exception program counter (mepc) */
  void *sp_vaddr; /* used to switch between user and kernel stacks */
- void *stack_paddr; /* used in the page table translation project */
 };
 
 #define MAX_NPROCESS 16

library/egos.h

@@ -10,6 +10,7 @@ struct earth {
  int (*mmu_free)(int pid);
  int (*mmu_map)(int pid, int page_no, int frame_no);
  int (*mmu_switch)(int pid);
+ int (*mmu_translate)(int pid, int page_no);
 
  /* Devices interface */
  int (*disk_read)(int block_no, int nblocks, char* dst);
@@ -31,6 +32,10 @@ struct earth {
 };
 
 struct grass {
+ /* Shell environment variables */
+ int workdir_ino;
+ char workdir[128];
+
  /* Process control interface */
  int (*proc_alloc)();
  void (*proc_free)(int pid);
@@ -40,10 +45,6 @@ struct grass {
  void (*sys_exit)(int status);
  int (*sys_send)(int pid, char* msg, int size);
  int (*sys_recv)(int* pid, char* buf, int size);
-
- /* Shell environment variables */
- int workdir_ino;
- char workdir[128];
 };
 
 extern struct earth *earth;