From 25693e9e691cd9c33cad44511877e2509797a9cd Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
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
---
 sim/debug.cc      |  8 ++++----
 sim/eventq.cc     | 10 +++++-----
 sim/eventq.hh     |  8 ++++----
 sim/main.cc       | 34 +++++++++++++++++-----------------
 sim/param.cc      | 16 ++++++++--------
 sim/param.hh      |  2 +-
 sim/prog.cc       | 26 +++++++++++++-------------
 sim/prog.hh       |  8 ++++----
 sim/serialize.cc  | 18 +++++++++---------
 sim/serialize.hh  |  4 ++--
 sim/sim_events.cc | 12 ++++++------
 sim/sim_events.hh |  2 +-
 sim/sim_object.cc | 14 +++++++-------
 sim/sim_object.hh |  4 ++--
 sim/sim_time.cc   |  2 +-
 sim/system.cc     | 18 +++++++++---------
 sim/system.hh     |  6 +++---
 sim/universe.cc   |  6 +++---
 18 files changed, 99 insertions(+), 99 deletions(-)

(limited to 'sim')

diff --git a/sim/debug.cc b/sim/debug.cc
index bfc5c9987..b18642942 100644
--- a/sim/debug.cc
+++ b/sim/debug.cc
@@ -33,10 +33,10 @@
 #include <string>
 #include <vector>
 
-#include "debug.hh"
-#include "eventq.hh"
-#include "param.hh"
-#include "sim_events.hh"
+#include "sim/debug.hh"
+#include "sim/eventq.hh"
+#include "sim/param.hh"
+#include "sim/sim_events.hh"
 
 using namespace std;
 
diff --git a/sim/eventq.cc b/sim/eventq.cc
index 36ef8aab2..6ffce4c0e 100644
--- a/sim/eventq.cc
+++ b/sim/eventq.cc
@@ -33,12 +33,12 @@
 #include <sstream>
 #include <vector>
 
-#include "smt.hh"
-#include "misc.hh"
+#include "cpu/full_cpu/smt.hh"
+#include "base/misc.hh"
 
-#include "eventq.hh"
-#include "trace.hh"
-#include "universe.hh"
+#include "sim/eventq.hh"
+#include "base/trace.hh"
+#include "sim/universe.hh"
 
 using namespace std;
 
diff --git a/sim/eventq.hh b/sim/eventq.hh
index 71b027768..df8e00bd8 100644
--- a/sim/eventq.hh
+++ b/sim/eventq.hh
@@ -40,11 +40,11 @@
 #include <string>
 #include <vector>
 
-#include "host.hh"	// for Tick
+#include "sim/host.hh"	// for Tick
 
-#include "fast_alloc.hh"
-#include "serialize.hh"
-#include "trace.hh"
+#include "base/fast_alloc.hh"
+#include "sim/serialize.hh"
+#include "base/trace.hh"
 
 class EventQueue;	// forward declaration
 
diff --git a/sim/main.cc b/sim/main.cc
index ebf96741d..ae4b5af77 100644
--- a/sim/main.cc
+++ b/sim/main.cc
@@ -37,23 +37,23 @@
 #include <string>
 #include <vector>
 
-#include "host.hh"
-#include "misc.hh"
-
-#include "copyright.hh"
-#include "inifile.hh"
-#include "configfile.hh"
-#include "pollevent.hh"
-#include "statistics.hh"
-#include "sim_events.hh"
-#include "sim_exit.hh"
-#include "sim_object.hh"
-#include "sim_stats.hh"
-#include "sim_time.hh"
-#include "smt.hh"
-
-#include "base_cpu.hh"
-#include "async.hh"
+#include "sim/host.hh"
+#include "base/misc.hh"
+
+#include "base/copyright.hh"
+#include "base/inifile.hh"
+#include "sim/configfile.hh"
+#include "base/pollevent.hh"
+#include "base/statistics.hh"
+#include "sim/sim_events.hh"
+#include "sim/sim_exit.hh"
+#include "sim/sim_object.hh"
+#include "sim/sim_stats.hh"
+#include "sim/sim_time.hh"
+#include "cpu/full_cpu/smt.hh"
+
+#include "cpu/base_cpu.hh"
+#include "sim/async.hh"
 
 using namespace std;
 
diff --git a/sim/param.cc b/sim/param.cc
index 432953670..8284983a8 100644
--- a/sim/param.cc
+++ b/sim/param.cc
@@ -34,14 +34,14 @@
 
 #include <assert.h>
 
-#include "param.hh"
-#include "sim_object.hh"
-#include "inifile.hh"
-#include "configfile.hh"
-#include "config_node.hh"
-#include "misc.hh"
-#include "str.hh"
-#include "trace.hh"
+#include "sim/param.hh"
+#include "sim/sim_object.hh"
+#include "base/inifile.hh"
+#include "sim/configfile.hh"
+#include "sim/config_node.hh"
+#include "base/misc.hh"
+#include "base/str.hh"
+#include "base/trace.hh"
 
 using namespace std;
 
diff --git a/sim/param.hh b/sim/param.hh
index 983032854..fb2c9dd44 100644
--- a/sim/param.hh
+++ b/sim/param.hh
@@ -33,7 +33,7 @@
 #include <string>
 #include <vector>
 
-#include "configfile.hh"
+#include "sim/configfile.hh"
 
 // forward decls
 class BaseParam;
diff --git a/sim/prog.cc b/sim/prog.cc
index 0c9191d5d..c52d51f63 100644
--- a/sim/prog.cc
+++ b/sim/prog.cc
@@ -32,19 +32,19 @@
 
 #include <string>
 
-#include "main_memory.hh"
-#include "prog.hh"
-
-#include "eio.hh"
-#include "intmath.hh"
-#include "thread.hh"
-#include "fake_syscall.hh"
-#include "object_file.hh"
-#include "exec_context.hh"
-#include "smt.hh"
-
-#include "statistics.hh"
-#include "sim_stats.hh"
+#include "mem/functional_mem/main_memory.hh"
+#include "sim/prog.hh"
+
+#include "eio/eio.hh"
+#include "base/intmath.hh"
+#include "cpu/full_cpu/thread.hh"
+#include "sim/fake_syscall.hh"
+#include "base/loader/object_file.hh"
+#include "cpu/exec_context.hh"
+#include "cpu/full_cpu/smt.hh"
+
+#include "base/statistics.hh"
+#include "sim/sim_stats.hh"
 
 using namespace std;
 
diff --git a/sim/prog.hh b/sim/prog.hh
index 0afd06ffd..ee4bc59fe 100644
--- a/sim/prog.hh
+++ b/sim/prog.hh
@@ -38,10 +38,10 @@
 
 #include <list>
 
-#include "isa_traits.hh"
-#include "sim_object.hh"
-#include "sim_stats.hh"
-#include "statistics.hh"
+#include "targetarch/isa_traits.hh"
+#include "sim/sim_object.hh"
+#include "sim/sim_stats.hh"
+#include "base/statistics.hh"
 
 class ExecContext;
 class FunctionalMemory;
diff --git a/sim/serialize.cc b/sim/serialize.cc
index a2e3d7250..6144c97d0 100644
--- a/sim/serialize.cc
+++ b/sim/serialize.cc
@@ -33,15 +33,15 @@
 #include <string>
 #include <vector>
 
-#include "misc.hh"
-
-#include "eventq.hh"
-#include "param.hh"
-#include "serialize.hh"
-#include "inifile.hh"
-#include "sim_events.hh"
-#include "sim_object.hh"
-#include "trace.hh"
+#include "base/misc.hh"
+
+#include "sim/eventq.hh"
+#include "sim/param.hh"
+#include "sim/serialize.hh"
+#include "base/inifile.hh"
+#include "sim/sim_events.hh"
+#include "sim/sim_object.hh"
+#include "base/trace.hh"
 
 using namespace std;
 
diff --git a/sim/serialize.hh b/sim/serialize.hh
index c5fb86140..ffcbbcdc2 100644
--- a/sim/serialize.hh
+++ b/sim/serialize.hh
@@ -37,8 +37,8 @@
 #include <list>
 #include <iostream>
 
-#include "host.hh"
-#include "configfile.hh"
+#include "sim/host.hh"
+#include "sim/configfile.hh"
 
 class IniFile;
 
diff --git a/sim/sim_events.cc b/sim/sim_events.cc
index 8a2481484..98480e76b 100644
--- a/sim/sim_events.cc
+++ b/sim/sim_events.cc
@@ -28,12 +28,12 @@
 
 #include <string>
 
