diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-22 10:40:45 -0400 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-22 10:40:45 -0400 |
commit | 03730edc45e2e00bdec58dabc84e94c632634a1a (patch) | |
tree | affdbffcb174a9cfc0de933f3c240ae5f2813292 /src/arch/sparc | |
parent | 658eeee50715d9fd334ae3fd3e0e21b6db6de0c4 (diff) | |
parent | 2cd454d102b5da828b0fbf4b66ef1a24875e69f6 (diff) | |
download | gem5-03730edc45e2e00bdec58dabc84e94c632634a1a.tar.xz |
Merge Gabe's changes with mine.
--HG--
extra : convert_revision : f50ed42e7acb3f11e610fd6976eaa8df0c6ba2ab
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> {}; |