o3 cpu: Remove unused variables

diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 54c55f8c7129c809077d04968241221464cdc9ef..724d88405c9a4633816b8e2eb09a765a8e2cd662 100644 (file)
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -467,9 +467,6 @@ FullO3CPU<Impl>::FullO3CPU(DerivO3CPUParams *params)
 
     for (ThreadID tid = 0; tid < this->numThreads; tid++)
         this->thread[tid]->setFuncExeInst(0);
-
-    lockAddr = 0;
-    lockFlag = false;
 }
 
 template <class Impl>

diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index c6083d8d56fd2855d64e19b7d4f2283d40761856..890598b0fff939057bf638f257cd291926961e5d 100644 (file)
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -124,9 +124,6 @@ class FullO3CPU : public BaseO3CPU
     /** Overall CPU status. */
     Status _status;
 
-    /** Per-thread status in CPU, used for SMT.  */
-    Status _threadStatus[Impl::MaxThreads];
-
   private:
 
     /**
@@ -781,11 +778,6 @@ class FullO3CPU : public BaseO3CPU
     /** Get the dcache port (used to find block size for translations). */
     virtual CpuPort &getDataPort() { return dcachePort; }
 
-    Addr lockAddr;
-
-    /** Temporary fix for the lock flag, works in the UP case. */
-    bool lockFlag;
-
     /** Stat for total number of times the CPU is descheduled. */
     Stats::Scalar timesIdled;
     /** Stat for total number of cycles the CPU spends descheduled. */

diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh
index 2de6dbc1bae7f5860743276ed4c06e88dd2af6b2..0a8dfeb3e5e0652a9f9a702d7458a5c01966588c 100755 (executable)
--- a/src/cpu/o3/thread_context_impl.hh
+++ b/src/cpu/o3/thread_context_impl.hh
@@ -89,7 +89,6 @@ O3ThreadContext<Impl>::takeOverFrom(ThreadContext *old_context)
 
         // Transfer kernel stats from one CPU to the other.
         thread->kernelStats = old_context->getKernelStats();
-        cpu->lockFlag = false;
     } else {
         thread->funcExeInst = old_context->readFuncExeInst();
     }