Merge vm1.(none):/home/stever/bk/newmem
authorSteve Reinhardt <stever@eecs.umich.edu>
Sat, 10 Jun 2006 03:18:46 +0000 (23:18 -0400)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sat, 10 Jun 2006 03:18:46 +0000 (23:18 -0400)
commit95019d0c6f1675f42d899f2899e06d3017088f25
tree7618cd95da8299faff8dd682e088ee707cae6a7f
parent6de5d73a999240f92f050393bb10028968275835
parent29e34a739b991af8d8e1eafe75ecb0904c324dc8
Merge vm1.(none):/home/stever/bk/newmem
into  vm1.(none):/home/stever/bk/newmem-py

src/python/m5/__init__.py:
src/sim/syscall_emul.cc:
    Hand merge.

--HG--
extra : convert_revision : e2542735323e648383c89382421d98a7d1d761bf
SConstruct
src/SConscript
src/arch/alpha/ev5.cc
src/arch/alpha/isa/decoder.isa
src/cpu/base.cc
src/cpu/o3/alpha_cpu_impl.hh
src/python/m5/objects/AlphaFullCPU.py
src/sim/pseudo_inst.cc
src/sim/syscall_emul.cc