From f102365bfe14d25e40fb6d5cbd184138c0593c55 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 9 Mar 2006 19:21:35 -0500 Subject: 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 --- sim/process.hh | 2 +- sim/system.cc | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'sim') diff --git a/sim/process.hh b/sim/process.hh index fc600fb06..476cb8ecf 100644 --- a/sim/process.hh +++ b/sim/process.hh @@ -48,7 +48,7 @@ #include "mem/page_table.hh" #include "sim/sim_object.hh" #include "sim/stats.hh" -#include "targetarch/isa_traits.hh" +#include "arch/isa_traits.hh" class CPUExecContext; class ExecContext; diff --git a/sim/system.cc b/sim/system.cc index 3ed7ed590..f1d0579d7 100644 --- a/sim/system.cc +++ b/sim/system.cc @@ -1,7 +1,6 @@ #include "base/loader/object_file.hh" #include "base/loader/symtab.hh" #include "cpu/exec_context.hh" -#include "arch/vtophys.hh" #include "mem/memory.hh" #include "sim/builder.hh" #include "arch/isa_traits.hh" @@ -12,7 +11,7 @@ #include "base/remote_gdb.hh" #include "kern/kernel_stats.hh" #include "mem/functional/memory_control.hh" -#include "targetarch/vtophys.hh" +#include "arch/vtophys.hh" #endif using namespace std; @@ -72,7 +71,6 @@ System::System(Params *p) DPRINTF(Loader, "Kernel entry = %#x\n", kernelEntry); DPRINTF(Loader, "Kernel loaded...\n"); -#if FULL_SYSTEM kernelBinning = new Kernel::Binning(this); #endif // FULL_SYSTEM -- cgit v1.2.3