From 43345bff6c4ee2fd5a35760776898eefa690329e Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 8 Jul 2009 23:02:21 -0700
Subject: Registers: Move the PCs out of the ISAs and into the CPUs.

---
 src/cpu/thread_state.hh | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src/cpu/thread_state.hh')

diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh
index 525ecca86..ba61f431d 100644
--- a/src/cpu/thread_state.hh
+++ b/src/cpu/thread_state.hh
@@ -218,16 +218,6 @@ struct ThreadState {
      */
     TheISA::MachInst inst;
 
-    /** The current microcode pc for the currently executing macro
-     * operation.
-     */
-    MicroPC microPC;
-
-    /** The next microcode pc for the currently executing macro
-     * operation.
-     */
-    MicroPC nextMicroPC;
-
   public:
     /**
      * Temporary storage to pass the source address from copy_load to
-- 
cgit v1.2.3


From c9a27d85b9066489bf227f19d61ce5ddd1bc91c3 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 8 Jul 2009 23:02:22 -0700
Subject: Get rid of the unused get(Data|Inst)Asid and (inst|data)Asid
 functions.

---
 src/cpu/thread_state.hh | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/cpu/thread_state.hh')

diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh
index ba61f431d..5c7c0ea56 100644
--- a/src/cpu/thread_state.hh
+++ b/src/cpu/thread_state.hh
@@ -68,7 +68,7 @@ struct ThreadState {
 #if FULL_SYSTEM
     ThreadState(BaseCPU *cpu, ThreadID _tid);
 #else
-    ThreadState(BaseCPU *cpu, ThreadID _tid, Process *_process, short _asid);
+    ThreadState(BaseCPU *cpu, ThreadID _tid, Process *_process);
 #endif
 
     ~ThreadState();
@@ -119,9 +119,6 @@ struct ThreadState {
     TranslatingPort *getMemPort();
 
     void setMemPort(TranslatingPort *_port) { port = _port; }
-
-    int getInstAsid() { return asid; }
-    int getDataAsid() { return asid; }
 #endif
 
     /** Sets the current instruction being committed. */
@@ -205,12 +202,6 @@ struct ThreadState {
     TranslatingPort *port;
 
     Process *process;
-
-    // Address space ID.  Note that this is used for TIMING cache
-    // simulation only; all functional memory accesses should use
-    // one of the FunctionalMemory pointers above.
-    short asid;
-
 #endif
 
     /** Current instruction the thread is committing.  Only set and
-- 
cgit v1.2.3