diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2012-02-07 04:43:21 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2012-02-07 04:43:21 -0800 |
| commit | f2b46fdb850dca0e2ac3a97343292a7d92ff980e (patch) | |
| tree | 17be8a7223e4cef370e41934aeeaef9719ec7a9d /src/cpu/ozone | |
| parent | 214d7af2fe0e8a8c9eec4c07343d32d4fb5f84b2 (diff) | |
| download | gem5-f2b46fdb850dca0e2ac3a97343292a7d92ff980e.tar.xz | |
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.
Diffstat (limited to 'src/cpu/ozone')
| -rw-r--r-- | src/cpu/ozone/cpu_impl.hh | 1 | ||||
| -rw-r--r-- | src/cpu/ozone/lsq_unit.hh | 2 | ||||
| -rw-r--r-- | src/cpu/ozone/lsq_unit_impl.hh | 2 | ||||
| -rw-r--r-- | src/cpu/ozone/lw_lsq.hh | 2 | ||||
| -rw-r--r-- | src/cpu/ozone/lw_lsq_impl.hh | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh index f532078fe..65545b6aa 100644 --- 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 c812a10a2..8a8e2ccd5 100644 --- 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 f36b870d8..3ee96585a 100644 --- 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 dd573e5e0..809725c0d 100644 --- 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 811d66567..d80cdcf8c 100644 --- 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, |