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

..

async.hh

Many files:

2005-06-05 05:16:00 -04:00

builder.cc

Many files:

2005-06-05 05:16:00 -04:00

builder.hh

Many files:

2005-06-05 05:16:00 -04:00

byteswap.hh

endian fixes and compiles on mac os x

2006-02-15 01:23:13 -05:00

debug.cc

Many files:

2005-06-05 05:16:00 -04:00

debug.hh

Many files:

2005-06-05 05:16:00 -04:00

eventq.cc

Many files:

2005-06-05 05:16:00 -04:00

eventq.hh

Many files:

2005-06-05 05:16:00 -04:00

faults.cc

Avoid accessing objects directly within the XC.

2006-03-07 22:23:14 -05:00

faults.hh

Some clean up work with faults.

2006-03-07 04:31:38 -05:00

host.hh

Made Addr a global type

2006-02-21 03:38:21 -05:00

main.cc

Many files:

2005-06-05 05:16:00 -04:00

param.cc

fixes for gcc 4.0

2005-09-12 03:01:43 -04:00

param.hh

Fixes to build with gcc 4.0.

2005-09-02 21:30:02 -04:00

process.cc

Hand merge. Stuff probably doesn't compile.

2006-03-09 18:35:28 -05:00

process.hh

SimpleCPU compiles with merge.

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

pseudo_inst.cc

Updates for the quiesceEvent that was added to the XC.

2006-03-07 19:59:12 -05:00

pseudo_inst.hh

Add quiesceNs, quiesceTime, quiesceCycles, and m5panic pseudo ops.

2006-02-28 18:41:04 -05:00

root.cc

Convert type of max_time and progress_interval parameters

2005-09-01 11:32:58 -04:00

serialize.cc

fix the MAX_CHECKPOINTS stuff

2005-09-18 21:20:24 -04:00

serialize.hh

Many files:

2005-06-05 05:16:00 -04:00

sim_events.cc

Move max_time and progress_interval parameters to the Root

2005-06-22 09:59:13 -04:00

sim_events.hh

Move max_time and progress_interval parameters to the Root

2005-06-22 09:59:13 -04:00

sim_exit.hh

Many files:

2005-06-05 05:16:00 -04:00

sim_object.cc

Many files:

2005-06-05 05:16:00 -04:00

sim_object.hh

Many files:

2005-06-05 05:16:00 -04:00

startup.cc

Many files:

2005-06-05 05:16:00 -04:00

startup.hh

Many files:

2005-06-05 05:16:00 -04:00

stat_control.cc

Fix bug where simulation terminates same cycle as last stat dump causing a duplicate row in db

2005-11-02 14:45:35 -05:00

stat_control.hh

Many files:

2005-06-05 05:16:00 -04:00

stats.hh

Many files:

2005-06-05 05:16:00 -04:00

syscall_emul.cc

Hand merge. Stuff probably doesn't compile.

2006-03-09 18:35:28 -05:00

syscall_emul.hh

Hand merge. Stuff probably doesn't compile.

2006-03-09 18:35:28 -05:00

system.cc

SimpleCPU compiles with merge.

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

system.hh

Hand merge. Stuff probably doesn't compile.

2006-03-09 18:35:28 -05:00

vptr.hh

Changed targetarch to just arch.

2006-02-27 05:35:43 -05:00