diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-06-16 17:53:33 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-06-16 17:53:33 -0400 |
| commit | 4e07f6ca52828247fe1741b1e6c5269ad5291187 (patch) | |
| tree | af786c3cfcdd5640b5840ffdfab64bb55b9e49f9 /src/cpu/o3/rob_impl.hh | |
| parent | 51a5b826373e2c08ba173854a19597d59e0e3c90 (diff) | |
| parent | 0bbd909f02e72a321a65b933104c5ef1e157116b (diff) | |
| download | gem5-4e07f6ca52828247fe1741b1e6c5269ad5291187.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 488b9a9965dd86ca73dc9e510e5b3122cbd357f9
Diffstat (limited to 'src/cpu/o3/rob_impl.hh')
| -rw-r--r-- | src/cpu/o3/rob_impl.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/o3/rob_impl.hh b/src/cpu/o3/rob_impl.hh index 97694e371..6277dd68b 100644 --- a/src/cpu/o3/rob_impl.hh +++ b/src/cpu/o3/rob_impl.hh @@ -100,7 +100,7 @@ ROB<Impl>::name() const template <class Impl> void -ROB<Impl>::setCPU(FullCPU *cpu_ptr) +ROB<Impl>::setCPU(O3CPU *cpu_ptr) { cpu = cpu_ptr; @@ -276,7 +276,7 @@ ROB<Impl>::retireHead(unsigned tid) --numInstsInROB; --threadEntries[tid]; - head_inst->removeInROB(); + head_inst->clearInROB(); head_inst->setCommitted(); instList[tid].erase(head_it); |