Moved the _stat for MachineCheckFault and AlignmentFault into the isa specific classes to prevent instantiation of the generic classes.
--HG-- extra : convert_revision : 0378261342df008c2bf6d260295ef21b15f119a8
This commit is contained in:
parent
2f7b8ab1ec
commit
36b2d9815e
4 changed files with 6 additions and 6 deletions
|
@ -36,8 +36,10 @@ FaultVect AlphaFault::_vect = 0x0000;
|
||||||
FaultStat AlphaFault::_stat;
|
FaultStat AlphaFault::_stat;
|
||||||
|
|
||||||
FaultVect AlphaMachineCheckFault::_vect = 0x0401;
|
FaultVect AlphaMachineCheckFault::_vect = 0x0401;
|
||||||
|
FaultStat AlphaMachineCheckFault::_stat;
|
||||||
|
|
||||||
FaultVect AlphaAlignmentFault::_vect = 0x0301;
|
FaultVect AlphaAlignmentFault::_vect = 0x0301;
|
||||||
|
FaultStat AlphaAlignmentFault::_stat;
|
||||||
|
|
||||||
FaultName ResetFault::_name = "reset";
|
FaultName ResetFault::_name = "reset";
|
||||||
FaultVect ResetFault::_vect = 0x0001;
|
FaultVect ResetFault::_vect = 0x0001;
|
||||||
|
|
|
@ -54,16 +54,20 @@ class AlphaMachineCheckFault : public MachineCheckFault
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
static FaultVect _vect;
|
static FaultVect _vect;
|
||||||
|
static FaultStat _stat;
|
||||||
public:
|
public:
|
||||||
FaultVect vect() {return _vect;}
|
FaultVect vect() {return _vect;}
|
||||||
|
FaultStat & stat() {return _stat;}
|
||||||
};
|
};
|
||||||
|
|
||||||
class AlphaAlignmentFault : public AlignmentFault
|
class AlphaAlignmentFault : public AlignmentFault
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
static FaultVect _vect;
|
static FaultVect _vect;
|
||||||
|
static FaultStat _stat;
|
||||||
public:
|
public:
|
||||||
FaultVect vect() {return _vect;}
|
FaultVect vect() {return _vect;}
|
||||||
|
FaultStat & stat() {return _stat;}
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline Fault genMachineCheckFault()
|
static inline Fault genMachineCheckFault()
|
||||||
|
|
|
@ -29,7 +29,5 @@
|
||||||
#include "sim/faults.hh"
|
#include "sim/faults.hh"
|
||||||
|
|
||||||
FaultName MachineCheckFault::_name = "mchk";
|
FaultName MachineCheckFault::_name = "mchk";
|
||||||
FaultStat MachineCheckFault::_stat;
|
|
||||||
FaultName AlignmentFault::_name = "unalign";
|
FaultName AlignmentFault::_name = "unalign";
|
||||||
FaultStat AlignmentFault::_stat;
|
|
||||||
|
|
||||||
|
|
|
@ -71,10 +71,8 @@ class MachineCheckFault : public FaultBase
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
static FaultName _name;
|
static FaultName _name;
|
||||||
static FaultStat _stat;
|
|
||||||
public:
|
public:
|
||||||
FaultName name() {return _name;}
|
FaultName name() {return _name;}
|
||||||
FaultStat & stat() {return _stat;}
|
|
||||||
bool isMachineCheckFault() {return true;}
|
bool isMachineCheckFault() {return true;}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -82,10 +80,8 @@ class AlignmentFault : public FaultBase
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
static FaultName _name;
|
static FaultName _name;
|
||||||
static FaultStat _stat;
|
|
||||||
public:
|
public:
|
||||||
FaultName name() {return _name;}
|
FaultName name() {return _name;}
|
||||||
FaultStat & stat() {return _stat;}
|
|
||||||
bool isAlignmentFault() {return true;}
|
bool isAlignmentFault() {return true;}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue