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 --- test/circletest.cc | 2 +- test/cprintftest.cc | 2 +- test/initest.cc | 2 +- test/nmtest.cc | 6 +++--- test/offtest.cc | 2 +- test/paramtest.cc | 4 ++-- test/rangetest.cc | 2 +- test/stattest.cc | 8 ++++---- test/strnumtest.cc | 2 +- test/symtest.cc | 4 ++-- test/tokentest.cc | 2 +- test/tracetest.cc | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) (limited to 'test') diff --git a/test/circletest.cc b/test/circletest.cc index 5123cfc9a..5c8f148a5 100644 --- a/test/circletest.cc +++ b/test/circletest.cc @@ -30,7 +30,7 @@ #include #include -#include "circlebuf.hh" +#include "base/circlebuf.hh" char *strings[] = { "This is the first test\n", diff --git a/test/cprintftest.cc b/test/cprintftest.cc index 87518c3c3..98af6b6ce 100644 --- a/test/cprintftest.cc +++ b/test/cprintftest.cc @@ -32,7 +32,7 @@ #include #include -#include "cprintf.hh" +#include "base/cprintf.hh" using namespace std; diff --git a/test/initest.cc b/test/initest.cc index d45e9eaa7..51089a46b 100644 --- a/test/initest.cc +++ b/test/initest.cc @@ -33,7 +33,7 @@ #include #include -#include "inifile.hh" +#include "base/inifile.hh" char *progname; diff --git a/test/nmtest.cc b/test/nmtest.cc index 701f83188..391536c0a 100644 --- a/test/nmtest.cc +++ b/test/nmtest.cc @@ -31,9 +31,9 @@ #include #include "ecoff.hh" -#include "object_file.hh" -#include "str.hh" -#include "symtab.hh" +#include "base/loader/object_file.hh" +#include "base/str.hh" +#include "base/loader/symtab.hh" Tick curTick; diff --git a/test/offtest.cc b/test/offtest.cc index 6970ecf72..f0f590973 100644 --- a/test/offtest.cc +++ b/test/offtest.cc @@ -29,7 +29,7 @@ #include #include #include -#include "pcireg.h" +#include "dev/pcireg.h" int main() diff --git a/test/paramtest.cc b/test/paramtest.cc index 343d75b91..d63a3aad4 100644 --- a/test/paramtest.cc +++ b/test/paramtest.cc @@ -32,8 +32,8 @@ // to the sources list, then use configs/test.ini as the configuration // file. // -#include "sim_object.hh" -#include "cache.hh" +#include "sim/sim_object.hh" +#include "mem/cache/cache.hh" class ParamTest : public SimObject { diff --git a/test/rangetest.cc b/test/rangetest.cc index 01c69bb26..f44d835b7 100644 --- a/test/rangetest.cc +++ b/test/rangetest.cc @@ -29,7 +29,7 @@ #include #include -#include "range.hh" +#include "base/range.hh" int diff --git a/test/stattest.cc b/test/stattest.cc index 02f65169a..a009c16d8 100644 --- a/test/stattest.cc +++ b/test/stattest.cc @@ -31,10 +31,10 @@ #include #include -#include "cprintf.hh" -#include "host.hh" -#include "misc.hh" -#include "statistics.hh" +#include "base/cprintf.hh" +#include "sim/host.hh" +#include "base/misc.hh" +#include "base/statistics.hh" using namespace std; using namespace Statistics; diff --git a/test/strnumtest.cc b/test/strnumtest.cc index 1e0a6676f..e971a7dfd 100644 --- a/test/strnumtest.cc +++ b/test/strnumtest.cc @@ -31,7 +31,7 @@ #include #include -#include "str.hh" +#include "base/str.hh" int main(int argc, char *argv[]) diff --git a/test/symtest.cc b/test/symtest.cc index bc03fc1df..4efa24cef 100644 --- a/test/symtest.cc +++ b/test/symtest.cc @@ -28,8 +28,8 @@ #include -#include "str.hh" -#include "symtab.hh" +#include "base/str.hh" +#include "base/loader/symtab.hh" Tick curTick = 0; diff --git a/test/tokentest.cc b/test/tokentest.cc index 4a4551883..eca34f4a2 100644 --- a/test/tokentest.cc +++ b/test/tokentest.cc @@ -30,7 +30,7 @@ #include #include -#include "str.hh" +#include "base/str.hh" int main(int argc, char *argv[]) diff --git a/test/tracetest.cc b/test/tracetest.cc index 51236123c..1ad454347 100644 --- a/test/tracetest.cc +++ b/test/tracetest.cc @@ -26,8 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "host.hh" -#include "trace.hh" +#include "sim/host.hh" +#include "base/trace.hh" using namespace std; -- cgit v1.2.3