ARM: Implement WFE/WFI/SEV semantics.

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

diff --git a/src/sim/faults.hh b/src/sim/faults.hh
index f2e638945a6ab1643b18b2ce31c2f4d2337fcdb2..7f431b3132880dd6074a77a3fc93eff2dd4ee146 100644 (file)
--- a/src/sim/faults.hh
+++ b/src/sim/faults.hh
@@ -33,15 +33,16 @@
 #define __FAULTS_HH__
 
 #include "base/refcnt.hh"
-#include "sim/stats.hh"
+#include "base/types.hh"
 #include "config/full_system.hh"
+#include "cpu/static_inst.hh"
+#include "sim/fault_fwd.hh"
+#include "sim/stats.hh"
 
 class ThreadContext;
-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.
@@ -54,15 +55,12 @@ class FaultBase : public RefCounted
 {
   public:
     virtual FaultName name() const = 0;
-    virtual void invoke(ThreadContext * tc);
-//    template<typename T>
-//    bool isA() {return dynamic_cast<T *>(this);}
+    virtual void invoke(ThreadContext * tc,
+            StaticInstPtr inst = StaticInst::nullStaticInstPtr);
     virtual bool isMachineCheckFault() const {return false;}
     virtual bool isAlignmentFault() const {return false;}
 };
 
-FaultBase * const NoFault = 0;
-
 class UnimpFault : public FaultBase
 {
   private:
@@ -73,18 +71,31 @@ class UnimpFault : public FaultBase
     { }
 
     FaultName name() const {return "Unimplemented simulator feature";}
-    void invoke(ThreadContext * tc);
+    void invoke(ThreadContext * tc,
+            StaticInstPtr inst = StaticInst::nullStaticInstPtr);
 };
 
 #if !FULL_SYSTEM
-class PageTableFault : public FaultBase
+class GenericPageTableFault : public FaultBase
+{
+  private:
+    Addr vaddr;
+  public:
+    FaultName name() const {return "Generic page table fault";}
+    GenericPageTableFault(Addr va) : vaddr(va) {}
+    void invoke(ThreadContext * tc,
+            StaticInstPtr inst = StaticInst::nullStaticInstPtr);
+};
+
+class GenericAlignmentFault : public FaultBase
 {
   private:
     Addr vaddr;
   public:
-    FaultName name() const {return "M5 page table fault";}
-    PageTableFault(Addr va) : vaddr(va) {}
-    void invoke(ThreadContext * tc);
+    FaultName name() const {return "Generic alignment fault";}
+    GenericAlignmentFault(Addr va) : vaddr(va) {}
+    void invoke(ThreadContext * tc,
+            StaticInstPtr inst = StaticInst::nullStaticInstPtr);
 };
 #endif