projects / gem5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a362d0 96fd6b5)
Merge ktlim@zizzer:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Tue, 28 Feb 2006 20:16:24 +0000 (15:16 -0500)
committerKevin Lim <ktlim@umich.edu>
Tue, 28 Feb 2006 20:16:24 +0000 (15:16 -0500)
commit34da58a698e4119876f04d13c337e9974970f49a
tree6dc9940bf89b04ec973ff4b433a015e13cb7f017tree
parent3a362d04b7aed0fa728af9373bad175a096a7de8commit | diff
parent96fd6b5c4039c98a1b536ec184126ad75e7d2539commit | diff
Merge ktlim@zizzer:/bk/m5
into  zamp.eecs.umich.edu:/z/ktlim2/clean/m5-clean

arch/alpha/ev5.cc:
cpu/o3/regfile.hh:
    Hand merge.

--HG--
rename : arch/alpha/alpha_memory.cc => arch/alpha/tlb.cc
extra : convert_revision : c941dd2198851398820b38a66471372ed8454891
14 files changed:
arch/alpha/ev5.cc diff1 | diff2 | blob | history
arch/alpha/isa/decoder.isa diff1 | diff2 | blob | history
arch/alpha/isa/fp.isa diff1 | diff2 | blob | history
arch/alpha/tlb.cc diff1 | | blob | history
base/remote_gdb.cc diff1 | diff2 | blob | history
cpu/exec_context.hh diff1 | diff2 | blob | history
cpu/o3/alpha_cpu.hh diff1 | diff2 | blob | history
cpu/o3/alpha_cpu_impl.hh diff1 | diff2 | blob | history
cpu/o3/cpu.hh diff1 | diff2 | blob | history
cpu/o3/regfile.hh diff1 | diff2 | blob | history
cpu/simple/cpu.cc diff1 | diff2 | blob | history
cpu/simple/cpu.hh diff1 | diff2 | blob | history
dev/sinic.cc diff1 | diff2 | blob | history
kern/kernel_stats.cc diff1 | diff2 | blob | history