Merge zizzer:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Wed, 3 Jan 2007 05:52:30 +0000 (00:52 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 3 Jan 2007 05:52:30 +0000 (00:52 -0500)
commit8840ebcb00f3988c781063e572b6df5742968f95
treee9711f561dff45b31489a7fb539ed98660e26d0e
parenta0e8aa6737f534a8e51d866728dd6dc59bef263d
parent7d7f3d0e99eca98a5659e73bce56d615f0ed4fc3
Merge zizzer:/bk/newmem
into  zower.eecs.umich.edu:/eecshome/m5/newmem

--HG--
extra : convert_revision : f4a05accb8fa24d425dd818b1b7f268378180e99
15 files changed:
configs/example/fs.py
src/SConscript
src/arch/sparc/isa/decoder.isa
src/arch/sparc/isa/formats/mem/blockmem.isa
src/arch/sparc/isa/formats/mem/util.isa
src/cpu/exetrace.cc
src/cpu/m5legion_interface.h
src/cpu/o3/commit_impl.hh
src/cpu/o3/cpu.cc
src/cpu/o3/decode_impl.hh
src/cpu/o3/fetch_impl.hh
src/cpu/o3/iew_impl.hh
src/cpu/o3/lsq_unit.hh
src/cpu/o3/rename_impl.hh
src/unittest/Makefile