From 25693e9e691cd9c33cad44511877e2509797a9cd Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Fri, 10 Oct 2003 11:09:00 -0700 Subject: Make include paths explicit and update makefile accordingly. arch/alpha/alpha_memory.cc: arch/alpha/alpha_memory.hh: arch/alpha/arguments.cc: arch/alpha/arguments.hh: arch/alpha/ev5.cc: arch/alpha/ev5.hh: arch/alpha/fake_syscall.cc: arch/alpha/faults.cc: arch/alpha/isa_desc: arch/alpha/isa_traits.hh: arch/alpha/osfpal.cc: arch/alpha/vtophys.cc: arch/alpha/vtophys.hh: base/circlebuf.cc: base/compression/lzss_compression.cc: base/compression/lzss_compression.hh: base/cprintf.cc: base/cprintf.hh: base/fast_alloc.cc: base/fifo_buffer.cc: base/fifo_buffer.hh: base/hashmap.hh: base/hostinfo.cc: base/hostinfo.hh: base/hybrid_pred.cc: base/hybrid_pred.hh: base/inet.cc: base/inet.hh: base/inifile.cc: base/inifile.hh: base/intmath.cc: base/loader/aout_object.cc: base/loader/aout_object.hh: base/loader/ecoff_object.cc: base/loader/ecoff_object.hh: base/loader/elf_object.cc: base/loader/elf_object.hh: base/loader/exec_aout.h: base/loader/exec_ecoff.h: base/loader/object_file.cc: base/loader/object_file.hh: base/loader/symtab.cc: base/loader/symtab.hh: base/misc.cc: base/misc.hh: base/pollevent.cc: base/pollevent.hh: base/random.cc: base/random.hh: base/range.hh: base/remote_gdb.cc: base/remote_gdb.hh: base/res_list.hh: base/sat_counter.cc: base/sat_counter.hh: base/sched_list.hh: base/socket.cc: base/statistics.cc: base/statistics.hh: base/str.cc: base/trace.cc: base/trace.hh: cpu/base_cpu.cc: cpu/base_cpu.hh: cpu/exec_context.cc: cpu/exec_context.hh: cpu/exetrace.cc: cpu/exetrace.hh: cpu/intr_control.cc: cpu/intr_control.hh: cpu/memtest/memtest.cc: cpu/memtest/memtest.hh: cpu/pc_event.cc: cpu/pc_event.hh: cpu/simple_cpu/simple_cpu.cc: cpu/simple_cpu/simple_cpu.hh: cpu/static_inst.cc: cpu/static_inst.hh: dev/alpha_console.cc: dev/alpha_console.hh: dev/console.cc: dev/console.hh: dev/disk_image.cc: dev/disk_image.hh: dev/etherbus.cc: dev/etherbus.hh: dev/etherdump.cc: dev/etherdump.hh: dev/etherint.cc: dev/etherint.hh: dev/etherlink.cc: dev/etherlink.hh: dev/etherpkt.hh: dev/ethertap.cc: dev/ethertap.hh: dev/simple_disk.cc: dev/simple_disk.hh: kern/tru64/tru64_syscalls.cc: kern/tru64/tru64_syscalls.hh: sim/debug.cc: sim/eventq.cc: sim/eventq.hh: sim/main.cc: sim/param.cc: sim/param.hh: sim/prog.cc: sim/prog.hh: sim/serialize.cc: sim/serialize.hh: sim/sim_events.cc: sim/sim_events.hh: sim/sim_object.cc: sim/sim_object.hh: sim/sim_time.cc: sim/system.cc: sim/system.hh: sim/universe.cc: test/circletest.cc: test/cprintftest.cc: test/initest.cc: test/nmtest.cc: test/offtest.cc: test/paramtest.cc: test/rangetest.cc: test/stattest.cc: test/strnumtest.cc: test/symtest.cc: test/tokentest.cc: test/tracetest.cc: util/tap/tap.cc: Make include paths explicit. --HG-- extra : convert_revision : 941cbdc591fd4d3d1d9f095cd58fc23dd2d73840 --- cpu/simple_cpu/simple_cpu.cc | 66 ++++++++++++++++++++++---------------------- cpu/simple_cpu/simple_cpu.hh | 10 +++---- 2 files changed, 38 insertions(+), 38 deletions(-) (limited to 'cpu/simple_cpu') diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc index 41a612318..2bbd74efa 100644 --- a/cpu/simple_cpu/simple_cpu.cc +++ b/cpu/simple_cpu/simple_cpu.cc @@ -36,47 +36,47 @@ #include #include -#include "host.hh" -#include "cprintf.hh" -#include "misc.hh" -#include "smt.hh" - -#include "annotation.hh" -#include "exec_context.hh" -#include "base_cpu.hh" -#include "debug.hh" -#include "simple_cpu.hh" -#include "inifile.hh" -#include "mem_interface.hh" -#include "base_mem.hh" -#include "static_inst.hh" +#include "sim/host.hh" +#include "base/cprintf.hh" +#include "base/misc.hh" +#include "cpu/full_cpu/smt.hh" + +#include "sim/annotation.hh" +#include "cpu/exec_context.hh" +#include "cpu/base_cpu.hh" +#include "sim/debug.hh" +#include "cpu/simple_cpu/simple_cpu.hh" +#include "base/inifile.hh" +#include "mem/mem_interface.hh" +#include "mem/base_mem.hh" +#include "cpu/static_inst.hh" #ifdef FULL_SYSTEM -#include "memory_control.hh" -#include "physical_memory.hh" -#include "alpha_memory.hh" -#include "system.hh" +#include "mem/functional_mem/memory_control.hh" +#include "mem/functional_mem/physical_memory.hh" +#include "targetarch/alpha_memory.hh" +#include "sim/system.hh" #else // !FULL_SYSTEM -#include "functional_memory.hh" -#include "prog.hh" -#include "eio.hh" +#include "mem/functional_mem/functional_memory.hh" +#include "sim/prog.hh" +#include "eio/eio.hh" #endif // FULL_SYSTEM -#include "exetrace.hh" -#include "trace.hh" -#include "sim_events.hh" -#include "pollevent.hh" -#include "sim_object.hh" -#include "sim_stats.hh" +#include "cpu/exetrace.hh" +#include "base/trace.hh" +#include "sim/sim_events.hh" +#include "base/pollevent.hh" +#include "sim/sim_object.hh" +#include "sim/sim_stats.hh" -#include "range.hh" -#include "symtab.hh" +#include "base/range.hh" +#include "base/loader/symtab.hh" #ifdef FULL_SYSTEM -#include "vtophys.hh" -#include "pciareg.h" -#include "remote_gdb.hh" -#include "alpha_access.h" +#include "targetarch/vtophys.hh" +#include "dev/pciareg.h" +#include "base/remote_gdb.hh" +#include "dev/alpha_access.h" #endif diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh index c5671eb6f..658a92344 100644 --- a/cpu/simple_cpu/simple_cpu.hh +++ b/cpu/simple_cpu/simple_cpu.hh @@ -29,11 +29,11 @@ #ifndef __SIMPLE_CPU_HH__ #define __SIMPLE_CPU_HH__ -#include "base_cpu.hh" -#include "eventq.hh" -#include "symtab.hh" -#include "pc_event.hh" -#include "statistics.hh" +#include "cpu/base_cpu.hh" +#include "sim/eventq.hh" +#include "base/loader/symtab.hh" +#include "cpu/pc_event.hh" +#include "base/statistics.hh" // forward declarations -- cgit v1.2.3