projects / gem5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 99484cf 1166d4f)
Merge zizzer:/bk/m5
authorAli Saidi <saidi@eecs.umich.edu>
Thu, 23 Feb 2006 20:06:06 +0000 (15:06 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Thu, 23 Feb 2006 20:06:06 +0000 (15:06 -0500)
commite1c3acd91c65ae7d51a7d0b3c0f7be764b2c8f79
tree490fb46c6254fea699d419d58035a1e0b67eebddtree
parent99484cfae81f3f01ccdfcd273ddc2bdb41e6456bcommit | diff
parent1166d4f0bfe67a9dc178be3454b4f0eac38663adcommit | diff
Merge zizzer:/bk/m5
into  zeep.eecs.umich.edu:/z/saidi/work/m5.head

cpu/simple/cpu.cc:
    remove initCPU from constructor
dev/alpha_console.cc:
    we are panicing, so no need to return a fault

--HG--
extra : convert_revision : 72389ea0c96e91a55f35b884200325224bfb6ed9
cpu/o3/cpu.cc diff1 | diff2 | blob | history
cpu/simple/cpu.cc diff1 | diff2 | blob | history
cpu/simple/cpu.hh diff1 | diff2 | blob | history
dev/alpha_console.cc diff1 | diff2 | blob | history
sim/system.cc diff1 | diff2 | blob | history