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 --- base/circlebuf.cc | 6 +++--- base/compression/lzss_compression.cc | 4 ++-- base/compression/lzss_compression.hh | 2 +- base/cprintf.cc | 2 +- base/cprintf.hh | 2 +- base/fast_alloc.cc | 2 +- base/fifo_buffer.cc | 2 +- base/fifo_buffer.hh | 2 +- base/hashmap.hh | 2 +- base/hostinfo.cc | 2 +- base/hostinfo.hh | 2 +- base/hybrid_pred.cc | 6 +++--- base/hybrid_pred.hh | 6 +++--- base/inet.cc | 6 +++--- base/inet.hh | 2 +- base/inifile.cc | 4 ++-- base/inifile.hh | 2 +- base/intmath.cc | 2 +- base/loader/aout_object.cc | 10 +++++----- base/loader/aout_object.hh | 2 +- base/loader/ecoff_object.cc | 14 +++++++------- base/loader/ecoff_object.hh | 2 +- base/loader/elf_object.cc | 10 +++++----- base/loader/elf_object.hh | 2 +- base/loader/exec_aout.h | 2 +- base/loader/exec_ecoff.h | 2 +- base/loader/object_file.cc | 12 ++++++------ base/loader/object_file.hh | 2 +- base/loader/symtab.cc | 8 ++++---- base/loader/symtab.hh | 4 ++-- base/misc.cc | 12 ++++++------ base/misc.hh | 2 +- base/pollevent.cc | 10 +++++----- base/pollevent.hh | 2 +- base/random.cc | 4 ++-- base/random.hh | 2 +- base/range.hh | 4 ++-- base/remote_gdb.cc | 22 +++++++++++----------- base/remote_gdb.hh | 8 ++++---- base/res_list.hh | 2 +- base/sat_counter.cc | 6 +++--- base/sat_counter.hh | 6 +++--- base/sched_list.hh | 2 +- base/socket.cc | 6 +++--- base/statistics.cc | 12 ++++++------ base/statistics.hh | 6 +++--- base/str.cc | 4 ++-- base/trace.cc | 6 +++--- base/trace.hh | 8 ++++---- 49 files changed, 125 insertions(+), 125 deletions(-) (limited to 'base') diff --git a/base/circlebuf.cc b/base/circlebuf.cc index 311de60b7..77da26da6 100644 --- a/base/circlebuf.cc +++ b/base/circlebuf.cc @@ -33,9 +33,9 @@ #include #include -#include "circlebuf.hh" -#include "cprintf.hh" -#include "intmath.hh" +#include "base/circlebuf.hh" +#include "base/cprintf.hh" +#include "base/intmath.hh" using namespace std; diff --git a/base/compression/lzss_compression.cc b/base/compression/lzss_compression.cc index a1933215a..8f235b808 100644 --- a/base/compression/lzss_compression.cc +++ b/base/compression/lzss_compression.cc @@ -32,9 +32,9 @@ #include -#include "lzss_compression.hh" +#include "base/compression/lzss_compression.hh" -#include "misc.hh" //for fatal +#include "base/misc.hh" //for fatal int LZSSCompression::findSubString(uint8_t *src, int front, int back, int size) diff --git a/base/compression/lzss_compression.hh b/base/compression/lzss_compression.hh index 5fb47d3f1..755a52c92 100644 --- a/base/compression/lzss_compression.hh +++ b/base/compression/lzss_compression.hh @@ -33,7 +33,7 @@ * LZSSCompression declarations. */ -#include "host.hh" // for uint8_t +#include "sim/host.hh" // for uint8_t /** * Simple LZSS compression scheme. diff --git a/base/cprintf.cc b/base/cprintf.cc index be6e64f59..945ad5b38 100644 --- a/base/cprintf.cc +++ b/base/cprintf.cc @@ -31,7 +31,7 @@ #include #include -#include "cprintf.hh" +#include "base/cprintf.hh" using namespace std; diff --git a/base/cprintf.hh b/base/cprintf.hh index 2dc84502a..8360d227c 100644 --- a/base/cprintf.hh +++ b/base/cprintf.hh @@ -36,7 +36,7 @@ namespace cp { -#include "cprintf_formats.hh" +#include "base/cprintf_formats.hh" class ArgList { diff --git a/base/fast_alloc.cc b/base/fast_alloc.cc index 290e59113..ff0a40c37 100644 --- a/base/fast_alloc.cc +++ b/base/fast_alloc.cc @@ -37,7 +37,7 @@ #endif #include -#include "fast_alloc.hh" +#include "base/fast_alloc.hh" void *FastAlloc::freeLists[Num_Buckets]; diff --git a/base/fifo_buffer.cc b/base/fifo_buffer.cc index c702d2999..d103d2e60 100644 --- a/base/fifo_buffer.cc +++ b/base/fifo_buffer.cc @@ -26,7 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "fifo_buffer.hh" +#include "base/fifo_buffer.hh" template void diff --git a/base/fifo_buffer.hh b/base/fifo_buffer.hh index 75690d36c..767db03a4 100644 --- a/base/fifo_buffer.hh +++ b/base/fifo_buffer.hh @@ -29,7 +29,7 @@ #ifndef __FIFO_BUFFER_HH__ #define __FIFO_BUFFER_HH__ -#include "res_list.hh" +#include "base/res_list.hh" // diff --git a/base/hashmap.hh b/base/hashmap.hh index 21d4a818e..10089980b 100644 --- a/base/hashmap.hh +++ b/base/hashmap.hh @@ -37,7 +37,7 @@ #include -#include "host.hh" +#include "sim/host.hh" #if defined(__GNUC__) && __GNUC__ >= 3 #define __hash_namespace __gnu_cxx diff --git a/base/hostinfo.cc b/base/hostinfo.cc index 48c876122..b530ae237 100644 --- a/base/hostinfo.cc +++ b/base/hostinfo.cc @@ -34,7 +34,7 @@ #include #include -#include "host.hh" +#include "sim/host.hh" uint64_t procInfo(char *filename, char *target) diff --git a/base/hostinfo.hh b/base/hostinfo.hh index 3a5d1a61e..2293d2b6a 100644 --- a/base/hostinfo.hh +++ b/base/hostinfo.hh @@ -29,7 +29,7 @@ #ifndef __HOSTINFO_HH__ #define __HOSTINFO_HH__ -#include "host.hh" +#include "sim/host.hh" uint64_t procInfo(char *filename, char *target); diff --git a/base/hybrid_pred.cc b/base/hybrid_pred.cc index ed7f781b2..83ce7f987 100644 --- a/base/hybrid_pred.cc +++ b/base/hybrid_pred.cc @@ -29,9 +29,9 @@ #include #include -#include "hybrid_pred.hh" -#include "statistics.hh" -#include "sim_stats.hh" +#include "base/hybrid_pred.hh" +#include "base/statistics.hh" +#include "sim/sim_stats.hh" using namespace std; diff --git a/base/hybrid_pred.hh b/base/hybrid_pred.hh index f6e14e3e3..3fdab9153 100644 --- a/base/hybrid_pred.hh +++ b/base/hybrid_pred.hh @@ -40,10 +40,10 @@ #include -#include "sat_counter.hh" +#include "base/sat_counter.hh" -#include "statistics.hh" -#include "sim_stats.hh" +#include "base/statistics.hh" +#include "sim/sim_stats.hh" class HybridPredictor : public GenericPredictor { diff --git a/base/inet.cc b/base/inet.cc index 33483bb32..46aa027fc 100644 --- a/base/inet.cc +++ b/base/inet.cc @@ -29,9 +29,9 @@ #include #include -#include "cprintf.hh" -#include "host.hh" -#include "inet.hh" +#include "base/cprintf.hh" +#include "sim/host.hh" +#include "base/inet.hh" using namespace::std; string diff --git a/base/inet.hh b/base/inet.hh index 1c48d0730..1ae2e8542 100644 --- a/base/inet.hh +++ b/base/inet.hh @@ -29,7 +29,7 @@ #ifndef __INET_HH__ #define __INET_HH__ -#include "host.hh" +#include "sim/host.hh" uint32_t crc32be(const uint8_t *buf, size_t len); uint32_t crc32le(const uint8_t *buf, size_t len); diff --git a/base/inifile.cc b/base/inifile.cc index 3f80ec259..92d88c09b 100644 --- a/base/inifile.cc +++ b/base/inifile.cc @@ -49,8 +49,8 @@ #include #include -#include "inifile.hh" -#include "str.hh" +#include "base/inifile.hh" +#include "base/str.hh" using namespace std; diff --git a/base/inifile.hh b/base/inifile.hh index b384fe21a..919732e1e 100644 --- a/base/inifile.hh +++ b/base/inifile.hh @@ -34,7 +34,7 @@ #include #include -#include "hashmap.hh" +#include "base/hashmap.hh" class IniFile { diff --git a/base/intmath.cc b/base/intmath.cc index 7a6858d16..b9a478ba0 100644 --- a/base/intmath.cc +++ b/base/intmath.cc @@ -26,7 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "intmath.hh" +#include "base/intmath.hh" int PrevPrime(int n) diff --git a/base/loader/aout_object.cc b/base/loader/aout_object.cc index c0f43a687..0270e02a3 100644 --- a/base/loader/aout_object.cc +++ b/base/loader/aout_object.cc @@ -28,14 +28,14 @@ #include -#include "aout_object.hh" +#include "base/loader/aout_object.hh" -#include "functional_memory.hh" -#include "symtab.hh" +#include "mem/functional_mem/functional_memory.hh" +#include "base/loader/symtab.hh" -#include "trace.hh" // for DPRINTF +#include "base/trace.hh" // for DPRINTF -#include "exec_aout.h" +#include "base/loader/exec_aout.h" using namespace std; diff --git a/base/loader/aout_object.hh b/base/loader/aout_object.hh index baa8904a8..77c59aef6 100644 --- a/base/loader/aout_object.hh +++ b/base/loader/aout_object.hh @@ -29,7 +29,7 @@ #ifndef __AOUT_OBJECT_HH__ #define __AOUT_OBJECT_HH__ -#include "object_file.hh" +#include "base/loader/object_file.hh" // forward decls: avoid including exec_aout.h here struct aout_exechdr; diff --git a/base/loader/ecoff_object.cc b/base/loader/ecoff_object.cc index 87ad6fdca..5e726a1c5 100644 --- a/base/loader/ecoff_object.cc +++ b/base/loader/ecoff_object.cc @@ -28,16 +28,16 @@ #include -#include "ecoff_object.hh" +#include "base/loader/ecoff_object.hh" -#include "functional_memory.hh" -#include "symtab.hh" +#include "mem/functional_mem/functional_memory.hh" +#include "base/loader/symtab.hh" -#include "trace.hh" // for DPRINTF +#include "base/trace.hh" // for DPRINTF -#include "exec_ecoff.h" -#include "coff_sym.h" -#include "coff_symconst.h" +#include "base/loader/exec_ecoff.h" +#include "base/loader/coff_sym.h" +#include "base/loader/coff_symconst.h" using namespace std; diff --git a/base/loader/ecoff_object.hh b/base/loader/ecoff_object.hh index af757cd0e..94b11c720 100644 --- a/base/loader/ecoff_object.hh +++ b/base/loader/ecoff_object.hh @@ -29,7 +29,7 @@ #ifndef __ECOFF_OBJECT_HH__ #define __ECOFF_OBJECT_HH__ -#include "object_file.hh" +#include "base/loader/object_file.hh" // forward decls: avoid including exec_ecoff.h here struct ecoff_exechdr; diff --git a/base/loader/elf_object.cc b/base/loader/elf_object.cc index 97f50e289..605895c9c 100644 --- a/base/loader/elf_object.cc +++ b/base/loader/elf_object.cc @@ -28,14 +28,14 @@ #include -#include "elf_object.hh" +#include "base/loader/elf_object.hh" -#include "functional_memory.hh" -#include "symtab.hh" +#include "mem/functional_mem/functional_memory.hh" +#include "base/loader/symtab.hh" -#include "trace.hh" // for DPRINTF +#include "base/trace.hh" // for DPRINTF -#include "exec_elf.h" +#include "base/loader/exec_elf.h" using namespace std; diff --git a/base/loader/elf_object.hh b/base/loader/elf_object.hh index c90f6ebd5..28f6bb243 100644 --- a/base/loader/elf_object.hh +++ b/base/loader/elf_object.hh @@ -29,7 +29,7 @@ #ifndef __ELF_OBJECT_HH__ #define __ELF_OBJECT_HH__ -#include "object_file.hh" +#include "base/loader/object_file.hh" // forward decls: avoid including exec_elf.hh here struct Elf64_Ehdr; diff --git a/base/loader/exec_aout.h b/base/loader/exec_aout.h index baed30c42..498e313cb 100644 --- a/base/loader/exec_aout.h +++ b/base/loader/exec_aout.h @@ -57,6 +57,6 @@ (N_GETMAGIC(ex) != NMAGIC && N_GETMAGIC(ex) != OMAGIC && \ N_GETMAGIC(ex) != ZMAGIC) -#include "aout_machdep.h" +#include "targetarch/aout_machdep.h" #endif /* !_SYS_EXEC_AOUT_H_ */ diff --git a/base/loader/exec_ecoff.h b/base/loader/exec_ecoff.h index 8c559ab90..0289c94ef 100644 --- a/base/loader/exec_ecoff.h +++ b/base/loader/exec_ecoff.h @@ -39,7 +39,7 @@ #ifndef _SYS_EXEC_ECOFF_H_ #define _SYS_EXEC_ECOFF_H_ -#include "ecoff_machdep.h" +#include "targetarch/ecoff_machdep.h" struct ecoff_filehdr { coff_ushort f_magic; /* magic number */ diff --git a/base/loader/object_file.cc b/base/loader/object_file.cc index 07b10b5ee..5a13d180c 100644 --- a/base/loader/object_file.cc +++ b/base/loader/object_file.cc @@ -35,13 +35,13 @@ #include #include -#include "cprintf.hh" -#include "object_file.hh" -#include "symtab.hh" +#include "base/cprintf.hh" +#include "base/loader/object_file.hh" +#include "base/loader/symtab.hh" -#include "ecoff_object.hh" -#include "aout_object.hh" -#include "elf_object.hh" +#include "base/loader/ecoff_object.hh" +#include "base/loader/aout_object.hh" +#include "base/loader/elf_object.hh" using namespace std; diff --git a/base/loader/object_file.hh b/base/loader/object_file.hh index 1e37b7b70..5950ea326 100644 --- a/base/loader/object_file.hh +++ b/base/loader/object_file.hh @@ -29,7 +29,7 @@ #ifndef __OBJECT_FILE_HH__ #define __OBJECT_FILE_HH__ -#include "isa_traits.hh" // for Addr +#include "targetarch/isa_traits.hh" // for Addr class FunctionalMemory; class SymbolTable; diff --git a/base/loader/symtab.cc b/base/loader/symtab.cc index 7beee182b..075c197a6 100644 --- a/base/loader/symtab.cc +++ b/base/loader/symtab.cc @@ -31,10 +31,10 @@ #include #include -#include "host.hh" -#include "misc.hh" -#include "str.hh" -#include "symtab.hh" +#include "sim/host.hh" +#include "base/misc.hh" +#include "base/str.hh" +#include "base/loader/symtab.hh" using namespace std; diff --git a/base/loader/symtab.hh b/base/loader/symtab.hh index 073325eba..49a811018 100644 --- a/base/loader/symtab.hh +++ b/base/loader/symtab.hh @@ -29,8 +29,8 @@ #ifndef __SYMTAB_HH__ #define __SYMTAB_HH__ -#include "hashmap.hh" -#include "isa_traits.hh" // for Addr +#include "base/hashmap.hh" +#include "targetarch/isa_traits.hh" // for Addr class SymbolTable { diff --git a/base/misc.cc b/base/misc.cc index 4a8facca8..e798dd656 100644 --- a/base/misc.cc +++ b/base/misc.cc @@ -29,12 +29,12 @@ #include #include -#include "cprintf.hh" -#include "host.hh" -#include "hostinfo.hh" -#include "misc.hh" -#include "trace.hh" -#include "universe.hh" +#include "base/cprintf.hh" +#include "sim/host.hh" +#include "base/hostinfo.hh" +#include "base/misc.hh" +#include "base/trace.hh" +#include "sim/universe.hh" using namespace std; diff --git a/base/misc.hh b/base/misc.hh index 3ac4d1491..45e6db35c 100644 --- a/base/misc.hh +++ b/base/misc.hh @@ -30,7 +30,7 @@ #define __MISC_HH__ #include -#include "cprintf.hh" +#include "base/cprintf.hh" // // This implements a cprintf based panic diff --git a/base/pollevent.cc b/base/pollevent.cc index fd08d4c4c..45a32581f 100644 --- a/base/pollevent.cc +++ b/base/pollevent.cc @@ -33,11 +33,11 @@ #include #include -#include "async.hh" -#include "host.hh" -#include "misc.hh" -#include "pollevent.hh" -#include "universe.hh" +#include "sim/async.hh" +#include "sim/host.hh" +#include "base/misc.hh" +#include "base/pollevent.hh" +#include "sim/universe.hh" PollQueue pollQueue; diff --git a/base/pollevent.hh b/base/pollevent.hh index 57e12f549..7ae37398c 100644 --- a/base/pollevent.hh +++ b/base/pollevent.hh @@ -31,7 +31,7 @@ #include #include -#include "universe.hh" +#include "sim/universe.hh" class PollEvent { diff --git a/base/random.cc b/base/random.cc index 42a169c06..f18ed546d 100644 --- a/base/random.cc +++ b/base/random.cc @@ -29,8 +29,8 @@ #include #include -#include "param.hh" -#include "random.hh" +#include "sim/param.hh" +#include "base/random.hh" using namespace std; diff --git a/base/random.hh b/base/random.hh index f1b383eda..5169c548a 100644 --- a/base/random.hh +++ b/base/random.hh @@ -29,7 +29,7 @@ #ifndef __RANDOM_HH__ #define __RANDOM_HH__ -#include "host.hh" +#include "sim/host.hh" long getLong(); double getDouble(); diff --git a/base/range.hh b/base/range.hh index dcc863e06..0d3383b01 100644 --- a/base/range.hh +++ b/base/range.hh @@ -31,8 +31,8 @@ #include -#include "intmath.hh" -#include "str.hh" +#include "base/intmath.hh" +#include "base/str.hh" template class Range diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc index 280b1cc23..0289f29db 100644 --- a/base/remote_gdb.cc +++ b/base/remote_gdb.cc @@ -93,17 +93,17 @@ #include -#include "exec_context.hh" -#include "intmath.hh" -#include "kgdb.h" - -#include "physical_memory.hh" -#include "remote_gdb.hh" -#include "socket.hh" -#include "trace.hh" -#include "vtophys.hh" -#include "system.hh" -#include "static_inst.hh" +#include "cpu/exec_context.hh" +#include "base/intmath.hh" +#include "base/kgdb.h" + +#include "mem/functional_mem/physical_memory.hh" +#include "base/remote_gdb.hh" +#include "base/socket.hh" +#include "base/trace.hh" +#include "targetarch/vtophys.hh" +#include "sim/system.hh" +#include "cpu/static_inst.hh" using namespace std; diff --git a/base/remote_gdb.hh b/base/remote_gdb.hh index 315860ead..ba827c382 100644 --- a/base/remote_gdb.hh +++ b/base/remote_gdb.hh @@ -29,10 +29,10 @@ #ifndef __REMOTE_GDB_HH__ #define __REMOTE_GDB_HH__ -#include "kgdb.h" -#include "pc_event.hh" -#include "pollevent.hh" -#include "socket.hh" +#include "base/kgdb.h" +#include "cpu/pc_event.hh" +#include "base/pollevent.hh" +#include "base/socket.hh" class System; class ExecContext; diff --git a/base/res_list.hh b/base/res_list.hh index a5005c906..ee2ab28a2 100644 --- a/base/res_list.hh +++ b/base/res_list.hh @@ -29,7 +29,7 @@ #ifndef __RES_LIST_HH__ #define __RES_LIST_HH__ -#include "cprintf.hh" +#include "base/cprintf.hh" #include #define DEBUG_REMOVE 0 diff --git a/base/sat_counter.cc b/base/sat_counter.cc index dc365f0f3..c26690a1a 100644 --- a/base/sat_counter.cc +++ b/base/sat_counter.cc @@ -28,10 +28,10 @@ #include -#include "sat_counter.hh" +#include "base/sat_counter.hh" -#include "statistics.hh" -#include "sim_stats.hh" +#include "base/statistics.hh" +#include "sim/sim_stats.hh" using namespace std; diff --git a/base/sat_counter.hh b/base/sat_counter.hh index 18eab3574..102feb5c6 100644 --- a/base/sat_counter.hh +++ b/base/sat_counter.hh @@ -31,10 +31,10 @@ #include -#include "predictor.hh" +#include "base/predictor.hh" -#include "statistics.hh" -#include "sim_stats.hh" +#include "base/statistics.hh" +#include "sim/sim_stats.hh" struct stat_sdb_t; diff --git a/base/sched_list.hh b/base/sched_list.hh index f5b90f571..0f922d63c 100644 --- a/base/sched_list.hh +++ b/base/sched_list.hh @@ -30,7 +30,7 @@ #define SCHED_LIST_HH #include -#include "misc.hh" +#include "base/misc.hh" // Any types you use this class for must be covered here... namespace { diff --git a/base/socket.cc b/base/socket.cc index 00fdf1ba3..63b693d94 100644 --- a/base/socket.cc +++ b/base/socket.cc @@ -35,9 +35,9 @@ #include #include -#include "host.hh" -#include "misc.hh" -#include "socket.hh" +#include "sim/host.hh" +#include "base/misc.hh" +#include "base/socket.hh" using namespace std; diff --git a/base/statistics.cc b/base/statistics.cc index f956de828..7c88e8f64 100644 --- a/base/statistics.cc +++ b/base/statistics.cc @@ -35,12 +35,12 @@ #include -#include "cprintf.hh" -#include "intmath.hh" -#include "misc.hh" -#include "statistics.hh" -#include "str.hh" -#include "universe.hh" +#include "base/cprintf.hh" +#include "base/intmath.hh" +#include "base/misc.hh" +#include "base/statistics.hh" +#include "base/str.hh" +#include "sim/universe.hh" #ifdef __M5_NAN float diff --git a/base/statistics.hh b/base/statistics.hh index 3d9d654ed..d9545ec9c 100644 --- a/base/statistics.hh +++ b/base/statistics.hh @@ -51,9 +51,9 @@ #include -#include "host.hh" -#include "refcnt.hh" -#include "str.hh" +#include "sim/host.hh" +#include "base/refcnt.hh" +#include "base/str.hh" #ifndef NAN float __nan(); diff --git a/base/str.cc b/base/str.cc index 19cbea27d..9c3964ce3 100644 --- a/base/str.cc +++ b/base/str.cc @@ -34,8 +34,8 @@ #include #include -#include "intmath.hh" -#include "str.hh" +#include "base/intmath.hh" +#include "base/str.hh" using namespace std; diff --git a/base/trace.cc b/base/trace.cc index d1baf3000..99e97e7ea 100644 --- a/base/trace.cc +++ b/base/trace.cc @@ -33,9 +33,9 @@ #include #include -#include "misc.hh" -#include "trace.hh" -#include "str.hh" +#include "base/misc.hh" +#include "base/trace.hh" +#include "base/str.hh" using namespace std; diff --git a/base/trace.hh b/base/trace.hh index 42cd1722b..528311ca2 100644 --- a/base/trace.hh +++ b/base/trace.hh @@ -31,9 +31,9 @@ #include -#include "cprintf.hh" -#include "host.hh" -#include "universe.hh" +#include "base/cprintf.hh" +#include "sim/host.hh" +#include "sim/universe.hh" #ifndef TRACING_ON #ifdef DEBUG @@ -43,7 +43,7 @@ #endif #endif -#include "trace_flags.hh" +#include "base/trace_flags.hh" namespace Trace { -- cgit v1.2.3