diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-22 08:10:59 -0700 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-22 08:10:59 -0700 |
commit | d5c74657c986a1c6730393d76da6d8859ae7fca4 (patch) | |
tree | 9de36c35735432220f010b98a25b0f380d13ef6a /src/arch/sparc | |
parent | 1c2d5f5e64387527efe495a59f6946e7b539a543 (diff) | |
parent | 03730edc45e2e00bdec58dabc84e94c632634a1a (diff) | |
download | gem5-d5c74657c986a1c6730393d76da6d8859ae7fca4.tar.xz |
Merge more changes in from head.
--HG--
extra : convert_revision : 8f170f2754eccdb424a35b5b077225abcf6eee72
Diffstat (limited to 'src/arch/sparc')
-rw-r--r-- | src/arch/sparc/faults.hh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/arch/sparc/faults.hh b/src/arch/sparc/faults.hh index 10ef89279..2456ad28a 100644 --- a/src/arch/sparc/faults.hh +++ b/src/arch/sparc/faults.hh @@ -65,7 +65,6 @@ class SparcFaultBase : public FaultBase #if FULL_SYSTEM void invoke(ThreadContext * tc); #endif - virtual FaultName name() = 0; virtual TrapType trapType() = 0; virtual FaultPriority priority() = 0; virtual FaultStat & countStat() = 0; @@ -78,7 +77,7 @@ class SparcFault : public SparcFaultBase protected: static FaultVals vals; public: - FaultName name() {return vals.name;} + FaultName name() const {return vals.name;} TrapType trapType() {return vals.trapType;} FaultPriority priority() {return vals.priority;} FaultStat & countStat() {return vals.count;} @@ -133,7 +132,7 @@ class InternalProcessorError : public SparcFault<InternalProcessorError> { public: - bool isMachineCheckFault() {return true;} + bool isMachineCheckFault() const {return true;} }; class InstructionInvalidTSBEntry : public SparcFault<InstructionInvalidTSBEntry> {}; @@ -152,7 +151,7 @@ class MemAddressNotAligned : public SparcFault<MemAddressNotAligned> { public: - bool isAlignmentFault() {return true;} + bool isAlignmentFault() const {return true;} }; class LDDFMemAddressNotAligned : public SparcFault<LDDFMemAddressNotAligned> {}; |