diff options
author | Kevin Lim <ktlim@umich.edu> | 2005-02-25 18:00:49 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2005-02-25 18:00:49 -0500 |
commit | 5c4714c1a91680a0253f866958a9db80cd8decb2 (patch) | |
tree | 6c73396b0418a7d8576c289e31839e8e664bbca0 /SConscript | |
parent | e8a564b0fdd8c5b6ae8f73613e3ad25005556ec5 (diff) | |
download | gem5-5c4714c1a91680a0253f866958a9db80cd8decb2.tar.xz |
Initial light-weight OoO CPU checkin, along with gcc-3.4 fixes.
SConscript:
Include new files.
arch/alpha/isa_desc:
Make the eaCompPtr and memAccPtr non-const so that execute() can be called on them.
arch/alpha/isa_traits.hh:
Add enum for total number of data registers.
arch/isa_parser.py:
base/traceflags.py:
Include new light-weight OoO CPU model.
cpu/base_dyn_inst.cc:
cpu/base_dyn_inst.hh:
Changes to abstract more away from the base dyn inst class.
cpu/beta_cpu/2bit_local_pred.cc:
cpu/beta_cpu/2bit_local_pred.hh:
cpu/beta_cpu/tournament_pred.cc:
cpu/beta_cpu/tournament_pred.hh:
Remove redundant SatCounter class.
cpu/beta_cpu/alpha_dyn_inst.cc:
cpu/beta_cpu/alpha_full_cpu.cc:
cpu/beta_cpu/alpha_full_cpu.hh:
cpu/beta_cpu/bpred_unit.cc:
cpu/beta_cpu/inst_queue.cc:
cpu/beta_cpu/mem_dep_unit.cc:
cpu/beta_cpu/ras.cc:
cpu/beta_cpu/rename_map.cc:
cpu/beta_cpu/rename_map.hh:
cpu/beta_cpu/rob.cc:
Fix for gcc-3.4
cpu/beta_cpu/alpha_dyn_inst.hh:
cpu/beta_cpu/alpha_dyn_inst_impl.hh:
Fixes for gcc-3.4.
Include more variables and functions that are specific to AlphaDynInst which were once in BaseDynInst.
cpu/beta_cpu/alpha_full_cpu_builder.cc:
Make params match the current params inherited from BaseCPU.
cpu/beta_cpu/alpha_full_cpu_impl.hh:
Fixes for gcc-3.4
cpu/beta_cpu/full_cpu.cc:
Use new params pointer in BaseCPU.
Fix for gcc-3.4.
cpu/beta_cpu/full_cpu.hh:
Use new params class from BaseCPU.
cpu/beta_cpu/iew_impl.hh:
Remove unused function.
cpu/simple_cpu/simple_cpu.cc:
Remove unused global variable.
cpu/static_inst.hh:
Include OoODynInst for new lightweight OoO CPU
--HG--
extra : convert_revision : 34d9f2e64ca0313377391e0d059bf09c040286fa
Diffstat (limited to 'SConscript')
-rw-r--r-- | SConscript | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/SConscript b/SConscript index 4e4cb8727..94e788ce9 100644 --- a/SConscript +++ b/SConscript @@ -51,6 +51,7 @@ base_sources = Split(''' arch/alpha/full_cpu_exec.cc arch/alpha/faults.cc arch/alpha/isa_traits.cc + arch/alpha/ooo_cpu_exec.cc base/circlebuf.cc base/copyright.cc @@ -114,6 +115,7 @@ base_sources = Split(''' cpu/beta_cpu/rename.cc cpu/beta_cpu/rename_map.cc cpu/beta_cpu/rob.cc + cpu/beta_cpu/sat_counter.cc cpu/beta_cpu/store_set.cc cpu/beta_cpu/tournament_pred.cc cpu/fast_cpu/fast_cpu.cc @@ -136,30 +138,34 @@ base_sources = Split(''' cpu/full_cpu/ls_queue.cc cpu/full_cpu/machine_queue.cc cpu/full_cpu/pc_sample_profile.cc - cpu/full_cpu/pipetrace.cc - cpu/full_cpu/readyq.cc - cpu/full_cpu/reg_info.cc - cpu/full_cpu/rob_station.cc - cpu/full_cpu/spec_memory.cc - cpu/full_cpu/spec_state.cc - cpu/full_cpu/storebuffer.cc - cpu/full_cpu/writeback.cc - cpu/full_cpu/iq/iq_station.cc - cpu/full_cpu/iq/iqueue.cc - cpu/full_cpu/iq/segmented/chain_info.cc - cpu/full_cpu/iq/segmented/chain_wire.cc - cpu/full_cpu/iq/segmented/iq_seg.cc - cpu/full_cpu/iq/segmented/iq_segmented.cc - cpu/full_cpu/iq/segmented/seg_chain.cc - cpu/full_cpu/iq/seznec/iq_seznec.cc - cpu/full_cpu/iq/standard/iq_standard.cc - cpu/sampling_cpu/sampling_cpu.cc - cpu/simple_cpu/simple_cpu.cc - cpu/inorder_cpu/inorder_cpu.cc - cpu/trace/reader/mem_trace_reader.cc - cpu/trace/reader/ibm_reader.cc - cpu/trace/reader/itx_reader.cc - cpu/trace/reader/m5_reader.cc + cpu/full_cpu/pipetrace.cc + cpu/full_cpu/readyq.cc + cpu/full_cpu/reg_info.cc + cpu/full_cpu/rob_station.cc + cpu/full_cpu/spec_memory.cc + cpu/full_cpu/spec_state.cc + cpu/full_cpu/storebuffer.cc + cpu/full_cpu/writeback.cc + cpu/full_cpu/iq/iq_station.cc + cpu/full_cpu/iq/iqueue.cc + cpu/full_cpu/iq/segmented/chain_info.cc + cpu/full_cpu/iq/segmented/chain_wire.cc + cpu/full_cpu/iq/segmented/iq_seg.cc + cpu/full_cpu/iq/segmented/iq_segmented.cc + cpu/full_cpu/iq/segmented/seg_chain.cc + cpu/full_cpu/iq/seznec/iq_seznec.cc + cpu/full_cpu/iq/standard/iq_standard.cc + cpu/inorder_cpu/inorder_cpu.cc + cpu/ooo_cpu/ea_list.cc + cpu/ooo_cpu/ooo_cpu.cc + cpu/ooo_cpu/ooo_dyn_inst.cc + cpu/ooo_cpu/ooo_sim_obj.cc + cpu/sampling_cpu/sampling_cpu.cc + cpu/simple_cpu/simple_cpu.cc + cpu/trace/reader/mem_trace_reader.cc + cpu/trace/reader/ibm_reader.cc + cpu/trace/reader/itx_reader.cc + cpu/trace/reader/m5_reader.cc mem/base_hier.cc mem/base_mem.cc @@ -390,7 +396,8 @@ env.Command(Split('''arch/alpha/decoder.cc arch/alpha/fast_cpu_exec.cc arch/alpha/simple_cpu_exec.cc arch/alpha/inorder_cpu_exec.cc - arch/alpha/full_cpu_exec.cc'''), + arch/alpha/full_cpu_exec.cc + arch/alpha/ooo_cpu_exec.cc'''), Split('''arch/alpha/isa_desc arch/isa_parser.py'''), '$SRCDIR/arch/isa_parser.py $SOURCE $TARGET.dir arch/alpha') |