summaryrefslogtreecommitdiff
path: root/cpu/beta_cpu/comm.hh
diff options
context:
space:
mode:
Diffstat (limited to 'cpu/beta_cpu/comm.hh')
-rw-r--r--cpu/beta_cpu/comm.hh18
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__