CS-444/jos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not crash on handled traps.

Browse Source
This commit is contained in:
Danila Fedorin 2019-04-23 16:31:01 -07:00
parent eae0475758
commit f0e2ab8abd
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kern/trap.c
View File

@ -198,8 +198,10 @@ trap_dispatch(struct Trapframe *tf)
// LAB 3: Your code here. // LAB 3: Your code here.
if (tf->tf_trapno == T_PGFLT) { if (tf->tf_trapno == T_PGFLT) {
page_fault_handler(tf); page_fault_handler(tf);
return;
} else if (tf->tf_trapno == T_BRKPT) { } else if (tf->tf_trapno == T_BRKPT) {
monitor(tf); monitor(tf);
return;
} else if (tf->tf_trapno == T_SYSCALL) { } else if (tf->tf_trapno == T_SYSCALL) {
syscall(tf->tf_regs.reg_eax, syscall(tf->tf_regs.reg_eax,
tf->tf_regs.reg_edx, tf->tf_regs.reg_edx,
@ -207,6 +209,7 @@ trap_dispatch(struct Trapframe *tf)
tf->tf_regs.reg_ebx, tf->tf_regs.reg_ebx,
tf->tf_regs.reg_edi, tf->tf_regs.reg_edi,
tf->tf_regs.reg_esi); tf->tf_regs.reg_esi);
return;
} }
// Unexpected trap: The user process or the kernel has a bug. // Unexpected trap: The user process or the kernel has a bug.