Merge with head, hopefully the last time for this batch.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 1 Feb 2012 06:40:08 +0000 (22:40 -0800)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 1 Feb 2012 06:40:08 +0000 (22:40 -0800)
commitea8b347dc5d375572d8d19770024ec8be5fd5017
tree56bb75b1f071a749b7e90218d0d6b0e9265657bb
parente88165a431a90cf7e33e205794caed898ca6fcb1
parent7d4f18770073d968c70cd3ffcdd117f50a6056a2
Merge ... head, hopefully the last time for this batch.
56 files changed:
SConstruct
src/arch/alpha/tlb.cc
src/arch/arm/insts/static_inst.hh
src/arch/arm/isa/formats/m5ops.isa
src/arch/arm/isa/insts/m5ops.isa
src/arch/arm/isa/insts/misc.isa
src/arch/arm/tlb.cc
src/arch/arm/tlb.hh
src/arch/arm/utility.cc
src/arch/mips/faults.cc
src/arch/mips/faults.hh
src/cpu/BaseCPU.py
src/cpu/SConscript
src/cpu/base.cc
src/cpu/base.hh
src/cpu/base_dyn_inst.hh
src/cpu/checker/cpu.cc
src/cpu/checker/cpu.hh
src/cpu/checker/cpu_impl.hh
src/cpu/checker/thread_context.hh
src/cpu/dummy_checker_builder.cc
src/cpu/inorder/cpu.cc
src/cpu/inorder/cpu.hh
src/cpu/inorder/resources/cache_unit.hh
src/cpu/inorder/thread_context.cc
src/cpu/o3/O3CPU.py
src/cpu/o3/checker_builder.cc
src/cpu/o3/commit.hh
src/cpu/o3/commit_impl.hh
src/cpu/o3/cpu.cc
src/cpu/o3/cpu.hh
src/cpu/o3/decode_impl.hh
src/cpu/o3/dyn_inst_impl.hh
src/cpu/o3/fetch_impl.hh
src/cpu/o3/iew.hh
src/cpu/o3/lsq.hh
src/cpu/o3/lsq_unit.hh
src/cpu/o3/thread_context.hh
src/cpu/o3/thread_context_impl.hh
src/cpu/simple/atomic.cc
src/cpu/simple/base.cc
src/cpu/simple/base.hh
src/cpu/simple/timing.cc
src/cpu/simple_thread.cc
src/cpu/simple_thread.hh
src/cpu/thread_context.hh
src/cpu/thread_state.hh
src/dev/pcidev.cc
src/mem/cache/base.cc
src/mem/cache/base.hh
src/sim/process.cc
src/sim/process.hh
src/sim/process_impl.hh
src/sim/pseudo_inst.cc
src/sim/pseudo_inst.hh
src/sim/syscall_emul.hh