diff options
| -rw-r--r-- | src/cpu/o3/mem_dep_unit.hh | 6 | ||||
| -rw-r--r-- | src/cpu/o3/mem_dep_unit_impl.hh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/cpu/o3/mem_dep_unit.hh b/src/cpu/o3/mem_dep_unit.hh index a42aa13ce..3cc1d88fe 100644 --- a/src/cpu/o3/mem_dep_unit.hh +++ b/src/cpu/o3/mem_dep_unit.hh @@ -44,10 +44,10 @@ #define __CPU_O3_MEM_DEP_UNIT_HH__ #include <list> +#include <memory> #include <set> #include "base/hashmap.hh" -#include "base/refcnt.hh" #include "base/statistics.hh" #include "cpu/inst_seq.hh" #include "debug/MemDepUnit.hh" @@ -164,13 +164,13 @@ class MemDepUnit class MemDepEntry; - typedef RefCountingPtr<MemDepEntry> MemDepEntryPtr; + typedef std::shared_ptr<MemDepEntry> MemDepEntryPtr; /** Memory dependence entries that track memory operations, marking * when the instruction is ready to execute and what instructions depend * upon it. */ - class MemDepEntry : public RefCounted { + class MemDepEntry { public: /** Constructs a memory dependence entry. */ MemDepEntry(DynInstPtr &new_inst) diff --git a/src/cpu/o3/mem_dep_unit_impl.hh b/src/cpu/o3/mem_dep_unit_impl.hh index 1e794d488..6684e4ff0 100644 --- a/src/cpu/o3/mem_dep_unit_impl.hh +++ b/src/cpu/o3/mem_dep_unit_impl.hh @@ -162,7 +162,7 @@ MemDepUnit<MemDepPred, Impl>::insert(DynInstPtr &inst) { ThreadID tid = inst->threadNumber; - MemDepEntryPtr inst_entry = new MemDepEntry(inst); + MemDepEntryPtr inst_entry = std::make_shared<MemDepEntry>(inst); // Add the MemDepEntry to the hash. memDepHash.insert( @@ -259,7 +259,7 @@ MemDepUnit<MemDepPred, Impl>::insertNonSpec(DynInstPtr &inst) { ThreadID tid = inst->threadNumber; - MemDepEntryPtr inst_entry = new MemDepEntry(inst); + MemDepEntryPtr inst_entry = std::make_shared<MemDepEntry>(inst); // Insert the MemDepEntry into the hash. memDepHash.insert( @@ -310,7 +310,7 @@ MemDepUnit<MemDepPred, Impl>::insertBarrier(DynInstPtr &barr_inst) ThreadID tid = barr_inst->threadNumber; - MemDepEntryPtr inst_entry = new MemDepEntry(barr_inst); + MemDepEntryPtr inst_entry = std::make_shared<MemDepEntry>(barr_inst); // Add the MemDepEntry to the hash. memDepHash.insert( |