diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-23 13:26:30 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-23 13:26:30 -0700 |
| commit | 245b0bd9b94bfaaa188b7e945f91c0e4a9909cbe (patch) | |
| tree | 7ca0de263839f60d35cd6cf0ca8c17d94c375209 /src/arch/mips/isa_traits.cc | |
| parent | 57ff2604e59647c6afe988767186f13c80c1aa16 (diff) | |
| parent | ac19e0c5050219cbb0579a319fa3fab5cf92835d (diff) | |
| download | gem5-245b0bd9b94bfaaa188b7e945f91c0e4a9909cbe.tar.xz | |
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2
src/base/traceflags.py:
Hand merge.
--HG--
extra : convert_revision : 9e7539eeab4220ed7a7237457a8f336f79216924
Diffstat (limited to 'src/arch/mips/isa_traits.cc')
| -rw-r--r-- | src/arch/mips/isa_traits.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/arch/mips/isa_traits.cc b/src/arch/mips/isa_traits.cc index 3a8cb46a5..0c84ce2b2 100644 --- a/src/arch/mips/isa_traits.cc +++ b/src/arch/mips/isa_traits.cc @@ -96,3 +96,5 @@ RegFile::unserialize(Checkpoint *cp, const std::string §ion) UNSERIALIZE_SCALAR(nnpc); } + + |