diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-07-05 16:54:24 -0400 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-07-05 16:54:24 -0400 |
commit | ea9697250cf55add36af1548b524ab22d6a2cf94 (patch) | |
tree | 23111c4c50543d7264db6d39219175d9abc27c68 /src/base/cprintf.hh | |
parent | b973fae85d47a8184204d5d38b32ad3d427ce41c (diff) | |
download | gem5-ea9697250cf55add36af1548b524ab22d6a2cf94.tar.xz |
Fix up some merge problems.
src/base/traceflags.py:
Remove BaseCPU traceflag.
src/cpu/o3/alpha/params.hh:
Move non-Alpha specific parameters out of this params class.
src/cpu/o3/params.hh:
Move non-Alpha specific params into this params class.
--HG--
extra : convert_revision : e5b652adb47a240376733400e6054c66c50bd514
Diffstat (limited to 'src/base/cprintf.hh')
0 files changed, 0 insertions, 0 deletions