Hand merge. Stuff probably doesn't compile.
authorGabe Black <gblack@eecs.umich.edu>
Thu, 9 Mar 2006 23:35:28 +0000 (18:35 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 9 Mar 2006 23:35:28 +0000 (18:35 -0500)
commit872bbdfc33cb82bf32576db3a57d3055a04acbac
tree837dd214bd682ac7efa515b18857bec7d4d35bef
parent3adb45144aca819c9796168ecde7a263169d9d4d
parent7b283dbc090d1197593b00fd1279b92f7c2e693e
Hand merge.  Stuff probably doesn't compile.

--HG--
rename : arch/alpha/isa_desc => arch/alpha/isa/main.isa
rename : arch/alpha/alpha_linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/alpha_linux_process.hh => arch/alpha/linux/process.hh
rename : arch/alpha/alpha_tru64_process.cc => arch/alpha/tru64/process.cc
rename : arch/alpha/alpha_tru64_process.hh => arch/alpha/tru64/process.hh
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : 7d1efcedd708815d985a951f6f010fbd83dc27e8
23 files changed:
SConscript
arch/alpha/isa/main.isa
arch/alpha/linux/process.hh
arch/alpha/tru64/process.hh
base/intmath.hh
base/loader/elf_object.cc
base/loader/object_file.hh
cpu/base.cc
cpu/base.hh
cpu/cpu_exec_context.cc
cpu/cpu_exec_context.hh
cpu/exetrace.cc
cpu/simple/cpu.cc
cpu/simple/cpu.hh
cpu/static_inst.hh
dev/platform.hh
python/m5/objects/Ethernet.py
sim/process.cc
sim/process.hh
sim/syscall_emul.cc
sim/syscall_emul.hh
sim/system.cc
sim/system.hh