Merge zizzer:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Sat, 16 Dec 2006 16:35:40 +0000 (11:35 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sat, 16 Dec 2006 16:35:40 +0000 (11:35 -0500)
commit9d0ca61b7e357ca5e83f97f8cb8f4f1037cc3eb5
tree50e7a435de1e0f5638eba9b1b030e79daaf1aee0
parent4da37bcd1bc2c42ce5f297a58b4b4bffa4e8cd4f
parentf4f00c5ae98c069f79a8b56ed93284daf7532c7e
Merge zizzer:/bk/newmem
into  zower.eecs.umich.edu:/eecshome/m5/newmem

src/arch/isa_parser.py:
src/arch/sparc/isa/formats/mem/basicmem.isa:
src/arch/sparc/isa/formats/mem/blockmem.isa:
src/arch/sparc/isa/formats/mem/util.isa:
src/arch/sparc/miscregfile.cc:
src/arch/sparc/miscregfile.hh:
src/cpu/o3/iew_impl.hh:
    Hand Merge

--HG--
extra : convert_revision : ae1b25cde85ab8ec275a09d554acd372887d4d47
15 files changed:
src/arch/isa_parser.py
src/arch/sparc/faults.cc
src/arch/sparc/intregfile.hh
src/arch/sparc/isa/decoder.isa
src/arch/sparc/isa/formats/mem/basicmem.isa
src/arch/sparc/isa/formats/mem/blockmem.isa
src/arch/sparc/isa/formats/mem/util.isa
src/arch/sparc/isa_traits.hh
src/arch/sparc/miscregfile.cc
src/arch/sparc/miscregfile.hh
src/arch/sparc/regfile.cc
src/arch/sparc/regfile.hh
src/cpu/exetrace.cc
src/cpu/o3/fetch.hh
src/cpu/o3/iew_impl.hh