Gabe Black f102365bfe 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

2006-03-09 19:21:35 -05:00

..

linux

SimpleCPU compiles with merge.

2006-03-09 19:21:35 -05:00

tru64

SimpleCPU compiles with merge.

2006-03-09 19:21:35 -05:00

kernel_stats.cc

Merge ktlim@zizzer:/bk/m5

2006-03-07 20:01:34 -05:00

kernel_stats.hh

Merge ktlim@zizzer:/bk/m5

2006-03-07 20:01:34 -05:00

system_events.cc

Steps towards setting up the infrastructure to allow the new CPU model to work in full system mode.

2006-03-04 15:18:40 -05:00

system_events.hh

Add functions to System object to set up function-based events,

2005-09-24 14:20:29 -04:00