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/comm.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/comm.hh')
| -rw-r--r-- | cpu/beta_cpu/comm.hh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/cpu/beta_cpu/comm.hh b/cpu/beta_cpu/comm.hh index e327a83b9..c0afe3d1b 100644 --- a/cpu/beta_cpu/comm.hh +++ b/cpu/beta_cpu/comm.hh @@ -1,13 +1,11 @@ -#ifndef __COMM_HH__ -#define __COMM_HH__ +#ifndef __CPU_BETA_CPU_COMM_HH__ +#define __CPU_BETA_CPU_COMM_HH__ #include <stdint.h> #include <vector> #include "arch/alpha/isa_traits.hh" #include "cpu/inst_seq.hh" -using namespace std; - // Find better place to put this typedef. // The impl might be the best place for this. typedef short int PhysRegIndex; @@ -18,7 +16,7 @@ struct SimpleFetchSimpleDecode { int size; - DynInstPtr insts[Impl::MaxWidth + 1]; + DynInstPtr insts[Impl::MaxWidth]; }; template<class Impl> @@ -27,7 +25,7 @@ struct SimpleDecodeSimpleRename { int size; - DynInstPtr insts[Impl::MaxWidth + 1]; + DynInstPtr insts[Impl::MaxWidth]; }; template<class Impl> @@ -36,7 +34,7 @@ struct SimpleRenameSimpleIEW { int size; - DynInstPtr insts[Impl::MaxWidth + 1]; + DynInstPtr insts[Impl::MaxWidth]; }; template<class Impl> @@ -45,7 +43,7 @@ struct SimpleIEWSimpleCommit { int size; - DynInstPtr insts[Impl::MaxWidth + 1]; + DynInstPtr insts[Impl::MaxWidth]; bool squash; bool branchMispredict; @@ -62,7 +60,7 @@ struct IssueStruct { int size; - DynInstPtr insts[Impl::MaxWidth + 1]; + DynInstPtr insts[Impl::MaxWidth]; }; struct TimeBufStruct { @@ -142,4 +140,4 @@ struct TimeBufStruct { commitComm commitInfo; }; -#endif //__COMM_HH__ +#endif //__CPU_BETA_CPU_COMM_HH__ |