sim-se: Add default to SyscallDesc constructor

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

diff --git a/src/sim/faults.cc b/src/sim/faults.cc
index bd05df8343a31aaae5b7225603d6a075f3b71fa2..b0fa6fedb11f4f90ea26dc51637666f303b759e3 100644 (file)
--- a/src/sim/faults.cc
+++ b/src/sim/faults.cc
@@ -29,51 +29,54 @@
  *          Gabe Black
  */
 
+#include "sim/faults.hh"
+
 #include "arch/isa_traits.hh"
 #include "base/misc.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/full_system.hh"
 #include "sim/process.hh"
 
-#if !FULL_SYSTEM
-void FaultBase::invoke(ThreadContext * tc, StaticInstPtr inst)
-{
-    panic("fault (%s) detected @ PC %s", name(), tc->pcState());
-}
-#else
-void FaultBase::invoke(ThreadContext * tc, StaticInstPtr inst)
+void FaultBase::invoke(ThreadContext * tc, const StaticInstPtr &inst)
 {
-    DPRINTF(Fault, "Fault %s at PC: %s\n", name(), tc->pcState());
-    assert(!tc->misspeculating());
+    if (FullSystem) {
+        DPRINTF(Fault, "Fault %s at PC: %s\n", name(), tc->pcState());
+    } else {
+        panic("fault (%s) detected @ PC %s", name(), tc->pcState());
+    }
 }
-#endif
 
-void UnimpFault::invoke(ThreadContext * tc, StaticInstPtr inst)
+void UnimpFault::invoke(ThreadContext * tc, const StaticInstPtr &inst)
 {
     panic("Unimpfault: %s\n", panicStr.c_str());
 }
 
-void ReExec::invoke(ThreadContext *tc, StaticInstPtr inst)
+void ReExec::invoke(ThreadContext *tc, const StaticInstPtr &inst)
 {
     tc->pcState(tc->pcState());
 }
 
-
-#if !FULL_SYSTEM
-void GenericPageTableFault::invoke(ThreadContext *tc, StaticInstPtr inst)
+void SyscallRetryFault::invoke(ThreadContext *tc, const StaticInstPtr &inst)
 {
-    Process *p = tc->getProcessPtr();
+    tc->pcState(tc->pcState());
+}
 
-    if (!p->fixupStackFault(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);
 
 }
 
-void GenericAlignmentFault::invoke(ThreadContext *tc, StaticInstPtr inst)
+void GenericAlignmentFault::invoke(ThreadContext *tc, const StaticInstPtr &inst)
 {
     panic("Alignment fault when accessing virtual address %#x\n", vaddr);
 }
-#endif