-#include "cpu.hh"
-#include "eventq.hh"
-#include "hostinfo.hh"
-#include "sim_events.hh"
-#include "sim_exit.hh"
-#include "sim_stats.hh"
+#include "cpu/full_cpu/cpu.hh"
+#include "sim/eventq.hh"
+#include "base/hostinfo.hh"
+#include "sim/sim_events.hh"
+#include "sim/sim_exit.hh"
+#include "sim/sim_stats.hh"
 
 using namespace std;
 
diff --git a/sim/sim_events.hh b/sim/sim_events.hh
index e9a5f3251..b1ae7793a 100644
--- a/sim/sim_events.hh
+++ b/sim/sim_events.hh
@@ -29,7 +29,7 @@
 #ifndef __SIM_EVENTS_HH__
 #define __SIM_EVENTS_HH__
 
-#include "eventq.hh"
+#include "sim/eventq.hh"
 
 //
 // Event to terminate simulation at a particular cycle/instruction
diff --git a/sim/sim_object.cc b/sim/sim_object.cc
index 3583c30c2..955c43bb8 100644
--- a/sim/sim_object.cc
+++ b/sim/sim_object.cc
@@ -28,13 +28,13 @@
 
 #include <assert.h>
 
-#include "sim_object.hh"
-#include "inifile.hh"
-#include "configfile.hh"
-#include "host.hh"
-#include "misc.hh"
-#include "trace.hh"
-#include "sim_stats.hh"
+#include "sim/sim_object.hh"
+#include "base/inifile.hh"
+#include "sim/configfile.hh"
+#include "sim/host.hh"
+#include "base/misc.hh"
+#include "base/trace.hh"
+#include "sim/sim_stats.hh"
 
 using namespace std;
 
diff --git a/sim/sim_object.hh b/sim/sim_object.hh
index 141b58e0a..7f71d1852 100644
--- a/sim/sim_object.hh
+++ b/sim/sim_object.hh
@@ -38,8 +38,8 @@
 #include <vector>
 #include <iostream>
 
-#include "param.hh"
-#include "serialize.hh"
+#include "sim/param.hh"
+#include "sim/serialize.hh"
 
 /*
  * Abstract superclass for simulation objects.  Represents things that
diff --git a/sim/sim_time.cc b/sim/sim_time.cc
index c235be5db..3d91eba83 100644
--- a/sim/sim_time.cc
+++ b/sim/sim_time.cc
@@ -31,7 +31,7 @@
 #include <time.h>
 #include <iostream>
 
-#include "sim_time.hh"
+#include "sim/sim_time.hh"
 
 using namespace std;
 
diff --git a/sim/system.cc b/sim/system.cc
index 0f6dce10c..74216176a 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -26,15 +26,15 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "exec_context.hh"
-#include "object_file.hh"
-#include "memory_control.hh"
-#include "physical_memory.hh"
-#include "symtab.hh"
-#include "remote_gdb.hh"
-#include "vtophys.hh"
-#include "system.hh"
-#include "trace.hh"
+#include "cpu/exec_context.hh"
+#include "base/loader/object_file.hh"
+#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "base/loader/symtab.hh"
+#include "base/remote_gdb.hh"
+#include "targetarch/vtophys.hh"
+#include "sim/system.hh"
+#include "base/trace.hh"
 
 using namespace std;
 
diff --git a/sim/system.hh b/sim/system.hh
index bd2fd89b1..830e78f4a 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -31,9 +31,9 @@
 
 #include <string>
 
-#include "sim_object.hh"
-#include "pc_event.hh"
-#include "symtab.hh"
+#include "sim/sim_object.hh"
+#include "cpu/pc_event.hh"
+#include "base/loader/symtab.hh"
 
 class MemoryController;
 class PhysicalMemory;
diff --git a/sim/universe.cc b/sim/universe.cc
index 83f268b14..8274d84ca 100644
--- a/sim/universe.cc
+++ b/sim/universe.cc
@@ -30,9 +30,9 @@
 #include <string>
 #include <vector>
 
-#include "universe.hh"
-#include "host.hh"
-#include "param.hh"
+#include "sim/universe.hh"
+#include "sim/host.hh"
+#include "sim/param.hh"
 
 using namespace std;
 
-- 
cgit v1.2.3