Merge zizzer:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Sat, 27 Jan 2007 06:59:20 +0000 (01:59 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sat, 27 Jan 2007 06:59:20 +0000 (01:59 -0500)
commit0358ccee23072eef0b6448e3170457037682a452
tree378b5ba325d74536092a7f245423d81274db38b4
parente41f54f97f9ebdea32cc6498c346636cddc9e06d
parent5c7bf74c073d0aea808046d10dfcaa6c319217a3
Merge zizzer:/bk/newmem
into  zower.eecs.umich.edu:/eecshome/m5/newmem

src/arch/sparc/isa/formats/mem/util.isa:
src/arch/sparc/isa_traits.hh:
src/arch/sparc/system.cc:
    Hand Merge

--HG--
extra : convert_revision : d5e0c97caebb616493e2f642e915969d7028109c
17 files changed:
src/SConscript
src/arch/sparc/isa/base.isa
src/arch/sparc/isa/decoder.isa
src/arch/sparc/isa/formats/basic.isa
src/arch/sparc/isa/formats/integerop.isa
src/arch/sparc/isa/formats/mem/blockmem.isa
src/arch/sparc/isa/formats/mem/util.isa
src/arch/sparc/isa/includes.isa
src/arch/sparc/isa_traits.hh
src/arch/sparc/tlb.cc
src/base/remote_gdb.cc
src/cpu/exetrace.cc
src/cpu/o3/alpha/cpu_impl.hh
src/cpu/o3/commit_impl.hh
src/cpu/o3/sparc/cpu_impl.hh
src/cpu/simple/base.hh
src/sim/byteswap.hh