Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Tue, 23 Jan 2007 06:31:48 +0000 (22:31 -0800)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 23 Jan 2007 06:31:48 +0000 (22:31 -0800)
commit1352e55ceb2d78a9a36451636b672cd6daf8550e
treed7c797f46cd00cc76628a4a65329f2f2dd966cbe
parent45c3f1747c78aff3495edfe2cbe35fbb7a67f2a4
parent60eaa03d72a13863596e64343d7407af1cab51c5
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmemo3

src/sim/byteswap.hh:
    Hand Merge

--HG--
extra : convert_revision : 640d33ad0c416934e8a5107768e7f1dce6709ca8
src/arch/sparc/faults.cc
src/arch/sparc/intregfile.cc
src/arch/sparc/isa/decoder.isa
src/arch/sparc/isa/formats/mem/blockmem.isa
src/arch/sparc/isa_traits.hh
src/arch/sparc/miscregfile.cc
src/arch/sparc/miscregfile.hh
src/arch/sparc/regfile.cc
src/cpu/exetrace.cc
src/sim/byteswap.hh
src/sim/process.cc