From 39a055645f77e0fa7bf49406635dba6bd65e361f Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Fri, 15 Apr 2011 10:44:06 -0700 Subject: includes: sort all includes --- src/cpu/inorder/resources/agen_unit.hh | 8 ++++---- src/cpu/inorder/resources/bpred_unit.hh | 2 +- src/cpu/inorder/resources/branch_predictor.hh | 8 ++++---- src/cpu/inorder/resources/cache_unit.cc | 6 +++--- src/cpu/inorder/resources/cache_unit.hh | 2 +- src/cpu/inorder/resources/decode_unit.hh | 6 +++--- src/cpu/inorder/resources/execution_unit.cc | 5 +++-- src/cpu/inorder/resources/execution_unit.hh | 6 +++--- src/cpu/inorder/resources/fetch_seq_unit.hh | 6 +++--- src/cpu/inorder/resources/fetch_unit.cc | 6 +++--- src/cpu/inorder/resources/fetch_unit.hh | 4 ++-- src/cpu/inorder/resources/graduation_unit.hh | 6 +++--- src/cpu/inorder/resources/inst_buffer.cc | 4 ++-- src/cpu/inorder/resources/inst_buffer.hh | 6 +++--- src/cpu/inorder/resources/mem_dep_unit.hh | 6 +++--- src/cpu/inorder/resources/mult_div_unit.cc | 5 +++-- src/cpu/inorder/resources/mult_div_unit.hh | 8 ++++---- src/cpu/inorder/resources/resource_list.hh | 16 ++++++++-------- src/cpu/inorder/resources/tlb_unit.cc | 6 +++--- src/cpu/inorder/resources/tlb_unit.hh | 4 ++-- src/cpu/inorder/resources/use_def.cc | 4 ++-- src/cpu/inorder/resources/use_def.hh | 6 +++--- 22 files changed, 66 insertions(+), 64 deletions(-) (limited to 'src/cpu/inorder/resources') diff --git a/src/cpu/inorder/resources/agen_unit.hh b/src/cpu/inorder/resources/agen_unit.hh index 7c9c5fd89..f208ec680 100644 --- a/src/cpu/inorder/resources/agen_unit.hh +++ b/src/cpu/inorder/resources/agen_unit.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_AGEN_UNIT_HH__ #define __CPU_INORDER_AGEN_UNIT_HH__ -#include #include #include +#include -#include "cpu/inorder/resource.hh" -#include "cpu/inorder/inorder_dyn_inst.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/params.hh" +#include "cpu/inorder/pipeline_traits.hh" +#include "cpu/inorder/resource.hh" class AGENUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/bpred_unit.hh b/src/cpu/inorder/resources/bpred_unit.hh index 3b1c0f4ef..33ca4a0c6 100644 --- a/src/cpu/inorder/resources/bpred_unit.hh +++ b/src/cpu/inorder/resources/bpred_unit.hh @@ -36,7 +36,6 @@ #include "arch/isa_traits.hh" #include "base/statistics.hh" -#include "cpu/inst_seq.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource.hh" @@ -44,6 +43,7 @@ #include "cpu/pred/btb.hh" #include "cpu/pred/ras.hh" #include "cpu/pred/tournament.hh" +#include "cpu/inst_seq.hh" #include "params/InOrderCPU.hh" /** diff --git a/src/cpu/inorder/resources/branch_predictor.hh b/src/cpu/inorder/resources/branch_predictor.hh index 00915fd0d..72b216806 100644 --- a/src/cpu/inorder/resources/branch_predictor.hh +++ b/src/cpu/inorder/resources/branch_predictor.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_BRANCH_PREDICTOR_HH__ #define __CPU_INORDER_BRANCH_PREDICTOR_HH__ -#include #include #include +#include -#include "cpu/inorder/resource.hh" -#include "cpu/inorder/inorder_dyn_inst.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resources/bpred_unit.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/inorder_dyn_inst.hh" +#include "cpu/inorder/pipeline_traits.hh" +#include "cpu/inorder/resource.hh" class BranchPredictor : public Resource { public: diff --git a/src/cpu/inorder/resources/cache_unit.cc b/src/cpu/inorder/resources/cache_unit.cc index e98b27d62..ce4c538da 100644 --- a/src/cpu/inorder/resources/cache_unit.cc +++ b/src/cpu/inorder/resources/cache_unit.cc @@ -29,17 +29,17 @@ * */ -#include #include +#include #include "arch/isa_traits.hh" #include "arch/locked_mem.hh" -#include "arch/utility.hh" #include "arch/predecoder.hh" +#include "arch/utility.hh" #include "config/the_isa.hh" #include "cpu/inorder/resources/cache_unit.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource_pool.hh" #include "mem/request.hh" diff --git a/src/cpu/inorder/resources/cache_unit.hh b/src/cpu/inorder/resources/cache_unit.hh index 1aab099e9..c4a5dc0bd 100644 --- a/src/cpu/inorder/resources/cache_unit.hh +++ b/src/cpu/inorder/resources/cache_unit.hh @@ -32,9 +32,9 @@ #ifndef __CPU_INORDER_CACHE_UNIT_HH__ #define __CPU_INORDER_CACHE_UNIT_HH__ -#include #include #include +#include #include "arch/predecoder.hh" #include "arch/tlb.hh" diff --git a/src/cpu/inorder/resources/decode_unit.hh b/src/cpu/inorder/resources/decode_unit.hh index 1c4dc0523..3742af3e2 100644 --- a/src/cpu/inorder/resources/decode_unit.hh +++ b/src/cpu/inorder/resources/decode_unit.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_DECODE_UNIT_HH__ #define __CPU_INORDER_DECODE_UNIT_HH__ -#include #include #include +#include -#include "cpu/inorder/resource.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" #include "cpu/inorder/reg_dep_map.hh" +#include "cpu/inorder/resource.hh" class DecodeUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/execution_unit.cc b/src/cpu/inorder/resources/execution_unit.cc index 311add9f8..2ec340749 100644 --- a/src/cpu/inorder/resources/execution_unit.cc +++ b/src/cpu/inorder/resources/execution_unit.cc @@ -29,11 +29,12 @@ * */ -#include #include +#include + #include "cpu/inorder/resources/execution_unit.hh" -#include "cpu/inorder/resource_pool.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource_pool.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/resources/execution_unit.hh b/src/cpu/inorder/resources/execution_unit.hh index b03a6655e..ed645ec3b 100644 --- a/src/cpu/inorder/resources/execution_unit.hh +++ b/src/cpu/inorder/resources/execution_unit.hh @@ -32,14 +32,14 @@ #ifndef __CPU_INORDER_EXECUTION_UNIT_HH__ #define __CPU_INORDER_EXECUTION_UNIT_HH__ -#include #include #include +#include -#include "cpu/func_unit.hh" #include "cpu/inorder/first_stage.hh" -#include "cpu/inorder/resource.hh" #include "cpu/inorder/inorder_dyn_inst.hh" +#include "cpu/inorder/resource.hh" +#include "cpu/func_unit.hh" class ExecutionUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/fetch_seq_unit.hh b/src/cpu/inorder/resources/fetch_seq_unit.hh index a258dc0e5..be3c59a13 100644 --- a/src/cpu/inorder/resources/fetch_seq_unit.hh +++ b/src/cpu/inorder/resources/fetch_seq_unit.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_FETCH_SEQ_UNIT_HH__ #define __CPU_INORDER_FETCH_SEQ_UNIT_HH__ -#include #include #include +#include #include "config/the_isa.hh" -#include "cpu/inorder/resource.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource.hh" class FetchSeqUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/fetch_unit.cc b/src/cpu/inorder/resources/fetch_unit.cc index d6038415e..899fa8c08 100644 --- a/src/cpu/inorder/resources/fetch_unit.cc +++ b/src/cpu/inorder/resources/fetch_unit.cc @@ -29,18 +29,18 @@ * */ -#include #include +#include #include "arch/isa_traits.hh" #include "arch/locked_mem.hh" -#include "arch/utility.hh" #include "arch/predecoder.hh" +#include "arch/utility.hh" #include "config/the_isa.hh" #include "cpu/inorder/resources/cache_unit.hh" #include "cpu/inorder/resources/fetch_unit.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource_pool.hh" #include "mem/request.hh" diff --git a/src/cpu/inorder/resources/fetch_unit.hh b/src/cpu/inorder/resources/fetch_unit.hh index fa133b9eb..3075e726d 100644 --- a/src/cpu/inorder/resources/fetch_unit.hh +++ b/src/cpu/inorder/resources/fetch_unit.hh @@ -32,17 +32,17 @@ #ifndef __CPU_INORDER_FETCH_UNIT_HH__ #define __CPU_INORDER_FETCH_UNIT_HH__ -#include #include #include +#include #include "arch/predecoder.hh" #include "arch/tlb.hh" #include "config/the_isa.hh" +#include "cpu/inorder/resources/cache_unit.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource.hh" -#include "cpu/inorder/resources/cache_unit.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "mem/port.hh" diff --git a/src/cpu/inorder/resources/graduation_unit.hh b/src/cpu/inorder/resources/graduation_unit.hh index 59631bfcb..043e375e7 100644 --- a/src/cpu/inorder/resources/graduation_unit.hh +++ b/src/cpu/inorder/resources/graduation_unit.hh @@ -32,14 +32,14 @@ #ifndef __CPU_INORDER_GRAD_UNIT_HH__ #define __CPU_INORDER_GRAD_UNIT_HH__ -#include #include #include +#include -#include "cpu/inorder/resource.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource.hh" class GraduationUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/inst_buffer.cc b/src/cpu/inorder/resources/inst_buffer.cc index 46f5cce72..e0405879b 100644 --- a/src/cpu/inorder/resources/inst_buffer.cc +++ b/src/cpu/inorder/resources/inst_buffer.cc @@ -29,14 +29,14 @@ * */ -#include #include +#include #include "arch/isa_traits.hh" #include "config/the_isa.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resources/inst_buffer.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/pipeline_traits.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resources/inst_buffer.hh b/src/cpu/inorder/resources/inst_buffer.hh index fcbdc20df..d0047e013 100644 --- a/src/cpu/inorder/resources/inst_buffer.hh +++ b/src/cpu/inorder/resources/inst_buffer.hh @@ -32,14 +32,14 @@ #ifndef __CPU_INORDER_INST_BUFF_UNIT_HH__ #define __CPU_INORDER_INST_BUFF_UNIT_HH__ -#include #include #include +#include -#include "cpu/inorder/resource.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource.hh" class InstBuffer : public Resource { public: diff --git a/src/cpu/inorder/resources/mem_dep_unit.hh b/src/cpu/inorder/resources/mem_dep_unit.hh index 018593eaf..387bee0b9 100644 --- a/src/cpu/inorder/resources/mem_dep_unit.hh +++ b/src/cpu/inorder/resources/mem_dep_unit.hh @@ -32,14 +32,14 @@ #ifndef __CPU_INORDER_MEM_DEP_UNIT_HH__ #define __CPU_INORDER_MEM_DEP_UNIT_HH__ -#include #include #include +#include -#include "cpu/inorder/resource.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource.hh" class MemDepUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/mult_div_unit.cc b/src/cpu/inorder/resources/mult_div_unit.cc index ad8b2b47b..8fbfc231e 100644 --- a/src/cpu/inorder/resources/mult_div_unit.cc +++ b/src/cpu/inorder/resources/mult_div_unit.cc @@ -29,11 +29,12 @@ * */ -#include #include +#include + #include "cpu/inorder/resources/mult_div_unit.hh" -#include "cpu/inorder/resource_pool.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource_pool.hh" #include "cpu/op_class.hh" using namespace std; diff --git a/src/cpu/inorder/resources/mult_div_unit.hh b/src/cpu/inorder/resources/mult_div_unit.hh index d243eebea..753bc64a6 100644 --- a/src/cpu/inorder/resources/mult_div_unit.hh +++ b/src/cpu/inorder/resources/mult_div_unit.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_MULT_DIV_UNIT_HH__ #define __CPU_INORDER_MULT_DIV_UNIT_HH__ -#include #include #include +#include -#include "cpu/func_unit.hh" -#include "cpu/op_class.hh" #include "cpu/inorder/first_stage.hh" -#include "cpu/inorder/resource.hh" #include "cpu/inorder/inorder_dyn_inst.hh" +#include "cpu/inorder/resource.hh" +#include "cpu/func_unit.hh" +#include "cpu/op_class.hh" class MDUEvent; diff --git a/src/cpu/inorder/resources/resource_list.hh b/src/cpu/inorder/resources/resource_list.hh index 5568ad470..ae6b4ecaf 100644 --- a/src/cpu/inorder/resources/resource_list.hh +++ b/src/cpu/inorder/resources/resource_list.hh @@ -32,17 +32,17 @@ #ifndef CPU_INORDER_RESOURCE_LIST_HH #define CPU_INORDER_RESOURCE_LIST_HH +#include "cpu/inorder/resources/agen_unit.hh" +#include "cpu/inorder/resources/branch_predictor.hh" #include "cpu/inorder/resources/cache_unit.hh" -#include "cpu/inorder/resources/fetch_unit.hh" -#include "cpu/inorder/resources/execution_unit.hh" -#include "cpu/inorder/resources/use_def.hh" -#include "cpu/inorder/resources/inst_buffer.hh" #include "cpu/inorder/resources/decode_unit.hh" -#include "cpu/inorder/resources/graduation_unit.hh" -#include "cpu/inorder/resources/tlb_unit.hh" +#include "cpu/inorder/resources/execution_unit.hh" #include "cpu/inorder/resources/fetch_seq_unit.hh" -#include "cpu/inorder/resources/branch_predictor.hh" -#include "cpu/inorder/resources/agen_unit.hh" +#include "cpu/inorder/resources/fetch_unit.hh" +#include "cpu/inorder/resources/graduation_unit.hh" +#include "cpu/inorder/resources/inst_buffer.hh" #include "cpu/inorder/resources/mult_div_unit.hh" +#include "cpu/inorder/resources/tlb_unit.hh" +#include "cpu/inorder/resources/use_def.hh" #endif diff --git a/src/cpu/inorder/resources/tlb_unit.cc b/src/cpu/inorder/resources/tlb_unit.cc index 9a0c9fe32..c07f6ae5f 100644 --- a/src/cpu/inorder/resources/tlb_unit.cc +++ b/src/cpu/inorder/resources/tlb_unit.cc @@ -29,15 +29,15 @@ * */ -#include #include +#include #include "arch/isa_traits.hh" #include "config/the_isa.hh" -#include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/first_stage.hh" #include "cpu/inorder/resources/tlb_unit.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/first_stage.hh" +#include "cpu/inorder/pipeline_traits.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resources/tlb_unit.hh b/src/cpu/inorder/resources/tlb_unit.hh index 904ac3eba..caccb5a9f 100644 --- a/src/cpu/inorder/resources/tlb_unit.hh +++ b/src/cpu/inorder/resources/tlb_unit.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_TLB_UNIT_HH__ #define __CPU_INORDER_TLB_UNIT_HH__ -#include #include #include +#include #include "config/the_isa.hh" #include "cpu/inorder/resources/inst_buffer.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" class TLBUnit : public Resource { diff --git a/src/cpu/inorder/resources/use_def.cc b/src/cpu/inorder/resources/use_def.cc index c687024ce..8a00ab704 100644 --- a/src/cpu/inorder/resources/use_def.cc +++ b/src/cpu/inorder/resources/use_def.cc @@ -29,14 +29,14 @@ * */ -#include #include +#include #include "arch/isa_traits.hh" #include "config/the_isa.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resources/use_def.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/pipeline_traits.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resources/use_def.hh b/src/cpu/inorder/resources/use_def.hh index 21770cec6..bd423d01a 100644 --- a/src/cpu/inorder/resources/use_def.hh +++ b/src/cpu/inorder/resources/use_def.hh @@ -32,16 +32,16 @@ #ifndef __CPU_INORDER_USE_DEF_UNIT_HH__ #define __CPU_INORDER_USE_DEF_UNIT_HH__ -#include #include #include +#include -#include "cpu/func_unit.hh" #include "cpu/inorder/first_stage.hh" -#include "cpu/inorder/resource.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/reg_dep_map.hh" +#include "cpu/inorder/resource.hh" +#include "cpu/func_unit.hh" class UseDefUnit : public Resource { public: -- cgit v1.2.3