MachineCheckFaults and AlignmentFaults are now generated by the ISA, rather than being created directly.

arch/alpha/alpha_memory.cc:
cpu/base_dyn_inst.cc:
dev/alpha_console.cc:
dev/pcidev.hh:
dev/sinic.cc:
    MachineCheckFaults are now generated by the ISA, rather than being created directly.

--HG--
extra : convert_revision : 34a7da41639e93be21ed70dac681b27480008d19

1 files changed, 27 insertions, 4 deletions

diff --git a/arch/alpha/faults.hh b/arch/alpha/faults.hh
index bd5163a7d..2004c0911 100644
--- a/arch/alpha/faults.hh
+++ b/arch/alpha/faults.hh
@@ -31,7 +31,7 @@
 
 #include "sim/faults.hh"
 
-// The reasoning behind the name and vect functions is in sim/faults.hh
+// The design of the "name" and "vect" functions is in sim/faults.hh
 
 typedef const Addr FaultVect;
 
@@ -47,6 +47,32 @@ class AlphaFault : public FaultBase
     virtual FaultStat & stat() {return _stat;}
 };
 
+class AlphaMachineCheckFault : public MachineCheckFault
+{
+  private:
+    static FaultVect _vect;
+  public:
+    FaultVect vect() {return _vect;}
+};
+
+class AlphaAlignmentFault : public AlignmentFault
+{
+  private:
+    static FaultVect _vect;
+  public:
+    FaultVect vect() {return _vect;}
+};
+
+static inline Fault genMachineCheckFault()
+{
+    return new AlphaMachineCheckFault;
+}
+
+static inline Fault genAlignmentFault()
+{
+    return new AlphaAlignmentFault;
+}
+
 class ResetFault : public AlphaFault
 {
   private:
@@ -215,7 +241,4 @@ class IntegerOverflowFault : public AlphaFault
     FaultStat & stat() {return _stat;}
 };
 
-//Fault * ListOfFaults[];
-//int NumFaults;
-
 #endif // __FAULTS_HH__