projects / gem5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 053c715 debf04a)
Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Wed, 20 Jun 2007 01:54:40 +0000 (18:54 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 20 Jun 2007 01:54:40 +0000 (18:54 -0700)
commit5c48a0581338226ee2f56a4ed99c6d68abb69613
treef8d6e32036d4c58f69b48f60e5e5a6b3f1192b05tree
parent053c715f213a6532b5644e46a5d04ef9e092139ecommit | diff
parentdebf04aef1b0f662e981507545cdac956dd22a47commit | diff
Merge zizzer.eecs.umich.edu:/bk/newmem
into  doughnut.hpl.hp.com:/home/gblack/newmem-o3-micro

src/cpu/base_dyn_inst_impl.hh:
src/cpu/o3/fetch_impl.hh:
    Hand merge

--HG--
extra : convert_revision : 0c0692033ac30133672d8dfe1f1a27e9d9e95a3d
src/arch/sparc/isa/formats/mem/blockmem.isa diff1 | diff2 | blob | history
src/cpu/o3/fetch.hh diff1 | diff2 | blob | history
src/cpu/o3/fetch_impl.hh diff1 | diff2 | blob | history