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 9b3bc91037b8e3ceb20f89c293ea586726a5bbde..75696641bdb47786a791850db0441d082cd0bea8 100644 (file)
--- a/src/sim/faults.hh
+++ b/src/sim/faults.hh
@@ -24,6 +24,9 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
+ *          Gabe Black
  */
 
 #ifndef __FAULTS_HH__
@@ -33,12 +36,12 @@
 #include "sim/stats.hh"
 #include "config/full_system.hh"
 
-class ExecContext;
+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,16 +53,12 @@ typedef Stats::Scalar<> FaultStat;
 class FaultBase : public RefCounted
 {
   public:
-    virtual FaultName name() = 0;
-#if FULL_SYSTEM
-    virtual void invoke(ExecContext * xc);
-#else
-    virtual void invoke(ExecContext * xc);
-#endif
+    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;
@@ -73,8 +72,30 @@ class UnimpFault : public FaultBase
         : panicStr(_str)
     { }
 
-    FaultName name() {return "Unimplemented simulator feature";}
-    void invoke(ExecContext * xc);
+    FaultName name() const {return "Unimplemented simulator feature";}
+    void invoke(ThreadContext * tc);
+};
+
+#if !FULL_SYSTEM
+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);
 };
 
+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
+
 #endif // __FAULTS_HH__