Faults: Turn off arch/faults.hh

Because there are no longer architecture independent but specialized functions
in arch/XXX/faults.hh, code that isn't using the faults from a particular ISA
no longer needs to be able to include them through the switching header file
arch/faults.hh. By removing that header file (arch/faults.hh), the potential
interface between ISA code and non ISA code is narrowed.

diff --git a/src/arch/SConscript b/src/arch/SConscript
index 4f731880fbf9e2f9ec8f6854695a97111cbee055..70a8de7fbe7e0f5ae664cd3505db9f42fd331d86 100644 (file)
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -43,7 +43,6 @@ Import('*')
 
 # List of headers to generate
 isa_switch_hdrs = Split('''
-        faults.hh
         interrupts.hh
         isa.hh
         isa_traits.hh

diff --git a/src/cpu/base_dyn_inst.hh b/src/cpu/base_dyn_inst.hh
index 2b0e26cd21930d850263fb8a1322eb510f2fca9b..027e3f573cbf5514e11b9b02bc542f7598d0440e 100644 (file)
--- a/src/cpu/base_dyn_inst.hh
+++ b/src/cpu/base_dyn_inst.hh
@@ -50,7 +50,6 @@
 #include <string>
 #include <queue>
 
-#include "arch/faults.hh"
 #include "arch/utility.hh"
 #include "base/fast_alloc.hh"
 #include "base/trace.hh"
@@ -64,6 +63,7 @@
 #include "cpu/translation.hh"
 #include "mem/packet.hh"
 #include "sim/byteswap.hh"
+#include "sim/fault_fwd.hh"
 #include "sim/system.hh"
 #include "sim/tlb.hh"
 

diff --git a/src/cpu/inorder/comm.hh b/src/cpu/inorder/comm.hh
index 02a7e9fa4d02629f6a9eecd82bd65d9dea983782..c2c97cd83e81930cb68436f7a649be5bd7ffa749 100644 (file)
--- a/src/cpu/inorder/comm.hh
+++ b/src/cpu/inorder/comm.hh
@@ -34,7 +34,6 @@
 
 #include <vector>
 
-#include "arch/faults.hh"
 #include "arch/isa_traits.hh"
 #include "base/types.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"

diff --git a/src/cpu/inorder/inorder_dyn_inst.cc b/src/cpu/inorder/inorder_dyn_inst.cc
index b61beece2558fe1bdf8c76977810d5fb3a1acd7e..70244247826e168b5ae4ebb63715bdc9420bd557 100644 (file)
--- a/src/cpu/inorder/inorder_dyn_inst.cc
+++ b/src/cpu/inorder/inorder_dyn_inst.cc
@@ -34,7 +34,6 @@
 #include <sstream>
 #include <string>
 
-#include "arch/faults.hh"
 #include "base/bigint.hh"
 #include "base/cp_annotate.hh"
 #include "base/cprintf.hh"
@@ -45,6 +44,7 @@
 #include "cpu/exetrace.hh"
 #include "debug/InOrderDynInst.hh"
 #include "mem/request.hh"
+#include "sim/fault_fwd.hh"
 #include "sim/full_system.hh"
 
 using namespace std;

diff --git a/src/cpu/inorder/inorder_dyn_inst.hh b/src/cpu/inorder/inorder_dyn_inst.hh
index b49dd7594add0c8023bfb1f4541eb789df6cef1c..d61a42480c55242ef5c1b6472eebe7893a3b5d9d 100644 (file)
--- a/src/cpu/inorder/inorder_dyn_inst.hh
+++ b/src/cpu/inorder/inorder_dyn_inst.hh
@@ -37,7 +37,6 @@
 #include <list>
 #include <string>
 
-#include "arch/faults.hh"
 #include "arch/isa_traits.hh"
 #include "arch/mt.hh"
 #include "arch/types.hh"
@@ -58,6 +57,7 @@
 #include "cpu/thread_context.hh"
 #include "debug/InOrderDynInst.hh"
 #include "mem/packet.hh"
+#include "sim/fault_fwd.hh"
 #include "sim/system.hh"
 
 #if THE_ISA == ALPHA_ISA

diff --git a/src/cpu/inorder/thread_state.hh b/src/cpu/inorder/thread_state.hh
index 1ffc59f657d563e1017d0edfb0d6ca87fb362b4b..34c146b42c4d026a95f5fcf2c3fa0982e3ef9b72 100644 (file)
--- a/src/cpu/inorder/thread_state.hh
+++ b/src/cpu/inorder/thread_state.hh
@@ -31,7 +31,6 @@
 #ifndef __CPU_INORDER_THREAD_STATE_HH__
 #define __CPU_INORDER_THREAD_STATE_HH__
 
-#include "arch/faults.hh"
 #include "arch/isa_traits.hh"
 #include "base/callback.hh"
 #include "base/output.hh"

diff --git a/src/cpu/o3/lsq_unit.hh b/src/cpu/o3/lsq_unit.hh
index 4247c3796d4fa60bea2b59dc106d3682eb30c660..702606d399bd09526ec7c03627453409d5189f77 100644 (file)
--- a/src/cpu/o3/lsq_unit.hh
+++ b/src/cpu/o3/lsq_unit.hh
@@ -37,7 +37,6 @@
 #include <map>
 #include <queue>
 
-#include "arch/faults.hh"
 #include "arch/generic/debugfaults.hh"
 #include "arch/isa_traits.hh"
 #include "arch/locked_mem.hh"
@@ -50,6 +49,7 @@
 #include "debug/LSQUnit.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
+#include "sim/fault_fwd.hh"
 
 struct DerivO3CPUParams;
 

diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh
index f532078fec3aede0a44a064a2749c27775f7475c..65545b6aa24d58c66fcf99c67a67734b59b0c1ca 100644 (file)
--- a/src/cpu/ozone/cpu_impl.hh
+++ b/src/cpu/ozone/cpu_impl.hh
@@ -30,7 +30,6 @@
  */
 
 #include "arch/alpha/osfpal.hh"
-#include "arch/faults.hh"
 #include "arch/isa_traits.hh" // For MachInst
 #include "arch/kernel_stats.hh"
 #include "arch/tlb.hh"

diff --git a/src/cpu/ozone/lsq_unit.hh b/src/cpu/ozone/lsq_unit.hh
index c812a10a200e443b0b2b50d31c2083cf7c63422f..8a8e2ccd510709a755f5e2b007347189d05cfbcf 100644 (file)
--- a/src/cpu/ozone/lsq_unit.hh
+++ b/src/cpu/ozone/lsq_unit.hh
@@ -35,13 +35,13 @@
 #include <map>
 #include <queue>
 
-#include "arch/faults.hh"
 #include "arch/types.hh"
 #include "base/hashmap.hh"
 #include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
 #include "mem/mem_interface.hh"
 //#include "mem/page_table.hh"
+#include "sim/fault_fwd.hh"
 #include "sim/sim_object.hh"
 
 class PageTable;

diff --git a/src/cpu/ozone/lsq_unit_impl.hh b/src/cpu/ozone/lsq_unit_impl.hh
index f36b870d8255632c37439dbe41882c191dda85e3..3ee96585ac856fbfc53b05576a524097c54aeb69 100644 (file)
--- a/src/cpu/ozone/lsq_unit_impl.hh
+++ b/src/cpu/ozone/lsq_unit_impl.hh
@@ -28,10 +28,10 @@
  * Authors: Kevin Lim
  */
 
-#include "arch/faults.hh"
 #include "base/str.hh"
 #include "config/the_isa.hh"
 #include "cpu/ozone/lsq_unit.hh"
+#include "sim/fault_fwd.hh"
 
 template <class Impl>
 OzoneLSQ<Impl>::StoreCompletionEvent::StoreCompletionEvent(int store_idx,

diff --git a/src/cpu/ozone/lw_lsq.hh b/src/cpu/ozone/lw_lsq.hh
index dd573e5e05ea3ab3948aa0204fab469746944ae3..809725c0d072ec1b338b047c319b80942a212e24 100644 (file)
--- a/src/cpu/ozone/lw_lsq.hh
+++ b/src/cpu/ozone/lw_lsq.hh
@@ -36,7 +36,6 @@
 #include <map>
 #include <queue>
 
-#include "arch/faults.hh"
 #include "arch/types.hh"
 #include "base/fast_alloc.hh"
 #include "base/hashmap.hh"
@@ -46,6 +45,7 @@
 #include "mem/port.hh"
 //#include "mem/page_table.hh"
 #include "sim/debug.hh"
+#include "sim/fault_fwd.hh"
 #include "sim/sim_object.hh"
 
 class MemObject;

diff --git a/src/cpu/ozone/lw_lsq_impl.hh b/src/cpu/ozone/lw_lsq_impl.hh
index 811d6656730ca44b3c5360b842805255baa45b59..d80cdcf8c0690025a0547fadd2b059b7e5f77b5a 100644 (file)
--- a/src/cpu/ozone/lw_lsq_impl.hh
+++ b/src/cpu/ozone/lw_lsq_impl.hh
@@ -28,12 +28,12 @@
  * Authors: Kevin Lim
  */
 
-#include "arch/faults.hh"
 #include "base/str.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
 #include "cpu/checker/cpu.hh"
 #include "cpu/ozone/lw_lsq.hh"
+#include "sim/fault_fwd.hh"
 
 template<class Impl>
 OzoneLWLSQ<Impl>::WritebackEvent::WritebackEvent(DynInstPtr &_inst, PacketPtr _pkt,

diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 97ce3264a2bbbf743e6b28a7dbb25e924ef843ff..945c40b7935fe73b27878fd3eea3d0cd09681069 100644 (file)
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -40,7 +40,6 @@
  * Authors: Steve Reinhardt
  */
 
-#include "arch/faults.hh"
 #include "arch/kernel_stats.hh"
 #include "arch/stacktrace.hh"
 #include "arch/tlb.hh"
@@ -74,6 +73,7 @@
 #include "params/BaseSimpleCPU.hh"
 #include "sim/byteswap.hh"
 #include "sim/debug.hh"
+#include "sim/faults.hh"
 #include "sim/full_system.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_object.hh"