From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sat, 10 Jun 2006 03:18:46 +0000 (-0400)
Subject: Merge vm1.(none):/home/stever/bk/newmem
X-Git-Tag: m5_2.0_beta1~36^2~84
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=95019d0c6f1675f42d899f2899e06d3017088f25;p=gem5.git

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
---

95019d0c6f1675f42d899f2899e06d3017088f25
diff --cc src/sim/pseudo_inst.cc
index 50d949f53,663e5745f..ae52cdd41
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@@ -138,16 -132,16 +138,16 @@@ namespace AlphaPseud
      }
  
      void
 -    m5exit_old(ExecContext *xc)
 +    m5exit_old(ThreadContext *tc)
      {
-         SimExit(curTick, "m5_exit_old instruction encountered");
+         exitSimLoop(curTick, "m5_exit_old instruction encountered");
      }
  
      void
 -    m5exit(ExecContext *xc, Tick delay)
 +    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
diff --cc src/sim/syscall_emul.cc
index 319b38581,bc33625af..848b6f869
--- a/src/sim/syscall_emul.cc
+++ b/src/sim/syscall_emul.cc
@@@ -90,9 -89,9 +90,9 @@@ ignoreFunc(SyscallDesc *desc, int calln
  
  SyscallReturn
  exitFunc(SyscallDesc *desc, int callnum, Process *process,
 -         ExecContext *xc)
 +         ThreadContext *tc)
  {
-     new SimExitEvent("target called exit()", tc->getSyscallArg(0) & 0xff);
 -    exitSimLoop("target called exit()", xc->getSyscallArg(0) & 0xff);
++    exitSimLoop("target called exit()", tc->getSyscallArg(0) & 0xff);
  
      return 1;
  }