Got rid of the multiple inheritance in the Fault classes, and the base MachineCheck and Alignment faults.

--HG--
extra : convert_revision : 4b1429ef5c7a11c25e28f2bc868cc1481a08c5d1

1 files changed, 12 insertions, 8 deletions

diff --git a/arch/alpha/faults.hh b/arch/alpha/faults.hh
index b9573905a..c4a72e07c 100644
--- a/arch/alpha/faults.hh
+++ b/arch/alpha/faults.hh
@@ -50,38 +50,40 @@ class AlphaFault : public virtual FaultBase
     virtual FaultVect vect() = 0;
 };
 
-class AlphaMachineCheckFault :
-    public MachineCheckFault,
-    public AlphaFault
+class MachineCheckFault : public AlphaFault
 {
   private:
+    static FaultName _name;
     static FaultVect _vect;
     static FaultStat _stat;
   public:
+    FaultName name() {return _name;}
     FaultVect vect() {return _vect;}
     FaultStat & stat() {return _stat;}
+    bool isMachineCheckFault() {return true;}
 };
 
-class AlphaAlignmentFault :
-    public AlignmentFault,
-    public AlphaFault
+class AlignmentFault : public AlphaFault
 {
   private:
+    static FaultName _name;
     static FaultVect _vect;
     static FaultStat _stat;
   public:
+    FaultName name() {return _name;}
     FaultVect vect() {return _vect;}
     FaultStat & stat() {return _stat;}
+    bool isAlignmentFault() {return true;}
 };
 
 static inline Fault genMachineCheckFault()
 {
-    return new AlphaMachineCheckFault;
+    return new MachineCheckFault;
 }
 
 static inline Fault genAlignmentFault()
 {
-    return new AlphaAlignmentFault;
+    return new AlignmentFault;
 }
 
 class ResetFault : public AlphaFault
@@ -108,7 +110,9 @@ class ArithmeticFault : public AlphaFault
     FaultName name() {return _name;}
     FaultVect vect() {return _vect;}
     FaultStat & stat() {return _stat;}
+#if FULL_SYSTEM
     void invoke(ExecContext * xc);
+#endif
 };
 
 class InterruptFault : public AlphaFault