summaryrefslogtreecommitdiff
path: root/trap.c
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-08-25 00:43:17 +0000
committerkaashoek <kaashoek>2006-08-25 00:43:17 +0000
commit74493bf4460f4024e06760289735e9d5dcb9dc3f (patch)
tree57beb4206294c5ae4c10569eac1333470b212a68 /trap.c
parent81d521999844f1dfa9c419463bbb8e355817062a (diff)
downloadxv6-labs-74493bf4460f4024e06760289735e9d5dcb9dc3f.tar.gz
xv6-labs-74493bf4460f4024e06760289735e9d5dcb9dc3f.tar.bz2
xv6-labs-74493bf4460f4024e06760289735e9d5dcb9dc3f.zip
kill user process when it generates an unhandled trap (e.g., 13)
fix bug in test code of malloc
Diffstat (limited to 'trap.c')
-rw-r--r--trap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/trap.c b/trap.c
index d201990..f26024b 100644
--- a/trap.c
+++ b/trap.c
@@ -126,8 +126,10 @@ trap(struct trapframe *tf)
}
cprintf("trap %d from cpu %d eip %x\n", v, cpu(), tf->eip);
- if(curproc[cpu()])
+ if(curproc[cpu()]) {
cprintf("pid %d\n", curproc[cpu()]->pid);
+ proc_exit();
+ }
// panic("trap");
return;