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/pseudo_inst.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/pseudo_inst.cc')
| -rw-r--r-- | src/sim/pseudo_inst.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc index 50d949f53..ae52cdd41 100644 --- a/src/sim/pseudo_inst.cc +++ b/src/sim/pseudo_inst.cc @@ -140,14 +140,14 @@ namespace AlphaPseudo void m5exit_old(ThreadContext *tc) { - SimExit(curTick, "m5_exit_old instruction encountered"); + exitSimLoop(curTick, "m5_exit_old instruction encountered"); } void m5exit(ThreadContext *tc, Tick delay) { Tick when = curTick + delay * Clock::Int::ns; - SimExit(when, "m5_exit instruction encountered"); + exitSimLoop(when, "m5_exit instruction encountered"); } void |