diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-09 19:21:35 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-09 19:21:35 -0500 |
| commit | f102365bfe14d25e40fb6d5cbd184138c0593c55 (patch) | |
| tree | 3a67165ddff1b7341be44e5c8886eec7392490e7 /base | |
| parent | 872bbdfc33cb82bf32576db3a57d3055a04acbac (diff) | |
| download | gem5-f102365bfe14d25e40fb6d5cbd184138c0593c55.tar.xz | |
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
Diffstat (limited to 'base')
| -rw-r--r-- | base/chunk_generator.hh | 2 | ||||
| -rw-r--r-- | base/loader/elf_object.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/base/chunk_generator.hh b/base/chunk_generator.hh index a584679d0..1dca50db4 100644 --- a/base/chunk_generator.hh +++ b/base/chunk_generator.hh @@ -36,7 +36,7 @@ #include <algorithm> #include "base/intmath.hh" -#include "targetarch/isa_traits.hh" // for Addr +#include "arch/isa_traits.hh" // for Addr /** * This class takes an arbitrary memory region (address/length pair) diff --git a/base/loader/elf_object.cc b/base/loader/elf_object.cc index 1136686f0..9a67f1887 100644 --- a/base/loader/elf_object.cc +++ b/base/loader/elf_object.cc @@ -47,6 +47,8 @@ #include "base/trace.hh" // for DPRINTF +#include "sim/byteswap.hh" + using namespace std; |