Merge yet again with the main repository.
authorGabe Black <gblack@eecs.umich.edu>
Mon, 16 Jan 2012 12:27:10 +0000 (04:27 -0800)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 16 Jan 2012 12:27:10 +0000 (04:27 -0800)
commitda2a4acc26ba264c3c4a12495776fd6a1c4fb133
treef142100388b9d1403492c97b0d323728ce18ef8a
parent241cc0c8402f1b9f2ec20d1cc152d96930959b2a
parenta7394ad6807bd5e85f680184bf308673ca00534a
Merge yet again with the main repository.
16 files changed:
src/arch/arm/isa/insts/m5ops.isa
src/arch/mips/faults.cc
src/arch/mips/faults.hh
src/arch/mips/isa/decoder.isa
src/arch/mips/tlb.cc
src/cpu/base.hh
src/cpu/o3/commit_impl.hh
src/cpu/o3/decode_impl.hh
src/cpu/o3/rename_impl.hh
src/cpu/pc_event.cc
src/dev/io_device.cc
src/mem/SConscript
src/sim/System.py
src/sim/pseudo_inst.cc
src/sim/system.cc
src/sim/system.hh