Moved some constants from isa_traits.hh to the reg file headers.

--HG--
extra : convert_revision : 378b2d9791e6282539900a2261ad2275d726b4be

1 files changed, 6 insertions, 2 deletions

diff --git a/src/arch/sparc/intregfile.hh b/src/arch/sparc/intregfile.hh
index 223e3b34c..59f767e8e 100644
--- a/src/arch/sparc/intregfile.hh
+++ b/src/arch/sparc/intregfile.hh
@@ -32,12 +32,13 @@
 #ifndef __ARCH_SPARC_INTREGFILE_HH__
 #define __ARCH_SPARC_INTREGFILE_HH__
 
-#include "arch/sparc/faults.hh"
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/types.hh"
 
 #include <string>
 
+class Checkpoint;
+
 namespace SparcISA
 {
     class RegFile;
@@ -45,6 +46,9 @@ namespace SparcISA
     //This function translates integer register file indices into names
     std::string getIntRegName(RegIndex);
 
+    const int NumIntArchRegs = 32;
+    const int NumIntRegs = MaxGL * 8 + NWindows * 16 + NumMicroIntRegs;
+
     class IntRegFile
     {
       private:
@@ -85,7 +89,7 @@ namespace SparcISA
 
         IntReg readReg(int intReg);
 
-        Fault setReg(int intReg, const IntReg &val);
+        void setReg(int intReg, const IntReg &val);
 
         void serialize(std::ostream &os);