Merge vm1.(none):/home/stever/bk/newmem
authorSteve Reinhardt <stever@eecs.umich.edu>
Sat, 10 Jun 2006 03:18:46 +0000 (23:18 -0400)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sat, 10 Jun 2006 03:18:46 +0000 (23:18 -0400)
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

1  2 
SConstruct
src/SConscript
src/arch/alpha/ev5.cc
src/arch/alpha/isa/decoder.isa
src/cpu/base.cc
src/cpu/o3/alpha_cpu_impl.hh
src/python/m5/objects/AlphaFullCPU.py
src/sim/pseudo_inst.cc
src/sim/syscall_emul.cc

diff --cc SConstruct
Simple merge
diff --cc src/SConscript
Simple merge
Simple merge
Simple merge
diff --cc src/cpu/base.cc
Simple merge
Simple merge
Simple merge
index 50d949f53ca0d862253d4edc10044e5ee3588c0b,663e5745f7b14425f12734c539a4efb6dfcc5d32..ae52cdd41284816108e7666464e129f0f311de44
@@@ -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
index 319b385811be70421da98884cc1a967828bac433,bc33625afe1eedcd5cc6f4a9c2430f5bd1bf2e61..848b6f8696c529af5e6d9f31b80d604a40fae94e
@@@ -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;
  }