From badb2382a86dacfecf2793fa9edd85fa17497d37 Mon Sep 17 00:00:00 2001
From: Korey Sewell <ksewell@umich.edu>
Date: Tue, 15 Sep 2009 01:44:48 -0400
Subject: inorder-alpha-fs: edit inorder model to compile FS mode

---
 src/cpu/inorder/inorder_dyn_inst.hh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/cpu/inorder/inorder_dyn_inst.hh')

diff --git a/src/cpu/inorder/inorder_dyn_inst.hh b/src/cpu/inorder/inorder_dyn_inst.hh
index e95a6d039..a91c6a763 100644
--- a/src/cpu/inorder/inorder_dyn_inst.hh
+++ b/src/cpu/inorder/inorder_dyn_inst.hh
@@ -43,6 +43,7 @@
 #include "arch/mt.hh"
 #include "base/fast_alloc.hh"
 #include "base/trace.hh"
+#include "base/types.hh"
 #include "cpu/inorder/inorder_trace.hh"
 #include "config/full_system.hh"
 #include "cpu/thread_context.hh"
@@ -55,6 +56,11 @@
 #include "cpu/inorder/pipeline_traits.hh"
 #include "mem/packet.hh"
 #include "sim/system.hh"
+#include "sim/faults.hh"
+
+#if THE_ISA==ALPHA_ISA
+#include "arch/alpha/ev5.hh"
+#endif
 
 /**
  * @file
@@ -64,6 +70,7 @@
 // Forward declaration.
 class StaticInstPtr;
 class ResourceRequest;
+class Packet;
 
 class InOrderDynInst : public FastAlloc, public RefCounted
 {
@@ -486,7 +493,16 @@ class InOrderDynInst : public FastAlloc, public RefCounted
     void setCurResSlot(unsigned slot_num) { curResSlot = slot_num; }
 
     /** Calls a syscall. */
+#if FULL_SYSTEM
+    /** Calls hardware return from error interrupt. */
+    Fault hwrei();
+    /** Traps to handle specified fault. */
+    void trap(Fault fault);
+    bool simPalCheck(int palFunc);
+#else
+    /** Calls a syscall. */
     void syscall(int64_t callnum);
+#endif
     void prefetch(Addr addr, unsigned flags);
     void writeHint(Addr addr, int size, unsigned flags);
     Fault copySrcTranslate(Addr src);
-- 
cgit v1.2.3