summaryrefslogtreecommitdiff
path: root/arch/sparc
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-04-06 14:53:14 -0400
committerGabe Black <gblack@eecs.umich.edu>2006-04-06 14:53:14 -0400
commit3124c5b7bb0cdcb3b16b52533c6a3e50a5970152 (patch)
tree245d215ca1fe80524bbb9c4f0a8ec6c3897f75ae /arch/sparc
parent6d8d6d15cdf5547740afbd41efe7c0f1d62079f3 (diff)
downloadgem5-3124c5b7bb0cdcb3b16b52533c6a3e50a5970152.tar.xz
Changed the CleanWindow fault from an enumerate fault into a regular one.
--HG-- extra : convert_revision : bf43015f5e47768a6e07ce36dc66a38426beceee
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/faults.cc6
-rw-r--r--arch/sparc/faults.hh27
2 files changed, 16 insertions, 17 deletions
diff --git a/arch/sparc/faults.cc b/arch/sparc/faults.cc
index 9831a7679..a26015aae 100644
--- a/arch/sparc/faults.cc
+++ b/arch/sparc/faults.cc
@@ -179,13 +179,13 @@ TrapType AsyncDataError::_trapType = 0x040;
FaultPriority AsyncDataError::_priority = 2;
FaultStat AsyncDataError::_count;
-//The enumerated faults
-
FaultName CleanWindow::_name = "clean_win";
-TrapType CleanWindow::_baseTrapType = 0x024;
+TrapType CleanWindow::_trapType = 0x024;
FaultPriority CleanWindow::_priority = 10;
FaultStat CleanWindow::_count;
+//The enumerated faults
+
FaultName InterruptLevelN::_name = "interrupt_n";
TrapType InterruptLevelN::_baseTrapType = 0x041;
FaultStat InterruptLevelN::_count;
diff --git a/arch/sparc/faults.hh b/arch/sparc/faults.hh
index 985407c26..36a72930a 100644
--- a/arch/sparc/faults.hh
+++ b/arch/sparc/faults.hh
@@ -468,31 +468,30 @@ class AsyncDataError : public SparcFault
FaultStat & countStat() {return _count;}
};
-class EnumeratedFault : public SparcFault
-{
- protected:
- uint32_t _n;
- virtual TrapType baseTrapType() = 0;
- public:
- EnumeratedFault(uint32_t n) : SparcFault() {_n = n;}
- TrapType trapType() {return baseTrapType() + _n;}
-};
-
-class CleanWindow : public EnumeratedFault
+class CleanWindow : public SparcFault
{
private:
static FaultName _name;
- static TrapType _baseTrapType;
+ static TrapType _trapType;
static FaultPriority _priority;
static FaultStat _count;
- TrapType baseTrapType() {return _baseTrapType;}
public:
- CleanWindow(uint32_t n) : EnumeratedFault(n) {;}
FaultName name() {return _name;}
+ TrapType trapType() {return _trapType;}
FaultPriority priority() {return _priority;}
FaultStat & countStat() {return _count;}
};
+class EnumeratedFault : public SparcFault
+{
+ protected:
+ uint32_t _n;
+ virtual TrapType baseTrapType() = 0;
+ public:
+ EnumeratedFault(uint32_t n) : SparcFault() {_n = n;}
+ TrapType trapType() {return baseTrapType() + _n;}
+};
+
class InterruptLevelN : public EnumeratedFault
{
private: