syscall_emul: don't check host fd when allocating target fd

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

diff --git a/src/sim/faults.hh b/src/sim/faults.hh
index 23385c649a9a8e6093bf27e6a03221f76c9c2701..dd42c35aba6cdabb8de7a0fb911675b5f3321568 100644 (file)
--- a/src/sim/faults.hh
+++ b/src/sim/faults.hh
@@ -32,16 +32,14 @@
 #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.
@@ -50,23 +48,14 @@ typedef Stats::Scalar<> FaultStat;
 // all faults returned using the Fault type) will use the
 // generic FaultBase name.
 
-class FaultBase : public RefCounted
+class FaultBase
 {
   public:
-    virtual FaultName name() = 0;
-#if FULL_SYSTEM
-    virtual void invoke(ThreadContext * tc);
-#else
-    virtual void invoke(ThreadContext * tc);
-#endif
-//    template<typename T>
-//    bool isA() {return dynamic_cast<T *>(this);}
-    virtual bool isMachineCheckFault() {return false;}
-    virtual bool isAlignmentFault() {return false;}
+    virtual FaultName name() const = 0;
+    virtual void invoke(ThreadContext * tc, const StaticInstPtr &inst =
+                        StaticInst::nullStaticInstPtr);
 };
 
-FaultBase * const NoFault = 0;
-
 class UnimpFault : public FaultBase
 {
   private:
@@ -76,8 +65,40 @@ class UnimpFault : public FaultBase
         : panicStr(_str)
     { }
 
-    FaultName name() {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);
+};
+
+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, const StaticInstPtr &inst =
+                StaticInst::nullStaticInstPtr);
+};
+
+class GenericAlignmentFault : public FaultBase
+{
+  private:
+    Addr vaddr;
+  public:
+    FaultName name() const {return "Generic alignment fault";}
+    GenericAlignmentFault(Addr va) : vaddr(va) {}
+    void invoke(ThreadContext * tc, const StaticInstPtr &inst =
+                StaticInst::nullStaticInstPtr);
 };
 
 #endif // __FAULTS_HH__