projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57ff260 ac19e0c)
Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Sat, 23 Jun 2007 20:26:30 +0000 (13:26 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sat, 23 Jun 2007 20:26:30 +0000 (13:26 -0700)
into  vm1.(none):/home/stever/bk/newmem-cache2

src/base/traceflags.py:
    Hand merge.

--HG--
extra : convert_revision : 9e7539eeab4220ed7a7237457a8f336f79216924

1  2 
src/base/traceflags.py patch | diff1 | diff2 | blob | history

diff --cc src/base/traceflags.py
index f4cf7dfd79bcbb6b27886880f28dbc0327d98fa6,fddb86328078a2cb9ac673605e94108e5987927d..70fadb210335bd76dd661f72425830440fb3a77a
--- 1/src/base/traceflags.py
--- 2/src/base/traceflags.py
+++ b/src/base/traceflags.py
@@@ -128,7 -128,7 +128,8 @@@ baseFlags = 
      'Mbox',
      'MemDepUnit',
      'MemoryAccess',
 +    'MemTest',
+     'MipsPRA',
      'O3CPU',
      'OzoneCPU',
      'OzoneLSQ',