diff options
Diffstat (limited to 'src/cpu/inorder')
| -rw-r--r-- | src/cpu/inorder/comm.hh | 2 | ||||
| -rw-r--r-- | src/cpu/inorder/inorder_trace.hh | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/cpu/inorder/comm.hh b/src/cpu/inorder/comm.hh index 1a7fc9050..f1b3cacac 100644 --- a/src/cpu/inorder/comm.hh +++ b/src/cpu/inorder/comm.hh @@ -36,10 +36,10 @@ #include "arch/faults.hh" #include "arch/isa_traits.hh" +#include "base/types.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inst_seq.hh" -#include "base/types.hh" /** Struct that defines the information passed from in between stages */ /** This information mainly goes forward through the pipeline. */ diff --git a/src/cpu/inorder/inorder_trace.hh b/src/cpu/inorder/inorder_trace.hh index eb1287370..ccc868f15 100644 --- a/src/cpu/inorder/inorder_trace.hh +++ b/src/cpu/inorder/inorder_trace.hh @@ -29,19 +29,18 @@ * Authors: Korey Sewell */ -#ifndef __INORDERTRACE_HH__ -#define __INORDERTRACE_HH__ +#ifndef __CPU_INORDER_INORDER_TRACE_HH__ +#define __CPU_INORDER_INORDER_TRACE_HH__ #include "base/trace.hh" -#include "cpu/static_inst.hh" #include "base/types.hh" -#include "sim/insttracer.hh" -#include "params/InOrderTrace.hh" #include "cpu/exetrace.hh" +#include "cpu/static_inst.hh" +#include "params/InOrderTrace.hh" +#include "sim/insttracer.hh" class ThreadContext; - namespace Trace { class InOrderTraceRecord : public ExeTracerRecord @@ -95,4 +94,4 @@ class InOrderTrace : public InstTracer /* namespace Trace */ } -#endif // __EXETRACE_HH__ +#endif // __CPU_INORDER_INORDER_TRACE_HH__ |