Registers: Move the PCs out of the ISAs and into the CPUs.

2 files changed, 0 insertions, 48 deletions

diff --git a/src/arch/alpha/regfile.cc b/src/arch/alpha/regfile.cc
index 9a9ac41a7..15df83859 100644
--- a/src/arch/alpha/regfile.cc
+++ b/src/arch/alpha/regfile.cc
@@ -55,8 +55,6 @@ const int reg_redir[NumIntRegs] = {
 void
 RegFile::serialize(EventManager *em, ostream &os)
 {
-    SERIALIZE_SCALAR(pc);
-    SERIALIZE_SCALAR(npc);
 #if FULL_SYSTEM
     SERIALIZE_SCALAR(intrflag);
 #endif
@@ -65,8 +63,6 @@ RegFile::serialize(EventManager *em, ostream &os)
 void
 RegFile::unserialize(EventManager *em, Checkpoint *cp, const string &section)
 {
-    UNSERIALIZE_SCALAR(pc);
-    UNSERIALIZE_SCALAR(npc);
 #if FULL_SYSTEM
     UNSERIALIZE_SCALAR(intrflag);
 #endif
diff --git a/src/arch/alpha/regfile.hh b/src/arch/alpha/regfile.hh
index accb06302..39c56e57a 100644
--- a/src/arch/alpha/regfile.hh
+++ b/src/arch/alpha/regfile.hh
@@ -32,10 +32,6 @@
 #define __ARCH_ALPHA_REGFILE_HH__
 
 #include "arch/alpha/isa_traits.hh"
-#include "arch/alpha/miscregfile.hh"
-#include "arch/alpha/types.hh"
-#include "arch/alpha/mt.hh"
-#include "sim/faults.hh"
 
 #include <string>
 
@@ -51,46 +47,6 @@ namespace AlphaISA {
 extern const int reg_redir[NumIntRegs];
 
 class RegFile {
-  protected:
-    Addr pc;   // program counter
-    Addr npc;  // next-cycle program counter
-    Addr nnpc; // next next-cycle program counter
-
-  public:
-    Addr
-    readPC()
-    {
-        return pc;
-    }
-
-    void
-    setPC(Addr val)
-    {
-        pc = val;
-    }
-
-    Addr
-    readNextPC()
-    {
-        return npc;
-    }
-
-    void
-    setNextPC(Addr val)
-    {
-        npc = val;
-    }
-
-    Addr
-    readNextNPC()
-    {
-        return npc + sizeof(MachInst);
-    }
-
-    void
-    setNextNPC(Addr val)
-    { }
-
   public:
 #if FULL_SYSTEM
     int intrflag;                   // interrupt flag