sim: Small style fixes in sim/syscall_return.hh.

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

diff --git a/src/sim/faults.hh b/src/sim/faults.hh
index cfc6ad1052a60e468aade47a7a51a32f942e4ee6..47855e7c28a8967dccb44cacbb0d5437c221532d 100644 (file)
--- a/src/sim/faults.hh
+++ b/src/sim/faults.hh
@@ -32,36 +32,24 @@
 #ifndef __FAULTS_HH__
 #define __FAULTS_HH__
 
-#include "base/refcnt.hh"
+#include "base/types.hh"
+#include "cpu/static_inst.hh"
 #include "sim/stats.hh"
-#include "config/full_system.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.
-// The function is necessary because otherwise, all objects
-// which are being accessed cast as a FaultBase * (namely
-// all faults returned using the Fault type) will use the
-// generic FaultBase name.
-
-class FaultBase : public RefCounted
+class FaultBase
 {
   public:
     virtual FaultName name() const = 0;
-    virtual void invoke(ThreadContext * tc);
-//    template<typename T>
-//    bool isA() {return dynamic_cast<T *>(this);}
-    virtual bool isMachineCheckFault() const {return false;}
-    virtual bool isAlignmentFault() const {return false;}
-};
+    virtual void invoke(ThreadContext * tc, const StaticInstPtr &inst =
+                        StaticInst::nullStaticInstPtr);
 
-FaultBase * const NoFault = 0;
+    virtual ~FaultBase() {};
+};
 
 class UnimpFault : public FaultBase
 {
@@ -72,19 +60,46 @@ class UnimpFault : public FaultBase
         : panicStr(_str)
     { }
 
-    FaultName name() const {return "Unimplemented simulator feature";}
-    void invoke(ThreadContext * tc);
+    FaultName name() const { return "Unimplemented simulator feature"; }
+    void invoke(ThreadContext * tc, const StaticInstPtr &inst =
+                StaticInst::nullStaticInstPtr);
+};
+
+class ReExec : public FaultBase
+{
+  public:
+    virtual FaultName name() const { return "Re-execution fault"; }
+    ReExec() {}
+    void invoke(ThreadContext *tc, const StaticInstPtr &inst =
+                StaticInst::nullStaticInstPtr);
+};
+
+/*
+ * This class is needed to allow system call retries to occur for blocking
+ * system calls in SE mode. A retry fault will be generated by the system call
+ * emulation code if blocking conditions arise; the fault is passed up the
+ * function call chain into the CPU model where it is handled by retrying the
+ * syscall instruction on a later tick.
+ */
+class SyscallRetryFault : public FaultBase
+{
+  public:
+    virtual FaultName name() const { return "System call retry fault"; }
+    SyscallRetryFault() {}
+    void invoke(ThreadContext *tc, const StaticInstPtr &inst =
+                StaticInst::nullStaticInstPtr);
 };
 
-#if !FULL_SYSTEM
 class GenericPageTableFault : public FaultBase
 {
   private:
     Addr vaddr;
   public:
-    FaultName name() const {return "Generic page table fault";}
+    FaultName name() const { return "Generic page table fault"; }
     GenericPageTableFault(Addr va) : vaddr(va) {}
-    void invoke(ThreadContext * tc);
+    void invoke(ThreadContext * tc, const StaticInstPtr &inst =
+                StaticInst::nullStaticInstPtr);
+    Addr getFaultVAddr() const { return vaddr; }
 };
 
 class GenericAlignmentFault : public FaultBase
@@ -92,10 +107,11 @@ class GenericAlignmentFault : public FaultBase
   private:
     Addr vaddr;
   public:
-    FaultName name() const {return "Generic alignment fault";}
+    FaultName name() const { return "Generic alignment fault"; }
     GenericAlignmentFault(Addr va) : vaddr(va) {}
-    void invoke(ThreadContext * tc);
+    void invoke(ThreadContext * tc, const StaticInstPtr &inst =
+                StaticInst::nullStaticInstPtr);
+    Addr getFaultVAddr() const { return vaddr; }
 };
-#endif
 
 #endif // __FAULTS_HH__