SimpleCPU compiles with merge.
authorGabe Black <gblack@eecs.umich.edu>
Fri, 10 Mar 2006 00:21:35 +0000 (19:21 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 10 Mar 2006 00:21:35 +0000 (19:21 -0500)
commitf102365bfe14d25e40fb6d5cbd184138c0593c55
tree3a67165ddff1b7341be44e5c8886eec7392490e7
parent872bbdfc33cb82bf32576db3a57d3055a04acbac
SimpleCPU compiles with merge.

arch/alpha/isa_traits.hh:
arch/alpha/linux/process.cc:
arch/alpha/process.cc:
arch/alpha/process.hh:
arch/alpha/tru64/process.cc:
base/chunk_generator.hh:
base/loader/elf_object.cc:
cpu/cpu_exec_context.cc:
cpu/cpu_exec_context.hh:
cpu/exec_context.hh:
cpu/simple/cpu.cc:
kern/linux/linux.hh:
kern/tru64/tru64.hh:
mem/packet.hh:
mem/page_table.cc:
mem/page_table.hh:
mem/physical.cc:
mem/request.hh:
mem/translating_port.cc:
sim/process.hh:
sim/system.cc:
    Fixing merged changes.

--HG--
extra : convert_revision : 2e94f21009395db654880fcb94ec806b6f5772c3
21 files changed:
arch/alpha/isa_traits.hh
arch/alpha/linux/process.cc
arch/alpha/process.cc
arch/alpha/process.hh
arch/alpha/tru64/process.cc
base/chunk_generator.hh
base/loader/elf_object.cc
cpu/cpu_exec_context.cc
cpu/cpu_exec_context.hh
cpu/exec_context.hh
cpu/simple/cpu.cc
kern/linux/linux.hh
kern/tru64/tru64.hh
mem/packet.hh
mem/page_table.cc
mem/page_table.hh
mem/physical.cc
mem/request.hh
mem/translating_port.cc
sim/process.hh
sim/system.cc