CPU: Remove references to memory copy operations

diff --git a/src/cpu/base_dyn_inst.hh b/src/cpu/base_dyn_inst.hh
index a5357a7b05de0ae8dad2a1d06a1771590299acc2..4c7abe376c4bd865c1b3a44256c40c249943c938 100644 (file)
--- a/src/cpu/base_dyn_inst.hh
+++ b/src/cpu/base_dyn_inst.hh
@@ -252,12 +252,6 @@ class BaseDynInst : public FastAlloc, public RefCounted
     /** The effective physical address. */
     Addr physEffAddr;
 
-    /** Effective virtual address for a copy source. */
-    Addr copySrcEffAddr;
-
-    /** Effective physical address for a copy source. */
-    Addr copySrcPhysEffAddr;
-
     /** The memory request flags (from translation). */
     unsigned memReqFlags;
 
@@ -499,7 +493,6 @@ class BaseDynInst : public FastAlloc, public RefCounted
     { return staticInst->isStoreConditional(); }
     bool isInstPrefetch() const { return staticInst->isInstPrefetch(); }
     bool isDataPrefetch() const { return staticInst->isDataPrefetch(); }
-    bool isCopy()         const { return staticInst->isCopy(); }
     bool isInteger()      const { return staticInst->isInteger(); }
     bool isFloating()     const { return staticInst->isFloating(); }
     bool isControl()      const { return staticInst->isControl(); }

diff --git a/src/cpu/inorder/inorder_dyn_inst.hh b/src/cpu/inorder/inorder_dyn_inst.hh
index 04f9abb9653b53915663925a0da9f2723e859f51..830244ae8cc81f7a86aaf326d4d1836ee586f2a5 100644 (file)
--- a/src/cpu/inorder/inorder_dyn_inst.hh
+++ b/src/cpu/inorder/inorder_dyn_inst.hh
@@ -350,7 +350,6 @@ class InOrderDynInst : public FastAlloc, public RefCounted
     { return staticInst->isStoreConditional(); }
     bool isInstPrefetch() const { return staticInst->isInstPrefetch(); }
     bool isDataPrefetch() const { return staticInst->isDataPrefetch(); }
-    bool isCopy()         const { return staticInst->isCopy(); }
     bool isInteger()      const { return staticInst->isInteger(); }
     bool isFloating()     const { return staticInst->isFloating(); }
     bool isControl()      const { return staticInst->isControl(); }

diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index 8c651e203cf22e328e02fd289a06699055721cbb..e35c1bf2975bb4dd5f1e5abcd12a72318f227726 100644 (file)
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -1199,9 +1199,6 @@ DefaultCommit<Impl>::commitHead(DynInstPtr &head_inst, unsigned inst_num)
                                  head_inst->renamedDestRegIdx(i));
     }
 
-    if (head_inst->isCopy())
-        panic("Should not commit any copy instructions!");
-
     // Finally clear the head ROB entry.
     rob->retireHead(tid);
 

diff --git a/src/cpu/ozone/lw_back_end_impl.hh b/src/cpu/ozone/lw_back_end_impl.hh
index 8000c142e44fca17ff31b7fcca149ad5a0241fb6..880d0d1839b875b20cab786de13813f92867499b 100644 (file)
--- a/src/cpu/ozone/lw_back_end_impl.hh
+++ b/src/cpu/ozone/lw_back_end_impl.hh
@@ -1205,9 +1205,6 @@ LWBackEnd<Impl>::commitInst(int inst_num)
         inst->traceData = NULL;
     }
 
-    if (inst->isCopy())
-        panic("Should not commit any copy instructions!");
-
     inst->clearDependents();
 
     frontEnd->addFreeRegs(freed_regs);

diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index d07b322df04d600cae04bec152ff2922191c41f6..20483c499de45dbb5728544c33149181d499b8df 100644 (file)
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -117,7 +117,6 @@ class StaticInstBase : public RefCounted
         IsIndexed,      ///< Accesses memory with an indexed address computation
         IsInstPrefetch, ///< Instruction-cache prefetch.
         IsDataPrefetch, ///< Data-cache prefetch.
-        IsCopy,         ///< Fast Cache block copy
 
         IsControl,              ///< Control transfer instruction.
         IsDirectControl,        ///< PC relative control transfer.
@@ -228,7 +227,6 @@ class StaticInstBase : public RefCounted
     bool isDataPrefetch() const { return flags[IsDataPrefetch]; }
     bool isPrefetch()     const { return isInstPrefetch() ||
                                          isDataPrefetch(); }
-    bool isCopy()         const { return flags[IsCopy];}
 
     bool isInteger()      const { return flags[IsInteger]; }
     bool isFloating()     const { return flags[IsFloating]; }

diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh
index 06707894df51c7d069a5b024a205e81a0ae25cea..e0edc466e3150ac754e1dfca3c7c84752b4bd2a3 100644 (file)
--- a/src/cpu/thread_state.hh
+++ b/src/cpu/thread_state.hh
@@ -200,18 +200,6 @@ struct ThreadState {
 #endif
 
   public:
-    /**
-     * Temporary storage to pass the source address from copy_load to
-     * copy_store.
-     * @todo Remove this temporary when we have a better way to do it.
-     */
-    Addr copySrcAddr;
-    /**
-     * Temp storage for the physical source address of a copy.
-     * @todo Remove this temporary when we have a better way to do it.
-     */
-    Addr copySrcPhysAddr;
-
     /*
      * number of executed instructions, for matching with syscall trace
      * points in EIO files.