diff options
author | Kevin Lim <ktlim@umich.edu> | 2005-02-11 17:54:33 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2005-02-11 17:54:33 -0500 |
commit | c4d0ebd25cc5f0657b99543ff2df30d1a86f3ad5 (patch) | |
tree | f8eb75062055458ed2b2f44e4e87d2089c2debf4 /cpu/beta_cpu/commit.hh | |
parent | 1e7a744c09d0bde70e0f83179fdf4d6059585e4b (diff) | |
download | gem5-c4d0ebd25cc5f0657b99543ff2df30d1a86f3ad5.tar.xz |
Fix up #defines to use full path; fix up code for g++ 3.4
SConscript:
Remove efence option from automatically being used.
--HG--
extra : convert_revision : 466bb8077aa341db0b409720e2a73535b1fa6b69
Diffstat (limited to 'cpu/beta_cpu/commit.hh')
-rw-r--r-- | cpu/beta_cpu/commit.hh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cpu/beta_cpu/commit.hh b/cpu/beta_cpu/commit.hh index f1a185143..731307bf7 100644 --- a/cpu/beta_cpu/commit.hh +++ b/cpu/beta_cpu/commit.hh @@ -12,14 +12,11 @@ // Probably not a big deal if the IPR stuff isn't cycle accurate. Can just // have the original function handle writing to the IPR register. -#ifndef __SIMPLE_COMMIT_HH__ -#define __SIMPLE_COMMIT_HH__ +#ifndef __CPU_BETA_CPU_SIMPLE_COMMIT_HH__ +#define __CPU_BETA_CPU_SIMPLE_COMMIT_HH__ -//#include "arch/alpha/isa_traits.hh" +#include "base/statistics.hh" #include "base/timebuf.hh" -//#include "cpu/beta_cpu/comm.hh" -//#include "cpu/beta_cpu/rename_map.hh" -//#include "cpu/beta_cpu/rob.hh" #include "mem/memory_interface.hh" template<class Impl> @@ -157,4 +154,4 @@ class SimpleCommit Stats::Distribution<> n_committed_dist; }; -#endif // __SIMPLE_COMMIT_HH__ +#endif // __CPU_BETA_CPU_SIMPLE_COMMIT_HH__ |