diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-09 23:18:46 -0400 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-09 23:18:46 -0400 |
commit | 95019d0c6f1675f42d899f2899e06d3017088f25 (patch) | |
tree | 7618cd95da8299faff8dd682e088ee707cae6a7f /src/sim/syscall_emul.cc | |
parent | 6de5d73a999240f92f050393bb10028968275835 (diff) | |
parent | 29e34a739b991af8d8e1eafe75ecb0904c324dc8 (diff) | |
download | gem5-95019d0c6f1675f42d899f2899e06d3017088f25.tar.xz |
Merge vm1.(none):/home/stever/bk/newmem
into vm1.(none):/home/stever/bk/newmem-py
src/python/m5/__init__.py:
src/sim/syscall_emul.cc:
Hand merge.
--HG--
extra : convert_revision : e2542735323e648383c89382421d98a7d1d761bf
Diffstat (limited to 'src/sim/syscall_emul.cc')
-rw-r--r-- | src/sim/syscall_emul.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc index 319b38581..848b6f869 100644 --- a/src/sim/syscall_emul.cc +++ b/src/sim/syscall_emul.cc @@ -44,7 +44,7 @@ #include "mem/page_table.hh" #include "sim/process.hh" -#include "sim/sim_events.hh" +#include "sim/sim_exit.hh" using namespace std; using namespace TheISA; @@ -92,7 +92,7 @@ SyscallReturn exitFunc(SyscallDesc *desc, int callnum, Process *process, ThreadContext *tc) { - new SimExitEvent("target called exit()", tc->getSyscallArg(0) & 0xff); + exitSimLoop("target called exit()", tc->getSyscallArg(0) & 0xff); return 1; } |