projects / gem5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b973fae) | patch
Fix up some merge problems.
authorKevin Lim <ktlim@umich.edu>
Wed, 5 Jul 2006 20:54:24 +0000 (16:54 -0400)
committerKevin Lim <ktlim@umich.edu>
Wed, 5 Jul 2006 20:54:24 +0000 (16:54 -0400)
commitea9697250cf55add36af1548b524ab22d6a2cf94
tree23111c4c50543d7264db6d39219175d9abc27c68tree
parentb973fae85d47a8184204d5d38b32ad3d427ce41ccommit | diff
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
src/base/traceflags.py diff | blob | history
src/cpu/o3/alpha/params.hh diff | blob | history
src/cpu/o3/params.hh diff | blob | history