summaryrefslogtreecommitdiff
path: root/trap.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2019-06-04 11:31:50 -0400
committerRobert Morris <[email protected]>2019-06-04 11:31:50 -0400
commitcff3ce6e04ce4a353324630df788df21566807a6 (patch)
tree31040a8262b6de165a2f1d6cc7ead1db33e67a80 /trap.c
parent0e131b226336808c135795f5b9d7defc5a58b2ae (diff)
downloadxv6-labs-cff3ce6e04ce4a353324630df788df21566807a6.tar.gz
xv6-labs-cff3ce6e04ce4a353324630df788df21566807a6.tar.bz2
xv6-labs-cff3ce6e04ce4a353324630df788df21566807a6.zip
more sbrk fixes
Diffstat (limited to 'trap.c')
-rw-r--r--trap.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/trap.c b/trap.c
index 39ff61d..47739ac 100644
--- a/trap.c
+++ b/trap.c
@@ -57,9 +57,12 @@ usertrap(void)
} else {
printf("usertrap(): unexpected scause 0x%x pid=%d\n", r_scause(), p->pid);
printf(" sepc=%p stval=%p\n", r_sepc(), r_stval());
- panic("usertrap");
+ p->killed = 1;
}
+ if(p->killed)
+ exit();
+
usertrapret();
}