LSQ Unit: After deleting part of a split request, set it to NULL so that it

[gem5.git] / src / sim / faults.hh

diff --git a/src/sim/faults.hh b/src/sim/faults.hh
index 2f0b5af622c6a2360103faf8e6f99688a358e00d..75696641bdb47786a791850db0441d082cd0bea8 100644 (file)
--- a/src/sim/faults.hh
+++ b/src/sim/faults.hh
@@ -41,7 +41,7 @@ class FaultBase;
 typedef RefCountingPtr<FaultBase> Fault;
 
 typedef const char * FaultName;
-typedef Stats::Scalar<> FaultStat;
+typedef Stats::Scalar FaultStat;
 
 // Each class has it's name statically define in _name,
 // and has a virtual function to access it's name.
@@ -53,12 +53,12 @@ typedef Stats::Scalar<> FaultStat;
 class FaultBase : public RefCounted
 {
   public:
-    virtual FaultName name() = 0;
+    virtual FaultName name() const = 0;
     virtual void invoke(ThreadContext * tc);
 //    template<typename T>
 //    bool isA() {return dynamic_cast<T *>(this);}
-    virtual bool isMachineCheckFault() {return false;}
-    virtual bool isAlignmentFault() {return false;}
+    virtual bool isMachineCheckFault() const {return false;}
+    virtual bool isAlignmentFault() const {return false;}
 };
 
 FaultBase * const NoFault = 0;
@@ -72,18 +72,28 @@ class UnimpFault : public FaultBase
         : panicStr(_str)
     { }
 
-    FaultName name() {return "Unimplemented simulator feature";}
+    FaultName name() const {return "Unimplemented simulator feature";}
     void invoke(ThreadContext * tc);
 };
 
 #if !FULL_SYSTEM
-class PageTableFault : public FaultBase
+class GenericPageTableFault : public FaultBase
 {
   private:
     Addr vaddr;
   public:
-    FaultName name() {return "M5 page table fault";}
-    PageTableFault(Addr va) : vaddr(va) {}
+    FaultName name() const {return "Generic page table fault";}
+    GenericPageTableFault(Addr va) : vaddr(va) {}
+    void invoke(ThreadContext * tc);
+};
+
+class GenericAlignmentFault : public FaultBase
+{
+  private:
+    Addr vaddr;
+  public:
+    FaultName name() const {return "Generic alignment fault";}
+    GenericAlignmentFault(Addr va) : vaddr(va) {}
     void invoke(ThreadContext * tc);
 };
 #endif