merge with m5 head
authorLisa Hsu <hsul@eecs.umich.edu>
Thu, 11 Mar 2004 23:52:29 +0000 (18:52 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Thu, 11 Mar 2004 23:52:29 +0000 (18:52 -0500)
commit3bc8cffc75c2e03a6a8fe5f4425940a16405f672
tree1d44dba1a7dbd4aef6fad45753b7607928d3414a
parent1039028d408d5a374a67d8d3ecc640a0e6559fbb
parent2c60d7aa9e4b48f30ab8c48436ff2dfec8e390f2
merge with m5 head

--HG--
extra : convert_revision : c90339248d1ee74df1c6b90a77ec9ea41f646311
cpu/base_cpu.cc
dev/alpha_console.cc
dev/alpha_console.hh
sim/system.hh