diff options
Diffstat (limited to 'src/arch/alpha')
-rw-r--r-- | src/arch/alpha/intregfile.cc | 22 | ||||
-rw-r--r-- | src/arch/alpha/intregfile.hh | 31 | ||||
-rw-r--r-- | src/arch/alpha/regfile.cc | 2 | ||||
-rw-r--r-- | src/arch/alpha/regfile.hh | 16 |
4 files changed, 1 insertions, 70 deletions
diff --git a/src/arch/alpha/intregfile.cc b/src/arch/alpha/intregfile.cc index 8f692f856..de1c2a5d9 100644 --- a/src/arch/alpha/intregfile.cc +++ b/src/arch/alpha/intregfile.cc @@ -30,11 +30,7 @@ * Kevin Lim */ -#include <cstring> - -#include "arch/alpha/isa_traits.hh" #include "arch/alpha/intregfile.hh" -#include "sim/serialize.hh" namespace AlphaISA { @@ -52,23 +48,5 @@ const int reg_redir[NumIntRegs] = { /* 24 */ 24, 25, 26, 27, 28, 29, 30, 31 }; #endif -void -IntRegFile::clear() -{ - std::memset(regs, 0, sizeof(regs)); -} - -void -IntRegFile::serialize(std::ostream &os) -{ - SERIALIZE_ARRAY(regs, NumIntRegs); -} - -void -IntRegFile::unserialize(Checkpoint *cp, const std::string §ion) -{ - UNSERIALIZE_ARRAY(regs, NumIntRegs); -} - } // namespace AlphaISA diff --git a/src/arch/alpha/intregfile.hh b/src/arch/alpha/intregfile.hh index 3aa7d92c4..2844b55d9 100644 --- a/src/arch/alpha/intregfile.hh +++ b/src/arch/alpha/intregfile.hh @@ -32,42 +32,13 @@ #ifndef __ARCH_ALPHA_INTREGFILE_HH__ #define __ARCH_ALPHA_INTREGFILE_HH__ -#include <iosfwd> -#include <string> - -#include "arch/alpha/types.hh" - -class Checkpoint; +#include "arch/alpha/isa_traits.hh" namespace AlphaISA { // redirected register map, really only used for the full system case. extern const int reg_redir[NumIntRegs]; -class IntRegFile -{ - protected: - IntReg regs[NumIntRegs]; - - public: - IntReg - readReg(int intReg) - { - return regs[intReg]; - } - - void - setReg(int intReg, const IntReg &val) - { - regs[intReg] = val; - } - - void clear(); - - void serialize(std::ostream &os); - void unserialize(Checkpoint *cp, const std::string §ion); -}; - } // namespace AlphaISA #endif // __ARCH_ALPHA_INTREGFILE_HH__ diff --git a/src/arch/alpha/regfile.cc b/src/arch/alpha/regfile.cc index df345278a..993c91387 100644 --- a/src/arch/alpha/regfile.cc +++ b/src/arch/alpha/regfile.cc @@ -41,7 +41,6 @@ namespace AlphaISA { void RegFile::serialize(EventManager *em, ostream &os) { - intRegFile.serialize(os); SERIALIZE_SCALAR(pc); SERIALIZE_SCALAR(npc); #if FULL_SYSTEM @@ -52,7 +51,6 @@ RegFile::serialize(EventManager *em, ostream &os) void RegFile::unserialize(EventManager *em, Checkpoint *cp, const string §ion) { - intRegFile.unserialize(cp, section); UNSERIALIZE_SCALAR(pc); UNSERIALIZE_SCALAR(npc); #if FULL_SYSTEM diff --git a/src/arch/alpha/regfile.hh b/src/arch/alpha/regfile.hh index 000bea259..113cf225c 100644 --- a/src/arch/alpha/regfile.hh +++ b/src/arch/alpha/regfile.hh @@ -89,9 +89,6 @@ class RegFile { setNextNPC(Addr val) { } - protected: - IntRegFile intRegFile; // (signed) integer register file - public: #if FULL_SYSTEM int intrflag; // interrupt flag @@ -100,19 +97,6 @@ class RegFile { void clear() { - intRegFile.clear(); - } - - IntReg - readIntReg(int intReg) - { - return intRegFile.readReg(intReg); - } - - void - setIntReg(int intReg, const IntReg &val) - { - intRegFile.setReg(intReg, val); } void serialize(EventManager *em, std::ostream &os); |