sim, arch, base: Refactor the base remote GDB class.

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

diff --git a/src/sim/faults.cc b/src/sim/faults.cc
index fe62874d7fc8a85d0db7bf0b0ad3874ce60836c5..06060802f32d4e2efae3767f8c06d0618b5f4803 100644 (file)
--- a/src/sim/faults.cc
+++ b/src/sim/faults.cc
@@ -29,40 +29,54 @@
  *          Gabe Black
  */
 
+#include "sim/faults.hh"
+
 #include "arch/isa_traits.hh"
-#include "base/misc.hh"
-#include "cpu/thread_context.hh"
+#include "base/logging.hh"
 #include "cpu/base.hh"
-#include "sim/faults.hh"
-#include "sim/process.hh"
+#include "cpu/thread_context.hh"
+#include "debug/Fault.hh"
 #include "mem/page_table.hh"
+#include "sim/full_system.hh"
+#include "sim/process.hh"
 
-#if !FULL_SYSTEM
-void FaultBase::invoke(ThreadContext * tc)
+void FaultBase::invoke(ThreadContext * tc, const StaticInstPtr &inst)
 {
-    fatal("fault (%s) detected @ PC %p", name(), tc->readPC());
+    if (FullSystem) {
+        DPRINTF(Fault, "Fault %s at PC: %s\n", name(), tc->pcState());
+    } else {
+        panic("fault (%s) detected @ PC %s", name(), tc->pcState());
+    }
 }
-#else
-void FaultBase::invoke(ThreadContext * tc)
-{
-    DPRINTF(Fault, "Fault %s at PC: %#x\n", name(), tc->readPC());
-    tc->getCpuPtr()->recordEvent(csprintf("Fault %s", name()));
 
-    assert(!tc->misspeculating());
+void UnimpFault::invoke(ThreadContext * tc, const StaticInstPtr &inst)
+{
+    panic("Unimpfault: %s\n", panicStr.c_str());
 }
-#endif
 
-void UnimpFault::invoke(ThreadContext * tc)
+void ReExec::invoke(ThreadContext *tc, const StaticInstPtr &inst)
 {
-    panic("Unimpfault: %s\n", panicStr.c_str());
+    tc->pcState(tc->pcState());
 }
-#if !FULL_SYSTEM
-void PageTableFault::invoke(ThreadContext *tc)
+
+void SyscallRetryFault::invoke(ThreadContext *tc, const StaticInstPtr &inst)
 {
-    Process *p = tc->getProcessPtr();
+    tc->pcState(tc->pcState());
+}
 
-    if (!p->checkAndAllocNextPage(vaddr))
+void GenericPageTableFault::invoke(ThreadContext *tc, const StaticInstPtr &inst)
+{
+    bool handled = false;
+    if (!FullSystem) {
+        Process *p = tc->getProcessPtr();
+        handled = p->fixupStackFault(vaddr);
+    }
+    if (!handled)
         panic("Page table fault when accessing virtual address %#x\n", vaddr);
 
 }
-#endif
+
+void GenericAlignmentFault::invoke(ThreadContext *tc, const StaticInstPtr &inst)
+{
+    panic("Alignment fault when accessing virtual address %#x\n", vaddr);
+}