Merge m5.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Tue, 18 Apr 2006 13:44:45 +0000 (09:44 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 18 Apr 2006 13:44:45 +0000 (09:44 -0400)
into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 3eb97976caf57e43119a998c31128ca6f163c05b

1  2 
arch/mips/isa/decoder.isa
arch/mips/isa/operands.isa
cpu/cpu_exec_context.hh
cpu/exec_context.hh
cpu/simple/cpu.hh
sim/process.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc sim/process.cc
Simple merge