Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Fri, 23 Mar 2007 17:20:19 +0000 (13:20 -0400)
committerKevin Lim <ktlim@umich.edu>
Fri, 23 Mar 2007 17:20:19 +0000 (13:20 -0400)
commit047f77102b5e5d63549663ee94cd799cdcf63516
tree3c214a93043533716044b1c61c9d12aba3388c42
parent2c47413a7a4563c724d8470971d1059bdfe01c92
parent2330adfa28ec39035beab8dae52873ecd0e28889
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/clean2

src/cpu/base_dyn_inst.hh:
    Hand merge.  Line is no longer needed because it's handled in the ISA.

--HG--
extra : convert_revision : 0be4067aa38759a5631c6940f0167d48fde2b680
13 files changed:
src/arch/alpha/isa/decoder.isa
src/cpu/base.cc
src/cpu/o3/alpha/cpu_impl.hh
src/cpu/o3/commit_impl.hh
src/cpu/o3/cpu.cc
src/cpu/o3/cpu.hh
src/cpu/o3/fetch_impl.hh
src/cpu/o3/inst_queue_impl.hh
src/cpu/o3/lsq_unit.hh
src/cpu/o3/lsq_unit_impl.hh
src/mem/bus.cc
src/mem/cache/cache_impl.hh
src/mem/cache/miss/miss_queue.cc