projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
X86: Set up a named constant for the "fold bit" for int register indices.
[gem5.git]
/
src
/
cpu
/
func_unit.hh
diff --git
a/src/cpu/func_unit.hh
b/src/cpu/func_unit.hh
index 7801430969ed8547260b78fe0246ef17c4d602df..e8238ba7353074042aedff110fc487e2bbec57d0 100644
(file)
--- a/
src/cpu/func_unit.hh
+++ b/
src/cpu/func_unit.hh
@@
-36,6
+36,8
@@
#include <vector>
#include "cpu/op_class.hh"
#include <vector>
#include "cpu/op_class.hh"
+#include "params/OpDesc.hh"
+#include "params/FUDesc.hh"
#include "sim/sim_object.hh"
////////////////////////////////////////////////////////////////////////////
#include "sim/sim_object.hh"
////////////////////////////////////////////////////////////////////////////
@@
-51,8
+53,9
@@
struct OpDesc : public SimObject
unsigned opLat;
unsigned issueLat;
unsigned opLat;
unsigned issueLat;
- OpDesc(std::string name, OpClass c, unsigned o, unsigned i)
- : SimObject(name), opClass(c), opLat(o), issueLat(i) {};
+ OpDesc(const OpDescParams *p)
+ : SimObject(p), opClass(p->opClass), opLat(p->opLat),
+ issueLat(p->issueLat) {};
};
struct FUDesc : public SimObject
};
struct FUDesc : public SimObject
@@
-60,12
+63,12
@@
struct FUDesc : public SimObject
std::vector<OpDesc *> opDescList;
unsigned number;
std::vector<OpDesc *> opDescList;
unsigned number;
- FUDesc(
std::string name, std::vector<OpDesc *> l, unsigned n
)
- : SimObject(
name), opDescList(l), number(n
) {};
+ FUDesc(
const FUDescParams *p
)
+ : SimObject(
p), opDescList(p->opList), number(p->count
) {};
};
};
-typedef std::vector<OpDesc *>::iterator OPDDiterator;
-typedef std::vector<FUDesc *>::iterator FUDDiterator;
+typedef std::vector<OpDesc *>::
const_
iterator OPDDiterator;
+typedef std::vector<FUDesc *>::
const_
iterator FUDDiterator;