diff options
Diffstat (limited to 'src/cpu/o3')
-rw-r--r-- | src/cpu/o3/fu_pool.cc | 8 | ||||
-rw-r--r-- | src/cpu/o3/fu_pool.hh | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/cpu/o3/fu_pool.cc b/src/cpu/o3/fu_pool.cc index 09d271b10..b7c972b09 100644 --- a/src/cpu/o3/fu_pool.cc +++ b/src/cpu/o3/fu_pool.cc @@ -32,7 +32,6 @@ #include "cpu/o3/fu_pool.hh" #include "cpu/func_unit.hh" -#include "params/FUPool.hh" using namespace std; @@ -69,8 +68,8 @@ FUPool::~FUPool() // Constructor -FUPool::FUPool(string name, vector<FUDesc *> paramList) - : SimObject(name) +FUPool::FUPool(const Params *p) + : SimObject(p) { numFU = 0; @@ -84,6 +83,7 @@ FUPool::FUPool(string name, vector<FUDesc *> paramList) // // Iterate through the list of FUDescData structures // + const vector<FUDesc *> ¶mList = p->FUList; for (FUDDiterator i = paramList.begin(); i != paramList.end(); ++i) { // @@ -278,5 +278,5 @@ FUPool::takeOverFrom() FUPool * FUPoolParams::create() { - return new FUPool(name, FUList); + return new FUPool(this); } diff --git a/src/cpu/o3/fu_pool.hh b/src/cpu/o3/fu_pool.hh index 52d83f056..48037324c 100644 --- a/src/cpu/o3/fu_pool.hh +++ b/src/cpu/o3/fu_pool.hh @@ -38,6 +38,7 @@ #include "base/sched_list.hh" #include "cpu/op_class.hh" +#include "params/FUPool.hh" #include "sim/sim_object.hh" class FUDesc; @@ -116,9 +117,9 @@ class FUPool : public SimObject typedef std::vector<FuncUnit *>::iterator fuListIterator; public: - + typedef FUPoolParams Params; /** Constructs a FU pool. */ - FUPool(std::string name, std::vector<FUDesc *> l); + FUPool(const Params *p); ~FUPool(); /** Annotates units that provide memory operations. Included only because |