Fixes to get compiling to work. This is mainly fixing up some includes; changing...
authorKevin Lim <ktlim@umich.edu>
Fri, 2 Jun 2006 22:15:20 +0000 (18:15 -0400)
committerKevin Lim <ktlim@umich.edu>
Fri, 2 Jun 2006 22:15:20 +0000 (18:15 -0400)
commit7940c10ace28d5b93a61d4d278e6647e0c497149
tree902ac028a61bbcc93485d8efc6e7ba5fe8c47d00
parentd4b73086b6b0856c28433b55c8dd5c7b56a1b6df
Fixes to get compiling to work.  This is mainly fixing up some includes; changing functions within the XCs; changing MemReqPtrs to Requests or Packets where appropriate.

Currently the O3 and Ozone CPUs do not work in the new memory system; I still need to fix up the ports to work and handle responses properly.  This check-in is so that the merge between m5 and newmem is no longer outstanding.

src/SConscript:
    Need to include FU Pool for new CPU model.  I'll try to figure out a cleaner way to handle this in the future.
src/base/traceflags.py:
    Include new traces flags, fix up merge mess up.
src/cpu/SConscript:
    Include the base_dyn_inst.cc as one of othe sources.
    Don't compile the Ozone CPU for now.
src/cpu/base.cc:
    Remove an extra } from the merge.
src/cpu/base_dyn_inst.cc:
    Fixes to make compiling work.  Don't instantiate the OzoneCPU for now.
src/cpu/base_dyn_inst.hh:
src/cpu/o3/2bit_local_pred.cc:
src/cpu/o3/alpha_cpu_builder.cc:
src/cpu/o3/alpha_cpu_impl.hh:
src/cpu/o3/alpha_dyn_inst.hh:
src/cpu/o3/alpha_params.hh:
src/cpu/o3/bpred_unit.cc:
src/cpu/o3/btb.hh:
src/cpu/o3/commit.hh:
src/cpu/o3/commit_impl.hh:
src/cpu/o3/cpu.cc:
src/cpu/o3/cpu.hh:
src/cpu/o3/fetch.hh:
src/cpu/o3/fetch_impl.hh:
src/cpu/o3/free_list.hh:
src/cpu/o3/iew.hh:
src/cpu/o3/iew_impl.hh:
src/cpu/o3/inst_queue.hh:
src/cpu/o3/inst_queue_impl.hh:
src/cpu/o3/regfile.hh:
src/cpu/o3/sat_counter.hh:
src/cpu/op_class.hh:
src/cpu/ozone/cpu.hh:
src/cpu/checker/cpu.cc:
src/cpu/checker/cpu.hh:
src/cpu/checker/exec_context.hh:
src/cpu/checker/o3_cpu_builder.cc:
src/cpu/ozone/cpu_impl.hh:
src/mem/request.hh:
src/cpu/o3/fu_pool.hh:
src/cpu/o3/lsq.hh:
src/cpu/o3/lsq_unit.hh:
src/cpu/o3/lsq_unit_impl.hh:
src/cpu/o3/thread_state.hh:
src/cpu/ozone/back_end.hh:
src/cpu/ozone/dyn_inst.cc:
src/cpu/ozone/dyn_inst.hh:
src/cpu/ozone/front_end.hh:
src/cpu/ozone/inorder_back_end.hh:
src/cpu/ozone/lw_back_end.hh:
src/cpu/ozone/lw_lsq.hh:
src/cpu/ozone/ozone_impl.hh:
src/cpu/ozone/thread_state.hh:
    Fixes to get compiling to work.
src/cpu/o3/alpha_cpu.hh:
    Fixes to get compiling to work.
    Float reg accessors have changed, as well as MemReqPtrs to RequestPtrs.
src/cpu/o3/alpha_dyn_inst_impl.hh:
    Fixes to get compiling to work.
    Pass in the packet to the completeAcc function.
    Fix up syscall function.

