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

1 files changed, 1 insertions, 19 deletions

diff --git a/src/arch/x86/regfile.hh b/src/arch/x86/regfile.hh
index b832cbe28..6c0dc757e 100644
--- a/src/arch/x86/regfile.hh
+++ b/src/arch/x86/regfile.hh
@@ -58,14 +58,12 @@
 #ifndef __ARCH_X86_REGFILE_HH__
 #define __ARCH_X86_REGFILE_HH__
 
+#include <iostream>
 #include <string>
 
 #include "arch/x86/intregs.hh"
 #include "arch/x86/miscregs.hh"
-#include "arch/x86/isa_traits.hh"
 #include "arch/x86/x86_traits.hh"
-#include "arch/x86/types.hh"
-#include "base/types.hh"
 
 class Checkpoint;
 class EventManager;
@@ -88,28 +86,12 @@ namespace X86ISA
 
     class RegFile
     {
-      protected:
-        Addr rip; //Program Counter
-        Addr nextRip; //Next Program Counter
-
       public:
-        Addr readPC();
-        void setPC(Addr val);
-
-        Addr readNextPC();
-        void setNextPC(Addr val);
-
-        Addr readNextNPC();
-        void setNextNPC(Addr val);
-
-      public:
-
         void clear()
         {}
 
         void serialize(EventManager *em, std::ostream &os)
         {}
-
         void unserialize(EventManager *em, Checkpoint *cp,
                 const std::string &section)
         {}