Faults: Get rid of the unused isAlignmentFault and isMachineCheckFault.

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

diff --git a/src/sim/faults.cc b/src/sim/faults.cc
index 6a598a3f43184319e2daf549106e76f49ab0ae26..bd05df8343a31aaae5b7225603d6a075f3b71fa2 100644 (file)
--- a/src/sim/faults.cc
+++ b/src/sim/faults.cc
@@ -29,27 +29,51 @@
  *          Gabe Black
  */
 
+#include "arch/isa_traits.hh"
 #include "base/misc.hh"
-#include "sim/faults.hh"
-#include "cpu/exec_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
+#include "debug/Fault.hh"
+#include "mem/page_table.hh"
+#include "sim/faults.hh"
+#include "sim/process.hh"
 
 #if !FULL_SYSTEM
-void FaultBase::invoke(ExecContext * xc)
+void FaultBase::invoke(ThreadContext * tc, StaticInstPtr inst)
 {
-    fatal("fault (%s) detected @ PC 0x%08p", name(), xc->readPC());
+    panic("fault (%s) detected @ PC %s", name(), tc->pcState());
 }
 #else
-void FaultBase::invoke(ExecContext * xc)
+void FaultBase::invoke(ThreadContext * tc, StaticInstPtr inst)
 {
-    DPRINTF(Fault, "Fault %s at PC: %#x\n", name(), xc->readPC());
-    xc->getCpuPtr()->recordEvent(csprintf("Fault %s", name()));
-
-    assert(!xc->misspeculating());
+    DPRINTF(Fault, "Fault %s at PC: %s\n", name(), tc->pcState());
+    assert(!tc->misspeculating());
 }
 #endif
 
-void UnimpFault::invoke(ExecContext * xc)
+void UnimpFault::invoke(ThreadContext * tc, StaticInstPtr inst)
 {
     panic("Unimpfault: %s\n", panicStr.c_str());
 }
+
+void ReExec::invoke(ThreadContext *tc, StaticInstPtr inst)
+{
+    tc->pcState(tc->pcState());
+}
+
+
+#if !FULL_SYSTEM
+void GenericPageTableFault::invoke(ThreadContext *tc, StaticInstPtr inst)
+{
+    Process *p = tc->getProcessPtr();
+
+    if (!p->fixupStackFault(vaddr))
+        panic("Page table fault when accessing virtual address %#x\n", vaddr);
+
+}
+
+void GenericAlignmentFault::invoke(ThreadContext *tc, StaticInstPtr inst)
+{
+    panic("Alignment fault when accessing virtual address %#x\n", vaddr);
+}
+#endif