--HG--
rename : cpu/activity.cc => src/cpu/activity.cc
rename : cpu/activity.hh => src/cpu/activity.hh
rename : cpu/checker/cpu.cc => src/cpu/checker/cpu.cc
rename : cpu/checker/cpu.hh => src/cpu/checker/cpu.hh
rename : cpu/checker/cpu_builder.cc => src/cpu/checker/cpu_builder.cc
rename : cpu/checker/exec_context.hh => src/cpu/checker/exec_context.hh
rename : cpu/checker/o3_cpu_builder.cc => src/cpu/checker/o3_cpu_builder.cc
rename : cpu/o3/dep_graph.hh => src/cpu/o3/dep_graph.hh
rename : cpu/o3/fu_pool.cc => src/cpu/o3/fu_pool.cc
rename : cpu/o3/fu_pool.hh => src/cpu/o3/fu_pool.hh
rename : cpu/o3/lsq.cc => src/cpu/o3/lsq.cc
rename : cpu/o3/lsq.hh => src/cpu/o3/lsq.hh
rename : cpu/o3/lsq_impl.hh => src/cpu/o3/lsq_impl.hh
rename : cpu/o3/lsq_unit.cc => src/cpu/o3/lsq_unit.cc
rename : cpu/o3/lsq_unit.hh => src/cpu/o3/lsq_unit.hh
rename : cpu/o3/lsq_unit_impl.hh => src/cpu/o3/lsq_unit_impl.hh
rename : cpu/o3/scoreboard.cc => src/cpu/o3/scoreboard.cc
rename : cpu/o3/scoreboard.hh => src/cpu/o3/scoreboard.hh
rename : cpu/o3/thread_state.hh => src/cpu/o3/thread_state.hh
rename : cpu/ozone/back_end.cc => src/cpu/ozone/back_end.cc
rename : cpu/ozone/back_end.hh => src/cpu/ozone/back_end.hh
rename : cpu/ozone/back_end_impl.hh => src/cpu/ozone/back_end_impl.hh
rename : cpu/ozone/cpu_builder.cc => src/cpu/ozone/cpu_builder.cc
rename : cpu/ozone/dyn_inst.cc => src/cpu/ozone/dyn_inst.cc
rename : cpu/ozone/dyn_inst.hh => src/cpu/ozone/dyn_inst.hh
rename : cpu/ozone/dyn_inst_impl.hh => src/cpu/ozone/dyn_inst_impl.hh
rename : cpu/ozone/front_end.cc => src/cpu/ozone/front_end.cc
rename : cpu/ozone/front_end.hh => src/cpu/ozone/front_end.hh
rename : cpu/ozone/front_end_impl.hh => src/cpu/ozone/front_end_impl.hh
rename : cpu/ozone/inorder_back_end.cc => src/cpu/ozone/inorder_back_end.cc
rename : cpu/ozone/inorder_back_end.hh => src/cpu/ozone/inorder_back_end.hh
rename : cpu/ozone/inorder_back_end_impl.hh => src/cpu/ozone/inorder_back_end_impl.hh
rename : cpu/ozone/inst_queue.cc => src/cpu/ozone/inst_queue.cc
rename : cpu/ozone/inst_queue.hh => src/cpu/ozone/inst_queue.hh
rename : cpu/ozone/inst_queue_impl.hh => src/cpu/ozone/inst_queue_impl.hh
rename : cpu/ozone/lsq_unit.cc => src/cpu/ozone/lsq_unit.cc
rename : cpu/ozone/lsq_unit.hh => src/cpu/ozone/lsq_unit.hh
rename : cpu/ozone/lsq_unit_impl.hh => src/cpu/ozone/lsq_unit_impl.hh
rename : cpu/ozone/lw_back_end.cc => src/cpu/ozone/lw_back_end.cc
rename : cpu/ozone/lw_back_end.hh => src/cpu/ozone/lw_back_end.hh
rename : cpu/ozone/lw_back_end_impl.hh => src/cpu/ozone/lw_back_end_impl.hh
rename : cpu/ozone/lw_lsq.cc => src/cpu/ozone/lw_lsq.cc
rename : cpu/ozone/lw_lsq.hh => src/cpu/ozone/lw_lsq.hh
rename : cpu/ozone/lw_lsq_impl.hh => src/cpu/ozone/lw_lsq_impl.hh
rename : cpu/ozone/null_predictor.hh => src/cpu/ozone/null_predictor.hh
rename : cpu/ozone/ozone_impl.hh => src/cpu/ozone/ozone_impl.hh
rename : cpu/ozone/rename_table.cc => src/cpu/ozone/rename_table.cc
rename : cpu/ozone/rename_table.hh => src/cpu/ozone/rename_table.hh
rename : cpu/ozone/rename_table_impl.hh => src/cpu/ozone/rename_table_impl.hh
rename : cpu/ozone/simple_impl.hh => src/cpu/ozone/simple_impl.hh
rename : cpu/ozone/simple_params.hh => src/cpu/ozone/simple_params.hh
rename : cpu/ozone/thread_state.hh => src/cpu/ozone/thread_state.hh
rename : cpu/quiesce_event.cc => src/cpu/quiesce_event.cc
rename : cpu/quiesce_event.hh => src/cpu/quiesce_event.hh
rename : cpu/thread_state.hh => src/cpu/thread_state.hh
rename : python/m5/objects/FUPool.py => src/python/m5/objects/FUPool.py
rename : python/m5/objects/OzoneCPU.py => src/python/m5/objects/OzoneCPU.py
rename : python/m5/objects/SimpleOzoneCPU.py => src/python/m5/objects/SimpleOzoneCPU.py
extra : convert_revision : ca7f0fbf65ee1a70d482fb4eda9a1840c7f9b8f8
148 files changed:
cpu/activity.cc [deleted file]
cpu/activity.hh [deleted file]
cpu/checker/cpu.cc [deleted file]
cpu/checker/cpu.hh [deleted file]
cpu/checker/cpu_builder.cc [deleted file]
cpu/checker/exec_context.hh [deleted file]
cpu/checker/o3_cpu_builder.cc [deleted file]
cpu/o3/dep_graph.hh [deleted file]
cpu/o3/fu_pool.cc [deleted file]
cpu/o3/fu_pool.hh [deleted file]
cpu/o3/lsq.cc [deleted file]
cpu/o3/lsq.hh [deleted file]
cpu/o3/lsq_impl.hh [deleted file]
cpu/o3/lsq_unit.cc [deleted file]
cpu/o3/lsq_unit.hh [deleted file]
cpu/o3/lsq_unit_impl.hh [deleted file]
cpu/o3/scoreboard.cc [deleted file]
cpu/o3/scoreboard.hh [deleted file]
cpu/o3/thread_state.hh [deleted file]
cpu/ozone/back_end.cc [deleted file]
cpu/ozone/back_end.hh [deleted file]
cpu/ozone/back_end_impl.hh [deleted file]
cpu/ozone/cpu_builder.cc [deleted file]
cpu/ozone/dyn_inst.cc [deleted file]
cpu/ozone/dyn_inst.hh [deleted file]
cpu/ozone/dyn_inst_impl.hh [deleted file]
cpu/ozone/front_end.cc [deleted file]
cpu/ozone/front_end.hh [deleted file]
cpu/ozone/front_end_impl.hh [deleted file]
cpu/ozone/inorder_back_end.cc [deleted file]
cpu/ozone/inorder_back_end.hh [deleted file]
cpu/ozone/inorder_back_end_impl.hh [deleted file]
cpu/ozone/inst_queue.cc [deleted file]
cpu/ozone/inst_queue.hh [deleted file]
cpu/ozone/inst_queue_impl.hh [deleted file]
cpu/ozone/lsq_unit.cc [deleted file]
cpu/ozone/lsq_unit.hh [deleted file]
cpu/ozone/lsq_unit_impl.hh [deleted file]
cpu/ozone/lw_back_end.cc [deleted file]
cpu/ozone/lw_back_end.hh [deleted file]
cpu/ozone/lw_back_end_impl.hh [deleted file]
cpu/ozone/lw_lsq.cc [deleted file]
cpu/ozone/lw_lsq.hh [deleted file]
cpu/ozone/lw_lsq_impl.hh [deleted file]
cpu/ozone/null_predictor.hh [deleted file]
cpu/ozone/ozone_impl.hh [deleted file]
cpu/ozone/rename_table.cc [deleted file]
cpu/ozone/rename_table.hh [deleted file]
cpu/ozone/rename_table_impl.hh [deleted file]
cpu/ozone/simple_impl.hh [deleted file]
cpu/ozone/simple_params.hh [deleted file]
cpu/ozone/thread_state.hh [deleted file]
cpu/quiesce_event.cc [deleted file]
cpu/quiesce_event.hh [deleted file]
cpu/thread_state.hh [deleted file]
python/m5/objects/FUPool.py [deleted file]
python/m5/objects/OzoneCPU.py [deleted file]
python/m5/objects/SimpleOzoneCPU.py [deleted file]
src/SConscript
src/base/traceflags.py
src/cpu/SConscript
src/cpu/activity.cc [new file with mode: 0644]
src/cpu/activity.hh [new file with mode: 0644]
src/cpu/base.cc
src/cpu/base_dyn_inst.cc
src/cpu/base_dyn_inst.hh
src/cpu/checker/cpu.cc [new file with mode: 0644]
src/cpu/checker/cpu.hh [new file with mode: 0644]
src/cpu/checker/cpu_builder.cc [new file with mode: 0644]
src/cpu/checker/exec_context.hh [new file with mode: 0644]
src/cpu/checker/o3_cpu_builder.cc [new file with mode: 0644]
src/cpu/o3/2bit_local_pred.cc
src/cpu/o3/alpha_cpu.hh
src/cpu/o3/alpha_cpu_builder.cc
src/cpu/o3/alpha_cpu_impl.hh
src/cpu/o3/alpha_dyn_inst.hh
src/cpu/o3/alpha_dyn_inst_impl.hh
src/cpu/o3/alpha_params.hh
src/cpu/o3/bpred_unit.cc
src/cpu/o3/btb.hh
src/cpu/o3/commit.hh
src/cpu/o3/commit_impl.hh
src/cpu/o3/cpu.cc
src/cpu/o3/cpu.hh
src/cpu/o3/dep_graph.hh [new file with mode: 0644]
src/cpu/o3/fetch.hh
src/cpu/o3/fetch_impl.hh
src/cpu/o3/free_list.hh
src/cpu/o3/fu_pool.cc [new file with mode: 0644]
src/cpu/o3/fu_pool.hh [new file with mode: 0644]
src/cpu/o3/iew.hh
src/cpu/o3/iew_impl.hh
src/cpu/o3/inst_queue.hh
src/cpu/o3/inst_queue_impl.hh
src/cpu/o3/lsq.cc [new file with mode: 0644]
src/cpu/o3/lsq.hh [new file with mode: 0644]
src/cpu/o3/lsq_impl.hh [new file with mode: 0644]
src/cpu/o3/lsq_unit.cc [new file with mode: 0644]
src/cpu/o3/lsq_unit.hh [new file with mode: 0644]
src/cpu/o3/lsq_unit_impl.hh [new file with mode: 0644]
src/cpu/o3/regfile.hh
src/cpu/o3/sat_counter.hh
src/cpu/o3/scoreboard.cc [new file with mode: 0644]
src/cpu/o3/scoreboard.hh [new file with mode: 0644]
src/cpu/o3/thread_state.hh [new file with mode: 0644]
src/cpu/op_class.hh
src/cpu/ozone/back_end.cc [new file with mode: 0644]
src/cpu/ozone/back_end.hh [new file with mode: 0644]
src/cpu/ozone/back_end_impl.hh [new file with mode: 0644]
src/cpu/ozone/cpu.hh
src/cpu/ozone/cpu_builder.cc [new file with mode: 0644]
src/cpu/ozone/cpu_impl.hh
src/cpu/ozone/dyn_inst.cc [new file with mode: 0644]
src/cpu/ozone/dyn_inst.hh [new file with mode: 0644]
src/cpu/ozone/dyn_inst_impl.hh [new file with mode: 0644]
src/cpu/ozone/front_end.cc [new file with mode: 0644]
src/cpu/ozone/front_end.hh [new file with mode: 0644]
src/cpu/ozone/front_end_impl.hh [new file with mode: 0644]
src/cpu/ozone/inorder_back_end.cc [new file with mode: 0644]
src/cpu/ozone/inorder_back_end.hh [new file with mode: 0644]
src/cpu/ozone/inorder_back_end_impl.hh [new file with mode: 0644]
src/cpu/ozone/inst_queue.cc [new file with mode: 0644]
src/cpu/ozone/inst_queue.hh [new file with mode: 0644]
src/cpu/ozone/inst_queue_impl.hh [new file with mode: 0644]
src/cpu/ozone/lsq_unit.cc [new file with mode: 0644]
src/cpu/ozone/lsq_unit.hh [new file with mode: 0644]
src/cpu/ozone/lsq_unit_impl.hh [new file with mode: 0644]
src/cpu/ozone/lw_back_end.cc [new file with mode: 0644]
src/cpu/ozone/lw_back_end.hh [new file with mode: 0644]
src/cpu/ozone/lw_back_end_impl.hh [new file with mode: 0644]
src/cpu/ozone/lw_lsq.cc [new file with mode: 0644]
src/cpu/ozone/lw_lsq.hh [new file with mode: 0644]
src/cpu/ozone/lw_lsq_impl.hh [new file with mode: 0644]
src/cpu/ozone/null_predictor.hh [new file with mode: 0644]
src/cpu/ozone/ozone_impl.hh [new file with mode: 0644]
src/cpu/ozone/rename_table.cc [new file with mode: 0644]
src/cpu/ozone/rename_table.hh [new file with mode: 0644]
src/cpu/ozone/rename_table_impl.hh [new file with mode: 0644]
src/cpu/ozone/simple_impl.hh [new file with mode: 0644]
src/cpu/ozone/simple_params.hh [new file with mode: 0644]
src/cpu/ozone/thread_state.hh [new file with mode: 0644]
src/cpu/quiesce_event.cc [new file with mode: 0644]
src/cpu/quiesce_event.hh [new file with mode: 0644]
src/cpu/thread_state.hh [new file with mode: 0644]
src/mem/request.hh
src/python/m5/objects/FUPool.py [new file with mode: 0644]
src/python/m5/objects/OzoneCPU.py [new file with mode: 0644]
src/python/m5/objects/SimpleOzoneCPU.py [new file with mode: 0644]