inorder: inst. iterator cleanup

get rid of accessing iterators (for instructions) by reference

diff --git a/src/cpu/inorder/cpu.cc b/src/cpu/inorder/cpu.cc
index 8b49c4f246acb8c91302da41edfaa4abbb711420..ef6d5fb20d7c57aed7ace2227228f2d700b2a6f8 100644 (file)
--- a/src/cpu/inorder/cpu.cc
+++ b/src/cpu/inorder/cpu.cc
@@ -1221,7 +1221,7 @@ InOrderCPU::setMiscReg(int misc_reg, const MiscReg &val, ThreadID tid)
 
 
 InOrderCPU::ListIt
-InOrderCPU::addInst(DynInstPtr &inst)
+InOrderCPU::addInst(DynInstPtr inst)
 {
     ThreadID tid = inst->readTid();
 
@@ -1318,7 +1318,7 @@ InOrderCPU::instDone(DynInstPtr inst, ThreadID tid)
 // currently unused function, but substitute repetitive code w/this function
 // call
 void
-InOrderCPU::addToRemoveList(DynInstPtr &inst)
+InOrderCPU::addToRemoveList(DynInstPtr inst)
 {
     removeInstsThisCycle = true;
     if (!inst->isRemoveList()) {            
@@ -1336,7 +1336,7 @@ InOrderCPU::addToRemoveList(DynInstPtr &inst)
 }
 
 void
-InOrderCPU::removeInst(DynInstPtr &inst)
+InOrderCPU::removeInst(DynInstPtr inst)
 {
     DPRINTF(InOrderCPU, "Removing graduated instruction [tid:%i] PC %s "
             "[sn:%lli]\n",

diff --git a/src/cpu/inorder/cpu.hh b/src/cpu/inorder/cpu.hh
index 75d4077d76dec87a8a86ec19b1ab6aff5c81ad82..a468f8fa8095e1642d9ad422f0f9069476b958ed 100644 (file)
--- a/src/cpu/inorder/cpu.hh
+++ b/src/cpu/inorder/cpu.hh
@@ -577,16 +577,16 @@ class InOrderCPU : public BaseCPU
     /** Function to add instruction onto the head of the list of the
      *  instructions.  Used when new instructions are fetched.
      */
-    ListIt addInst(DynInstPtr &inst);
+    ListIt addInst(DynInstPtr inst);
 
     /** Function to tell the CPU that an instruction has completed. */
     void instDone(DynInstPtr inst, ThreadID tid);
 
     /** Add Instructions to the CPU Remove List*/
-    void addToRemoveList(DynInstPtr &inst);
+    void addToRemoveList(DynInstPtr inst);
 
     /** Remove an instruction from CPU */
-    void removeInst(DynInstPtr &inst);
+    void removeInst(DynInstPtr inst);
 
     /** Remove all instructions younger than the given sequence number. */
     void removeInstsUntil(const InstSeqNum &seq_num,ThreadID tid);

diff --git a/src/cpu/inorder/inorder_dyn_inst.hh b/src/cpu/inorder/inorder_dyn_inst.hh
index 033726df918be524178c4626c954da662cab66cb..1ef2b2af42e27686d74033c77ee8d71bd5f63974 100644 (file)
--- a/src/cpu/inorder/inorder_dyn_inst.hh
+++ b/src/cpu/inorder/inorder_dyn_inst.hh
@@ -989,7 +989,7 @@ class InOrderDynInst : public FastAlloc, public RefCounted
     ListIt instListIt;
 
     /** Returns iterator to this instruction in the list of all insts. */
-    ListIt &getInstListIt() { return instListIt; }
+    ListIt getInstListIt() { return instListIt; }
 
     /** Sets iterator for this instruction in the list of all insts. */
     void setInstListIt(ListIt _instListIt) { instListIt = _instListIt; }