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

diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc
index 29faa2c64c94eafe8cc585105885379056ad13c8..669fe92bb91bf5e3162be842f534a085a23e224a 100644 (file)
--- a/arch/alpha/alpha_memory.cc
+++ b/arch/alpha/alpha_memory.cc
@@ -30,12 +30,12 @@
 #include <string>
 #include <vector>
 
-#include "alpha_memory.hh"
-#include "ev5.hh"
-#include "exec_context.hh"
-#include "trace.hh"
-#include "inifile.hh"
-#include "str.hh"
+#include "targetarch/alpha_memory.hh"
+#include "targetarch/ev5.hh"
+#include "cpu/exec_context.hh"
+#include "base/trace.hh"
+#include "base/inifile.hh"
+#include "base/str.hh"
 
 using namespace std;
 

diff --git a/arch/alpha/alpha_memory.hh b/arch/alpha/alpha_memory.hh
index 06fea32e43179a52d4677a4fb8a4379b8b230cbe..88ea3ee947d828ef1c45cacd7e6917e46bee4551 100644 (file)
--- a/arch/alpha/alpha_memory.hh
+++ b/arch/alpha/alpha_memory.hh
@@ -31,9 +31,9 @@
 
 #include <map>
 
-#include "mem_req.hh"
-#include "sim_object.hh"
-#include "statistics.hh"
+#include "targetarch/mem_req.hh"
+#include "sim/sim_object.hh"
+#include "base/statistics.hh"
 
 class ExecContext;
 

diff --git a/arch/alpha/arguments.cc b/arch/alpha/arguments.cc
index 91e0576f5cf5ffffec8ef6264f3fb369aa863e0d..38f7a400c8f1c6a5bb72b37d517ba9dd3af284bb 100644 (file)
--- a/arch/alpha/arguments.cc
+++ b/arch/alpha/arguments.cc
@@ -26,10 +26,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "arguments.hh"
-#include "exec_context.hh"
-#include "physical_memory.hh"
-#include "vtophys.hh"
+#include "targetarch/arguments.hh"
+#include "cpu/exec_context.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "targetarch/vtophys.hh"
 
 AlphaArguments::Data::~Data()
 {

diff --git a/arch/alpha/arguments.hh b/arch/alpha/arguments.hh
index c5fdb60ad1b079fd85de9c5acf46279ed89f40c6..69c69d0d7213b4a7f66aec4d3c13d9b7c5e187a3 100644 (file)
--- a/arch/alpha/arguments.hh
+++ b/arch/alpha/arguments.hh
@@ -31,9 +31,9 @@
 
 #include <assert.h>
 
-#include "host.hh"
-#include "kernel.hh"
-#include "refcnt.hh"
+#include "sim/host.hh"
+#include "targetarch/kernel.hh"
+#include "base/refcnt.hh"
 
 class ExecContext;
 

diff --git a/arch/alpha/ev5.cc b/arch/alpha/ev5.cc
index c1631872ac5bfc23571c0abd97633a76b73fed3e..476a84d2634bb71a4a7ddcdbcb01a1ba61804c71 100644 (file)
--- a/arch/alpha/ev5.cc
+++ b/arch/alpha/ev5.cc
@@ -1,16 +1,16 @@
 /* $Id$ */
 
-#include "alpha_memory.hh"
-#include "annotation.hh"
+#include "targetarch/alpha_memory.hh"
+#include "sim/annotation.hh"
 #ifdef DEBUG
-#include "debug.hh"
+#include "sim/debug.hh"
 #endif
-#include "exec_context.hh"
-#include "sim_events.hh"
-#include "isa_traits.hh"
-#include "remote_gdb.hh"
-#include "kgdb.h"      // for ALPHA_KENTRY_IF
-#include "osfpal.hh"
+#include "cpu/exec_context.hh"
+#include "sim/sim_events.hh"
+#include "targetarch/isa_traits.hh"
+#include "base/remote_gdb.hh"
+#include "base/kgdb.h" // for ALPHA_KENTRY_IF
+#include "targetarch/osfpal.hh"
 
 #ifdef FULL_SYSTEM
 

diff --git a/arch/alpha/ev5.hh b/arch/alpha/ev5.hh
index c3330bc011eb3fd79855ce3bb1e777788ad31ffa..921aeb12d71ca004f51be5b88f21ae517f839718 100644 (file)
--- a/arch/alpha/ev5.hh
+++ b/arch/alpha/ev5.hh
@@ -7,7 +7,7 @@
 #error This code is only valid for EV5 systems
 #endif
 
-#include "isa_traits.hh"
+#include "targetarch/isa_traits.hh"
 
 void m5_exit();
 

diff --git a/arch/alpha/fake_syscall.cc b/arch/alpha/fake_syscall.cc
index ad3c86515ed93c55dda24858a3c74eea43f0ba53..584b078013b8aa1071f386156dc0bd8ba3a33005 100644 (file)
--- a/arch/alpha/fake_syscall.cc
+++ b/arch/alpha/fake_syscall.cc
@@ -32,18 +32,18 @@
 #include <sys/stat.h>
 #include <string.h>    // for memset()
 
-#include "host.hh"
-#include "base_cpu.hh"
-#include "functional_memory.hh"
-#include "prog.hh"
-#include "exec_context.hh"
-#include "fake_syscall.hh"
-#include "sim_events.hh"
-
-#include "osf_syscalls.h"
-#include "universe.hh" // for curTick & ticksPerSecond
-
-#include "trace.hh"
+#include "sim/host.hh"
+#include "cpu/base_cpu.hh"
+#include "mem/functional_mem/functional_memory.hh"
+#include "sim/prog.hh"
+#include "cpu/exec_context.hh"
+#include "sim/fake_syscall.hh"
+#include "sim/sim_events.hh"
+
+#include "targetarch/osf_syscalls.h"
+#include "sim/universe.hh"     // for curTick & ticksPerSecond
+
+#include "base/trace.hh"
 
 using namespace std;
 

diff --git a/arch/alpha/faults.cc b/arch/alpha/faults.cc
index c3c19eb58dcffd19ea4901dfdc0ebdd83bfa852b..a800f9886801e86e74b4ec217e9da8f5003225af 100644 (file)
--- a/arch/alpha/faults.cc
+++ b/arch/alpha/faults.cc
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "faults.hh"
+#include "targetarch/faults.hh"
 
 namespace {
     const char *

diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc
index e6ac01f281e402173c813c717298c690e855bec8..53f279b4e67d85fcd0c4091fb97dc176b9c9aa7e 100644 (file)
--- a/arch/alpha/isa_desc
+++ b/arch/alpha/isa_desc
@@ -18,20 +18,20 @@ let {{
 #include <fenv.h>
 #endif
 
-#include "static_inst.hh"
-#include "cprintf.hh"
-#include "misc.hh"
-#include "op_class.hh"
-
-#include "exec_context.hh"
-#include "simple_cpu.hh"
-#include "spec_state.hh"
-#include "cpu.hh"
-#include "exetrace.hh"
-#include "annotation.hh"
+#include "cpu/static_inst.hh"
+#include "base/cprintf.hh"
+#include "base/misc.hh"
+#include "cpu/full_cpu/op_class.hh"
+
+#include "cpu/exec_context.hh"
+#include "cpu/simple_cpu/simple_cpu.hh"
+#include "cpu/full_cpu/spec_state.hh"
+#include "cpu/full_cpu/cpu.hh"
+#include "cpu/exetrace.hh"
+#include "sim/annotation.hh"
 
 #ifdef FULL_SYSTEM
-#include "ev5.hh"
+#include "targetarch/ev5.hh"
 #endif
 
 namespace AlphaISA;

diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh
index d775056517888c370da516c843e7385f73511759..9840636e0c4d15f7c487fd05fb4a96308aba7ab5 100644 (file)
--- a/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@ -29,9 +29,9 @@
 #ifndef __ISA_TRAITS_HH__
 #define __ISA_TRAITS_HH__
 
-#include "host.hh"
-#include "faults.hh"
-#include "misc.hh"
+#include "sim/host.hh"
+#include "targetarch/faults.hh"
+#include "base/misc.hh"
 
 class CPU;
 class IniFile;
@@ -124,7 +124,7 @@ class AlphaISA
 
     typedef uint64_t InternalProcReg;
 
-#include "isa_fullsys_traits.hh"
+#include "targetarch/isa_fullsys_traits.hh"
 
 #else
     enum {
@@ -276,7 +276,7 @@ const int NumInterruptLevels = TheISA::NumInterruptLevels;
 
 // more stuff that should be imported here, but I'm too tired to do it
 // right now...
-#include "ev5.hh"
+#include "targetarch/ev5.hh"
 #endif
 
 #endif // __ALPHA_ISA_H__

diff --git a/arch/alpha/osfpal.cc b/arch/alpha/osfpal.cc
index 79665166620c2e24634769b06b726469957d1f9d..4c0ace8c06dde0af2e3284ca21f175e478be619e 100644 (file)
--- a/arch/alpha/osfpal.cc
+++ b/arch/alpha/osfpal.cc
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "osfpal.hh"
+#include "targetarch/osfpal.hh"
 
 namespace {
     const char *strings[PAL::NumCodes] = {

diff --git a/arch/alpha/vtophys.cc b/arch/alpha/vtophys.cc
index 33f8f02ad42df7a9b246ff499a400d3152262516..5dc0013fcd5be9d1c36a9eb45b5f8e5c2bc679fb 100644 (file)
--- a/arch/alpha/vtophys.cc
+++ b/arch/alpha/vtophys.cc
@@ -28,12 +28,12 @@
 
 #include <string>
 
-#include "pmap.h"
+#include "targetarch/pmap.h"
 
-#include "exec_context.hh"
-#include "physical_memory.hh"
-#include "trace.hh"
-#include "vtophys.hh"
+#include "cpu/exec_context.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "base/trace.hh"
+#include "targetarch/vtophys.hh"
 
 using namespace std;
 

diff --git a/arch/alpha/vtophys.hh b/arch/alpha/vtophys.hh
index 0b65a506f03d9f539bc4854f7b0b9c790776a7e5..8d121ec5bdc1aa115fc3a2e9f71c59e20983a62f 100644 (file)
--- a/arch/alpha/vtophys.hh
+++ b/arch/alpha/vtophys.hh
@@ -29,7 +29,7 @@
 #ifndef __VTOPHYS_H__
 #define __VTOPHYS_H__
 
-#include "pmap.h"
+#include "targetarch/pmap.h"
 
 inline bool entry_valid(uint64_t entry)
 { return (entry & ALPHA_PTE_VALID) != 0; }

diff --git a/base/circlebuf.cc b/base/circlebuf.cc
index 311de60b70f12caaf7ae48cfddd9ada43fce9688..77da26da63dd8b7019ba2a8b49d884d7e4d5cd3d 100644 (file)
--- a/base/circlebuf.cc
+++ b/base/circlebuf.cc
@@ -33,9 +33,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#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 a1933215a93dc3b569d05c8ee919bbf41136d043..8f235b80878c2850d9cd8ca7aa9fcf3a8a72625b 100644 (file)
--- a/base/compression/lzss_compression.cc
+++ b/base/compression/lzss_compression.cc
@@ -32,9 +32,9 @@
 
 #include <assert.h>
 
-#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 5fb47d3f1753d65aca6f31f38f7444c86b4d82be..755a52c9201a2b55a712b791059f2a0b3b1d554d 100644 (file)
--- 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 be6e64f5958acc9083bfcc4a0dbaa0ed46d483e8..945ad5b38a6f1fd610450407a77421f9ebe37176 100644 (file)
--- a/base/cprintf.cc
+++ b/base/cprintf.cc
@@ -31,7 +31,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "cprintf.hh"
+#include "base/cprintf.hh"
 
 using namespace std;
 

diff --git a/base/cprintf.hh b/base/cprintf.hh
index 2dc84502a6c80cecb4db2c2f3e323d0d8b6374c1..8360d227c57d34629d78781b464d7c3b012fe9f0 100644 (file)
--- 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 290e59113a8083cab78121960d286a3300794caf..ff0a40c37bd5d1aa070f61a635652d6cb76de44e 100644 (file)
--- a/base/fast_alloc.cc
+++ b/base/fast_alloc.cc
@@ -37,7 +37,7 @@
 #endif
 
 #include <assert.h>
-#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 c702d299981a158bbd0884a4faf58cef37e8faa0..d103d2e60db24366972954e3b360a9bda271c0e9 100644 (file)
--- 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<class T>
 void

diff --git a/base/fifo_buffer.hh b/base/fifo_buffer.hh
index 75690d36c016572691f9fe00d14bd6e4329d4f32..767db03a4fe961f17ae50298c950d3b07fad6811 100644 (file)
--- 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 21d4a818ef2710de4b62f5de14d1882c7cbaab05..10089980b2925bda61cc47dd32bf3ee65674c07a 100644 (file)
--- a/base/hashmap.hh
+++ b/base/hashmap.hh
@@ -37,7 +37,7 @@
 
 #include <string>
 
-#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 48c87612230a7584a90bed83e4bc76ddcb96e3cb..b530ae23750ab3d74c60388d870e7a14573fc95b 100644 (file)
--- a/base/hostinfo.cc
+++ b/base/hostinfo.cc
@@ -34,7 +34,7 @@
 #include <errno.h>
 #include <math.h>
 
-#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 3a5d1a61ef374c5f07fd6ab7e57ffbc180c87523..2293d2b6a7fbfcb4a96fff0c5cd7d9e6ae5f4dc6 100644 (file)
--- 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 ed7f781b2d2b7fbdf70f836071756380b81ccece..83ce7f9879e9f16f90bbb2a75929da9fd6898862 100644 (file)
--- a/base/hybrid_pred.cc
+++ b/base/hybrid_pred.cc
@@ -29,9 +29,9 @@
 #include <string>
 #include <sstream>
 
-#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 f6e14e3e3bb598645c8f50abbf3bfaed67854a0d..3fdab91534c9edc0bdd23ef4ef2917e9208c0e71 100644 (file)
--- a/base/hybrid_pred.hh
+++ b/base/hybrid_pred.hh
@@ -40,10 +40,10 @@
 
 #include <string>
 
-#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 33483bb3240cfbe464177dfa206a83a261a03399..46aa027fcd5b0096277bd43bd038acf9a20e03fb 100644 (file)
--- a/base/inet.cc
+++ b/base/inet.cc
@@ -29,9 +29,9 @@
 #include <sstream>
 #include <string>
 
-#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 1c48d073068859cb1e4ddf53246ca4e4623982bf..1ae2e854224b17771e5e1eba28faaaed814e0214 100644 (file)
--- 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 3f80ec2595a20f4e5139fae61fac514ea9e53c57..92d88c09b48fe40602dae24fdba0d39115ef405c 100644 (file)
--- a/base/inifile.cc
+++ b/base/inifile.cc
@@ -49,8 +49,8 @@
 #include <vector>
 #include <string>
 
-#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 b384fe21ac8f28f1784c8ef2ca29f3db070099dc..919732e1e6c22eee90a3adf38c967d5c8dc6f434 100644 (file)
--- a/base/inifile.hh
+++ b/base/inifile.hh
@@ -34,7 +34,7 @@
 #include <string>
 #include <vector>
 
-#include "hashmap.hh"
+#include "base/hashmap.hh"
 
 class IniFile
 {

diff --git a/base/intmath.cc b/base/intmath.cc
index 7a6858d16a96fcf42064dfa1f31841362df3b4af..b9a478ba030330cb50f9613f441e7dd8ad008f67 100644 (file)
--- 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 c0f43a68775dd9632e1fc5d21ed0a58fd627aa7c..0270e02a35367e07010833a4f5fcda0b630b210d 100644 (file)
--- a/base/loader/aout_object.cc
+++ b/base/loader/aout_object.cc
@@ -28,14 +28,14 @@
 
 #include <string>
 
-#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 baa8904a83f0ba6962676df8f83afc0d89787c8f..77c59aef6b67644bfff73505ee05ae95bd80dc4a 100644 (file)
--- 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 87ad6fdca1843048f54fe72bc6f7bd18961b2c90..5e726a1c5b0b94819d3ac7c542318e8d70c3b7f5 100644 (file)
--- a/base/loader/ecoff_object.cc
+++ b/base/loader/ecoff_object.cc
@@ -28,16 +28,16 @@
 
 #include <string>
 
-#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 af757cd0e5879fb8bed0a3f05f6f785b6a8017d9..94b11c7200df1c4f6859112bc3339a48a4c6b3db 100644 (file)
--- 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 97f50e289cd22a21e9bafbcd7bb585c792164206..605895c9c8e3f77213962f55a9ba55f6ca16873e 100644 (file)
--- a/base/loader/elf_object.cc
+++ b/base/loader/elf_object.cc
@@ -28,14 +28,14 @@
 
 #include <string>
 
-#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 c90f6ebd5de227b9c6842a8fe5a238513f3ab649..28f6bb24322d107da3e9c66aef94e3e03501f2e5 100644 (file)
--- 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 baed30c422b39421335b4a06135cb787836a1abd..498e313cb03c36b15730c1824829e7061c721e4c 100644 (file)
--- 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 8c559ab90e99a8eb4ddb2938e567ef566bb60f4b..0289c94ef010edb6ef130730cbb1dd83fe92543f 100644 (file)
--- 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 07b10b5eef4e1848448649a05fb57ed6f1cc02df..5a13d180ccb8650b46272f63b7dab0302537b095 100644 (file)
--- a/base/loader/object_file.cc
+++ b/base/loader/object_file.cc
@@ -35,13 +35,13 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#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 1e37b7b704be41d5387520d22a5e06ce68aa4151..5950ea326b445c099612f59bdcec5ef0aeb1b799 100644 (file)
--- 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 7beee182b4319981f1ee5794431c34dfa8d6c4b1..075c197a64238646ddff14f8e7c2db000686ae48 100644 (file)
--- a/base/loader/symtab.cc
+++ b/base/loader/symtab.cc
@@ -31,10 +31,10 @@
 #include <string>
 #include <vector>
 
-#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 073325ebabdb10ce7a1a902459e9839d63d3bd3b..49a811018d8e0a1e471142d5a883fb9b1f943afd 100644 (file)
--- 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 4a8facca82f2fc08b34216c9c52a6e5dfc4d5536..e798dd656781416b41d974b9402a6fa1647247dc 100644 (file)
--- a/base/misc.cc
+++ b/base/misc.cc
@@ -29,12 +29,12 @@
 #include <iostream>
 #include <string>
 
-#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 3ac4d1491b7280ce16ce15bc2901e13f695b54b5..45e6db35c2592dea0e460c0353af37036c519858 100644 (file)
--- a/base/misc.hh
+++ b/base/misc.hh
@@ -30,7 +30,7 @@
 #define __MISC_HH__
 
 #include <assert.h>
-#include "cprintf.hh"
+#include "base/cprintf.hh"
 
 //
 // This implements a cprintf based panic

diff --git a/base/pollevent.cc b/base/pollevent.cc
index fd08d4c4c4d1927f3ee4317396b16fd4a69280a9..45a32581f4dd34bf65326d195015483744133bdf 100644 (file)
--- a/base/pollevent.cc
+++ b/base/pollevent.cc
@@ -33,11 +33,11 @@
 #include <signal.h>
 #include <unistd.h>
 
-#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 57e12f54963a95517fa2def45fe492e7634d6dea..7ae37398cb77e0eb372e8001d10c093fa4486fa6 100644 (file)
--- a/base/pollevent.hh
+++ b/base/pollevent.hh
@@ -31,7 +31,7 @@
 
 #include <vector>
 #include <poll.h>
-#include "universe.hh"
+#include "sim/universe.hh"
 
 class PollEvent
 {

diff --git a/base/random.cc b/base/random.cc
index 42a169c068712b8a4042b590ee7ea6fc79e345b4..f18ed546d52cc6eca6aac3a35b2322ba49b12dd4 100644 (file)
--- a/base/random.cc
+++ b/base/random.cc
@@ -29,8 +29,8 @@
 #include <cstdlib>
 #include <cmath>
 
-#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 f1b383edaf88a1d3c448db74485f9f138fd4bfd2..5169c548a2bbc341d9854b94044c6a42e54ef083 100644 (file)
--- 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 dcc863e067db4d6dc2771abe5411318015834eb1..0d3383b01837ecf2c459d18ee459b6f0fd24207e 100644 (file)
--- a/base/range.hh
+++ b/base/range.hh
@@ -31,8 +31,8 @@
 
 #include <assert.h>
 
-#include "intmath.hh"
-#include "str.hh"
+#include "base/intmath.hh"
+#include "base/str.hh"
 
 template<class T>
 class Range

diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc
index 280b1cc239bf22f4ee712f68c926375a006d595e..0289f29db60426fe8a0c4b7fdc850701fc4810ee 100644 (file)
--- a/base/remote_gdb.cc
+++ b/base/remote_gdb.cc
@@ -93,17 +93,17 @@
 
 #include <string>
 
-#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 315860ead7b3bb0135d5924f667e3d36f042eba7..ba827c382f5963f7bd4e05d93100cdf1f09392bb 100644 (file)
--- 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 a5005c90653bd6dc3407156dc04ced6e74fcd70e..ee2ab28a291759ac4bb3f6f1f4408e444a9257ce 100644 (file)
--- 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 <assert.h>
 
 #define DEBUG_REMOVE 0

diff --git a/base/sat_counter.cc b/base/sat_counter.cc
index dc365f0f3dbee26d0f0eb46b7700b5224daac6b7..c26690a1a9b57db5e2edcc5f262779193603a864 100644 (file)
--- a/base/sat_counter.cc
+++ b/base/sat_counter.cc
@@ -28,10 +28,10 @@
 
 #include <sstream>
 
-#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 18eab3574174b75faf46f88b682afd22558d7b3a..102feb5c6847bac0d52c245ac901c2848e2a3a14 100644 (file)
--- a/base/sat_counter.hh
+++ b/base/sat_counter.hh
@@ -31,10 +31,10 @@
 
 #include <string>
 
-#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 f5b90f571a79b4e2c2d33d4d30494ac95bcd894c..0f922d63cefab4c18a65e24e1779d37bc4e4269d 100644 (file)
--- a/base/sched_list.hh
+++ b/base/sched_list.hh
@@ -30,7 +30,7 @@
 #define SCHED_LIST_HH
 
 #include <list>
-#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 00fdf1ba32c10ebee805cf5ea8e01c77054deb45..63b693d94219e3cf2c96b2a69793e38bdfe09a11 100644 (file)
--- a/base/socket.cc
+++ b/base/socket.cc
@@ -35,9 +35,9 @@
 #include <errno.h>
 #include <unistd.h>
 
-#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 f956de82825811a9cd45b4057e165ca42b62cae4..7c88e8f64441e5f1eb891a6fed7398eb08a91b27 100644 (file)
--- a/base/statistics.cc
+++ b/base/statistics.cc
@@ -35,12 +35,12 @@
 
 #include <math.h>
 
-#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 3d9d654ed24d67ea692aabc58c27c3b48fdbb86d..d9545ec9c20bab7b2f0ab5d59983a088fe0b0752 100644 (file)
--- a/base/statistics.hh
+++ b/base/statistics.hh
@@ -51,9 +51,9 @@
 
 #include <assert.h>
 
-#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 19cbea27d6ef223933021bf8205f9b6bb88f3749..9c3964ce3822986740f39cfb8c02209b8da4fc73 100644 (file)
--- a/base/str.cc
+++ b/base/str.cc
@@ -34,8 +34,8 @@
 #include <string>
 #include <vector>
 
-#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 d1baf30004af0c1181571f73d5f0ac799671071f..99e97e7eaec3152f7f6d0fba6d6a11e03f62bf8e 100644 (file)
--- a/base/trace.cc
+++ b/base/trace.cc
@@ -33,9 +33,9 @@
 #include <string>
 #include <vector>
 
-#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 42cd1722bbb6e825e2bd6cf64c04c4f3f5c543a5..528311ca264dbf50b7e0e65d0bf81718853ac2dd 100644 (file)
--- a/base/trace.hh
+++ b/base/trace.hh
@@ -31,9 +31,9 @@
 
 #include <vector>
 
-#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 {
 

diff --git a/cpu/base_cpu.cc b/cpu/base_cpu.cc
index 06b2ec65c85bd1e13caf57fa26b82feab0963fed..90785946e756159de7b6f07a449c08ae64c73591 100644 (file)
--- a/cpu/base_cpu.cc
+++ b/cpu/base_cpu.cc
@@ -30,11 +30,11 @@
 #include <sstream>
 #include <iostream>
 
-#include "base_cpu.hh"
-#include "cprintf.hh"
-#include "exec_context.hh"
-#include "misc.hh"
-#include "sim_events.hh"
+#include "cpu/base_cpu.hh"
+#include "base/cprintf.hh"
+#include "cpu/exec_context.hh"
+#include "base/misc.hh"
+#include "sim/sim_events.hh"
 
 using namespace std;
 

diff --git a/cpu/base_cpu.hh b/cpu/base_cpu.hh
index 745220d8557ef230531a9eeafff5ad6dc5d5031a..d5c3b68d8e614b5246f90dc0eb84095ae1c69ace 100644 (file)
--- a/cpu/base_cpu.hh
+++ b/cpu/base_cpu.hh
@@ -31,10 +31,10 @@
 
 #include <vector>
 
-#include "eventq.hh"
-#include "sim_object.hh"
+#include "sim/eventq.hh"
+#include "sim/sim_object.hh"
 
-#include "isa_traits.hh"       // for Addr
+#include "targetarch/isa_traits.hh"    // for Addr
 
 #ifdef FULL_SYSTEM
 class System;

diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc
index c81d172a85be6d8192e01fd3786a0aa219577630..87f7283aa7b5f33cdd143ebbaf97640b7d016b15 100644 (file)
--- a/cpu/exec_context.cc
+++ b/cpu/exec_context.cc
@@ -28,13 +28,13 @@
 
 #include <string>
 
-#include "base_cpu.hh"
-#include "exec_context.hh"
+#include "cpu/base_cpu.hh"
+#include "cpu/exec_context.hh"
 
 #ifdef FULL_SYSTEM
-#include "system.hh"
+#include "sim/system.hh"
 #else
-#include "prog.hh"
+#include "sim/prog.hh"
 #endif
 
 using namespace std;

diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh
index 988673a0f65101c964670aa48e8997dedfa17b26..5c1db629753e03419b5899bf860424a3f80eca6c 100644 (file)
--- a/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@ -29,8 +29,8 @@
 #ifndef __EXEC_CONTEXT_HH__
 #define __EXEC_CONTEXT_HH__
 
-#include "host.hh"
-#include "mem_req.hh"
+#include "sim/host.hh"
+#include "targetarch/mem_req.hh"
 
 // forward declaration: see functional_memory.hh
 class FunctionalMemory;
@@ -39,15 +39,15 @@ class BaseCPU;
 
 #ifdef FULL_SYSTEM
 
-#include "alpha_memory.hh"
+#include "targetarch/alpha_memory.hh"
 class MemoryController;
 
-#include "kernel_stats.hh"
-#include "system.hh"
+#include "kern/tru64/kernel_stats.hh"
+#include "sim/system.hh"
 
 #else // !FULL_SYSTEM
 
-#include "prog.hh"
+#include "sim/prog.hh"
 
 #endif // FULL_SYSTEM
 

diff --git a/cpu/exetrace.cc b/cpu/exetrace.cc
index 4c5d148938dfcd6baa16094a3708831ec57a956e..01f50e67564a54bb4d8f13688d5dc805fcc7186b 100644 (file)
--- a/cpu/exetrace.cc
+++ b/cpu/exetrace.cc
@@ -29,14 +29,14 @@
 #include <fstream>
 #include <iomanip>
 
-#include "dyn_inst.hh"
-#include "spec_state.hh"
-#include "issue.hh"
-#include "exetrace.hh"
-#include "exec_context.hh"
-#include "symtab.hh"
-#include "base_cpu.hh"
-#include "static_inst.hh"
+#include "cpu/full_cpu/dyn_inst.hh"
+#include "cpu/full_cpu/spec_state.hh"
+#include "cpu/full_cpu/issue.hh"
+#include "cpu/exetrace.hh"
+#include "cpu/exec_context.hh"
+#include "base/loader/symtab.hh"
+#include "cpu/base_cpu.hh"
+#include "cpu/static_inst.hh"
 
 using namespace std;
 

diff --git a/cpu/exetrace.hh b/cpu/exetrace.hh
index 2eb7753e559a9d722fc30f1a68b2d4f097d639f9..8e2ea6221938c749ef7c76b1e250c9607e363798 100644 (file)
--- a/cpu/exetrace.hh
+++ b/cpu/exetrace.hh
@@ -32,11 +32,11 @@
 #include <fstream>
 #include <vector>
 
-#include "host.hh"
-#include "inst_seq.hh" // for InstSeqNum
-#include "trace.hh"
-#include "exec_context.hh"
-#include "static_inst.hh"
+#include "sim/host.hh"
+#include "cpu/inst_seq.hh"     // for InstSeqNum
+#include "base/trace.hh"
+#include "cpu/exec_context.hh"
+#include "cpu/static_inst.hh"
 
 class BaseCPU;
 

diff --git a/cpu/intr_control.cc b/cpu/intr_control.cc
index 7ad32a2b9f37dc0a31893ffb56f3a01b7968b3ad..bce427eea1ff6a74083cf703f1bb12cf3c32bb4f 100644 (file)
--- a/cpu/intr_control.cc
+++ b/cpu/intr_control.cc
@@ -29,9 +29,9 @@
 #include <string>
 #include <vector>
 
-#include "base_cpu.hh"
-#include "intr_control.hh"
-#include "sim_object.hh"
+#include "cpu/base_cpu.hh"
+#include "cpu/intr_control.hh"
+#include "sim/sim_object.hh"
 
 using namespace std;
 

diff --git a/cpu/intr_control.hh b/cpu/intr_control.hh
index 660d6d70458f423ccee856798ac1e935d764a372..b8fa68f521aa58fbf3c377d94d626c168a3f5867 100644 (file)
--- a/cpu/intr_control.hh
+++ b/cpu/intr_control.hh
@@ -29,9 +29,9 @@
 #ifndef __INTR_CONTROL_HH__
 #define __INTR_CONTROL_HH__
 
-#include "misc.hh"
-#include "base_cpu.hh"
-#include "sim_object.hh"
+#include "base/misc.hh"
+#include "cpu/base_cpu.hh"
+#include "sim/sim_object.hh"
 
 class IntrControl : public SimObject
 {

diff --git a/cpu/memtest/memtest.cc b/cpu/memtest/memtest.cc
index 70b6fbf13fe9d5d87cf2eabe1245737a30ea9bf2..9deebb28204a6e9d021f970c2c6cc0f052cf2f69 100644 (file)
--- a/cpu/memtest/memtest.cc
+++ b/cpu/memtest/memtest.cc
@@ -33,14 +33,14 @@
 #include <iomanip>
 #include <vector>
 
-#include "memtest.hh"
-#include "misc.hh"
-#include "sim_events.hh"
-#include "main_memory.hh"
-#include "base_cache.hh"
-
-#include "statistics.hh"
-#include "sim_stats.hh"
+#include "cpu/memtest/memtest.hh"
+#include "base/misc.hh"
+#include "sim/sim_events.hh"
+#include "mem/functional_mem/main_memory.hh"
+#include "mem/cache/base_cache.hh"
+
+#include "base/statistics.hh"
+#include "sim/sim_stats.hh"
 
 using namespace std;
 

diff --git a/cpu/memtest/memtest.hh b/cpu/memtest/memtest.hh
index aa652abbd7626fa0d64b9d5aa19db04e44969690..36c9691e6bae66a2f29df630b649744bc8c427e8 100644 (file)
--- a/cpu/memtest/memtest.hh
+++ b/cpu/memtest/memtest.hh
@@ -29,14 +29,14 @@
 #ifndef __MEMTEST_HH__
 #define __MEMTEST_HH__
 
-#include "sim_object.hh"
-#include "mem_interface.hh"
-#include "functional_memory.hh"
-#include "base_cpu.hh"
-#include "exec_context.hh"
-
-#include "statistics.hh"
-#include "sim_stats.hh"
+#include "sim/sim_object.hh"
+#include "mem/mem_interface.hh"
+#include "mem/functional_mem/functional_memory.hh"
+#include "cpu/base_cpu.hh"
+#include "cpu/exec_context.hh"
+
+#include "base/statistics.hh"
+#include "sim/sim_stats.hh"
 
 class MemTest : public BaseCPU
 {

diff --git a/cpu/pc_event.cc b/cpu/pc_event.cc
index 4de425199fbfd8c5b424219e72daea9a6cb4a25d..d2490edf64c85454442d57a20ef5351eb291e256 100644 (file)
--- a/cpu/pc_event.cc
+++ b/cpu/pc_event.cc
@@ -31,20 +31,20 @@
 #include <string>
 #include <utility>
 
-#include "debug.hh"
-#include "exec_context.hh"
-#include "pc_event.hh"
-#include "trace.hh"
-#include "universe.hh"
+#include "sim/debug.hh"
+#include "cpu/exec_context.hh"
+#include "cpu/pc_event.hh"
+#include "base/trace.hh"
+#include "sim/universe.hh"
 
 #ifdef FULL_SYSTEM
-#include "arguments.hh"
-#include "pmap.h"
-#include "kernel.hh"
-#include "memory_control.hh"
-#include "cpu.hh"
-#include "system.hh"
-#include "bpred.hh"
+#include "targetarch/arguments.hh"
+#include "targetarch/pmap.h"
+#include "targetarch/kernel.hh"
+#include "mem/functional_mem/memory_control.hh"
+#include "cpu/full_cpu/cpu.hh"
+#include "sim/system.hh"
+#include "cpu/full_cpu/bpred.hh"
 #endif
 
 using namespace std;

diff --git a/cpu/pc_event.hh b/cpu/pc_event.hh
index 24442f5f49189140c7281412c7b5834ffaecbb1e..08c6fa59aceb9f19472fb5845b1661ed173654a0 100644 (file)
--- a/cpu/pc_event.hh
+++ b/cpu/pc_event.hh
@@ -31,7 +31,7 @@
 
 #include <vector>
 
-#include "mem_req.hh"
+#include "targetarch/mem_req.hh"
 
 class ExecContext;
 class PCEventQueue;

diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc
index 41a612318ea62a03eacfa4e6cdf3dccedb662f0f..2bbd74efa3dcb816f08710ef66821264c549e1e0 100644 (file)
--- a/cpu/simple_cpu/simple_cpu.cc
+++ b/cpu/simple_cpu/simple_cpu.cc
@@ -36,47 +36,47 @@
 #include <stdlib.h>
 #include <math.h>
 
-#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 c5671eb6f7dc2785dadaa8a67e56b33fe813e91b..658a92344a45dcca305e8994cadb5abd50579084 100644 (file)
--- 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

diff --git a/cpu/static_inst.cc b/cpu/static_inst.cc
index cf25d5f05feab54da01d9ac4099a96f4d83df0c4..4cb45a8181e374528587e0144b464a1d060dfe07 100644 (file)
--- a/cpu/static_inst.cc
+++ b/cpu/static_inst.cc
@@ -27,8 +27,8 @@
  */
 
 #include <iostream>
-#include "static_inst.hh"
-#include "universe.hh"
+#include "cpu/static_inst.hh"
+#include "sim/universe.hh"
 
 template <class ISA>
 StaticInstPtr<ISA> StaticInst<ISA>::nullStaticInstPtr;

diff --git a/cpu/static_inst.hh b/cpu/static_inst.hh
index b8f9cc00a76aa87a80570f028b2165d2204fdf2a..343a3d9b7765b75f29b5402a1af36dca487b68c8 100644 (file)
--- a/cpu/static_inst.hh
+++ b/cpu/static_inst.hh
@@ -32,12 +32,12 @@
 #include <bitset>
 #include <string>
 
-#include "host.hh"
-#include "hashmap.hh"
-#include "refcnt.hh"
+#include "sim/host.hh"
+#include "base/hashmap.hh"
+#include "base/refcnt.hh"
 
-#include "op_class.hh"
-#include "isa_traits.hh"
+#include "cpu/full_cpu/op_class.hh"
+#include "targetarch/isa_traits.hh"
 
 // forward declarations
 class ExecContext;

diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 6a1e2b1696e4d722d3351e55026dd6dd74291059..1d41ce08fed7c8389d02e5bc34c643669eea91f2 100644 (file)
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -35,17 +35,17 @@
 
 #include <string>
 
-#include "alpha_console.hh"
-#include "base_cpu.hh"
-#include "console.hh"
-#include "exec_context.hh"
-#include "memory_control.hh"
-#include "simple_disk.hh"
-#include "tlaser_clock.hh"
-#include "system.hh"
-#include "trace.hh"
-#include "inifile.hh"
-#include "str.hh"      // for to_number()
+#include "dev/alpha_console.hh"
+#include "cpu/base_cpu.hh"
+#include "dev/console.hh"
+#include "cpu/exec_context.hh"
+#include "mem/functional_mem/memory_control.hh"
+#include "dev/simple_disk.hh"
+#include "dev/tlaser_clock.hh"
+#include "sim/system.hh"
+#include "base/trace.hh"
+#include "base/inifile.hh"
+#include "base/str.hh" // for to_number()
 
 using namespace std;
 

diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh
index 518f5fccbab1ace6ffb657f3bbf7e8d97023f182..608e6ac00da180b574e74884185732487ea36f76 100644 (file)
--- a/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@ -33,9 +33,9 @@
 #ifndef __ALPHA_CONSOLE_HH__
 #define __ALPHA_CONSOLE_HH__
 
-#include "host.hh"
-#include "alpha_access.h"
-#include "mmap_device.hh"
+#include "sim/host.hh"
+#include "dev/alpha_access.h"
+#include "mem/functional_mem/mmap_device.hh"
 
 class BaseCPU;
 class SimConsole;

diff --git a/dev/console.cc b/dev/console.cc
index 8141a650836a19533d8570daede26c97b89a5216..e3be3168f2c11b3612584a240be4c51204b0b71d 100644 (file)
--- a/dev/console.cc
+++ b/dev/console.cc
@@ -16,13 +16,13 @@
 #include <sstream>
 #include <string>
 
-#include "misc.hh"
-#include "ev5.hh"
+#include "base/misc.hh"
+#include "targetarch/ev5.hh"
 
-#include "console.hh"
-#include "socket.hh"
-#include "trace.hh"
-#include "memory_control.hh"
+#include "dev/console.hh"
+#include "base/socket.hh"
+#include "base/trace.hh"
+#include "mem/functional_mem/memory_control.hh"
 
 using namespace std;
 

diff --git a/dev/console.hh b/dev/console.hh
index 092e6ea5304922acae385c71bad7cabd217f7f31..ba4250db4705668c6e91624a405a582215530641 100644 (file)
--- a/dev/console.hh
+++ b/dev/console.hh
@@ -9,11 +9,11 @@
 
 #include <iostream>
 
-#include "circlebuf.hh"
-#include "intr_control.hh"
-#include "pollevent.hh"
-#include "socket.hh"
-#include "sim_object.hh"
+#include "base/circlebuf.hh"
+#include "cpu/intr_control.hh"
+#include "base/pollevent.hh"
+#include "base/socket.hh"
+#include "sim/sim_object.hh"
 
 class ConsoleListener;
 class SimConsole : public SimObject

diff --git a/dev/disk_image.cc b/dev/disk_image.cc
index 17a7f3e9d750cdafa18c9ac5279779bcdad1159c..0a3955ed1833bacd9279bf243460f7674af87fe0 100644 (file)
--- a/dev/disk_image.cc
+++ b/dev/disk_image.cc
@@ -40,11 +40,11 @@
 #include <fstream>
 #include <string>
 
-#include "disk_image.hh"
-#include "misc.hh"
-#include "trace.hh"
-#include "sim_exit.hh"
-#include "callback.hh"
+#include "dev/disk_image.hh"
+#include "base/misc.hh"
+#include "base/trace.hh"
+#include "sim/sim_exit.hh"
+#include "base/callback.hh"
 
 using namespace std;
 

diff --git a/dev/disk_image.hh b/dev/disk_image.hh
index 2cfa1490afecab69ae9a8af76c77bbf21c5f56c7..12048a0426a431e121fdfd8fceb819d059f84054 100644 (file)
--- a/dev/disk_image.hh
+++ b/dev/disk_image.hh
@@ -35,8 +35,8 @@
 
 #include <fstream>
 
-#include "hashmap.hh"
-#include "sim_object.hh"
+#include "base/hashmap.hh"
+#include "sim/sim_object.hh"
 
 #define SectorSize (512)
 

diff --git a/dev/etherbus.cc b/dev/etherbus.cc
index fa5a622084b51006f494365eea5056cd22ce1c6c..fa1d842723cad462baaf9d746056ac17238c0593 100644 (file)
--- a/dev/etherbus.cc
+++ b/dev/etherbus.cc
@@ -36,12 +36,12 @@
 
 #include <math.h>
 
-#include "etherbus.hh"
-#include "etherdump.hh"
-#include "etherint.hh"
-#include "etherpkt.hh"
-#include "trace.hh"
-#include "universe.hh"
+#include "dev/etherbus.hh"
+#include "dev/etherdump.hh"
+#include "dev/etherint.hh"
+#include "dev/etherpkt.hh"
+#include "base/trace.hh"
+#include "sim/universe.hh"
 
 using namespace std;
 

diff --git a/dev/etherbus.hh b/dev/etherbus.hh
index f64aa45e1d3da6f66b46ebb7a397a9ba86d22ad7..f7f6333038e48561b7c23c828e29e611ed660618 100644 (file)
--- a/dev/etherbus.hh
+++ b/dev/etherbus.hh
@@ -33,9 +33,9 @@
 #ifndef __ETHERBUS_H__
 #define __ETHERBUS_H__
 
-#include "eventq.hh"
-#include "etherpkt.hh"
-#include "sim_object.hh"
+#include "sim/eventq.hh"
+#include "dev/etherpkt.hh"
+#include "sim/sim_object.hh"
 
 class EtherDump;
 class EtherInt;

diff --git a/dev/etherdump.cc b/dev/etherdump.cc
index 034db86aa1dfaccc6689539e26c56a8be0daf366..dcca0e45833b7e84346e6d25882b43eaafc36e0a 100644 (file)
--- a/dev/etherdump.cc
+++ b/dev/etherdump.cc
@@ -34,9 +34,9 @@
 
 #include <string>
 
-#include "universe.hh"
-#include "etherdump.hh"
-#include "universe.hh"
+#include "sim/universe.hh"
+#include "dev/etherdump.hh"
+#include "sim/universe.hh"
 
 using std::string;
 

diff --git a/dev/etherdump.hh b/dev/etherdump.hh
index 87824c470d213c3649494718e828c4dc01fd1f37..b3aefeb741aac589fa90201c88af9a28837cc865 100644 (file)
--- a/dev/etherdump.hh
+++ b/dev/etherdump.hh
@@ -34,8 +34,8 @@
 #define __ETHERDUMP_H__
 
 #include <fstream>
-#include "etherpkt.hh"
-#include "sim_object.hh"
+#include "dev/etherpkt.hh"
+#include "sim/sim_object.hh"
 
 /*
  * Simple object for creating a simple pcap style packet trace

diff --git a/dev/etherint.cc b/dev/etherint.cc
index 51b18c6aa581a78427ed5d50ed24dd25f2e5d1fd..2845ce729fb6fd603e9a0449fd2935340288f3ad 100644 (file)
--- a/dev/etherint.cc
+++ b/dev/etherint.cc
@@ -26,9 +26,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "etherint.hh"
-#include "misc.hh"
-#include "sim_object.hh"
+#include "dev/etherint.hh"
+#include "base/misc.hh"
+#include "sim/sim_object.hh"
 
 void
 EtherInt::setPeer(EtherInt *p)

diff --git a/dev/etherint.hh b/dev/etherint.hh
index 00e291fc99ab8163fb9228930e93e9e61d360241..1aa85f17ce15193889b94be3dd3ef390f209eb9d 100644 (file)
--- a/dev/etherint.hh
+++ b/dev/etherint.hh
@@ -36,8 +36,8 @@
 
 #include <string>
 
-#include "etherpkt.hh"
-#include "sim_object.hh"
+#include "dev/etherpkt.hh"
+#include "sim/sim_object.hh"
 
 /*
  * Class representing the actual interface between two ethernet

diff --git a/dev/etherlink.cc b/dev/etherlink.cc
index 1d3578e58ac56b263ab10db5dd2c5e1a7d6e2b66..699e9f331ba1215f821ad7f48a7da20364771cd5 100644 (file)
--- a/dev/etherlink.cc
+++ b/dev/etherlink.cc
@@ -36,12 +36,12 @@
 
 #include <math.h>
 
-#include "etherlink.hh"
-#include "etherdump.hh"
-#include "etherint.hh"
-#include "etherpkt.hh"
-#include "trace.hh"
-#include "universe.hh"
+#include "dev/etherlink.hh"
+#include "dev/etherdump.hh"
+#include "dev/etherint.hh"
+#include "dev/etherpkt.hh"
+#include "base/trace.hh"
+#include "sim/universe.hh"
 
 using namespace std;
 

diff --git a/dev/etherlink.hh b/dev/etherlink.hh
index b88d8042026be12d6d2fa7d4e03d026127a36cd2..a88fe24dfce6231f8b8e5c71ddba0442de81b271 100644 (file)
--- a/dev/etherlink.hh
+++ b/dev/etherlink.hh
@@ -33,11 +33,11 @@
 #ifndef __ETHERLINK_HH__
 #define __ETHERLINK_HH__
 
-#include "host.hh"
-#include "eventq.hh"
-#include "etherint.hh"
-#include "etherpkt.hh"
-#include "sim_object.hh"
+#include "sim/host.hh"
+#include "sim/eventq.hh"
+#include "dev/etherint.hh"
+#include "dev/etherpkt.hh"
+#include "sim/sim_object.hh"
 
 class EtherDump;
 

diff --git a/dev/etherpkt.hh b/dev/etherpkt.hh
index 4927cc7796f1da6fa3c6505705a71fc0ff274915..678b83b33611a9740ed111a94e4a35abe72c3925 100644 (file)
--- a/dev/etherpkt.hh
+++ b/dev/etherpkt.hh
@@ -35,9 +35,9 @@
 
 #include <memory>
 
-#include "host.hh"
+#include "sim/host.hh"
 
-#include "refcnt.hh"
+#include "base/refcnt.hh"
 
 /*
  * Reference counted class containing ethernet packet data

diff --git a/dev/ethertap.cc b/dev/ethertap.cc
index 6643cab30a67340b9765edc995aca7e954fb4690..e12c07c264151adb812819417ef45b1a631ca496 100644 (file)
--- a/dev/ethertap.cc
+++ b/dev/ethertap.cc
@@ -40,14 +40,14 @@
 #include <deque>
 #include <string>
 
-#include "etherdump.hh"
-#include "etherint.hh"
-#include "etherpkt.hh"
-#include "ethertap.hh"
-#include "pollevent.hh"
-#include "socket.hh"
-#include "trace.hh"
-#include "misc.hh"
+#include "dev/etherdump.hh"
+#include "dev/etherint.hh"
+#include "dev/etherpkt.hh"
+#include "dev/ethertap.hh"
+#include "base/pollevent.hh"
+#include "base/socket.hh"
+#include "base/trace.hh"
+#include "base/misc.hh"
 
 using namespace std;
 

diff --git a/dev/ethertap.hh b/dev/ethertap.hh
index 434df47b0ecca33c3962afdb991e907c59814637..6e99bd91d77112b3ae9a147e982215d7b7d95824 100644 (file)
--- a/dev/ethertap.hh
+++ b/dev/ethertap.hh
@@ -36,11 +36,11 @@
 #include <queue>
 #include <string>
 
-#include "etherint.hh"
-#include "etherpkt.hh"
-#include "eventq.hh"
-#include "pollevent.hh"
-#include "sim_object.hh"
+#include "dev/etherint.hh"
+#include "dev/etherpkt.hh"
+#include "sim/eventq.hh"
+#include "base/pollevent.hh"
+#include "sim/sim_object.hh"
 
 /*
  * Interface to connect a simulated ethernet device to the real world

diff --git a/dev/simple_disk.cc b/dev/simple_disk.cc
index 25645db5f46efa07c928b258224230a0d802e5fc..d26cf44ea182ebe2c85dcd187a662e2f3b456762 100644 (file)
--- a/dev/simple_disk.cc
+++ b/dev/simple_disk.cc
@@ -38,11 +38,11 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "disk_image.hh"
-#include "misc.hh"
-#include "physical_memory.hh"
-#include "simple_disk.hh"
-#include "trace.hh"
+#include "dev/disk_image.hh"
+#include "base/misc.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "dev/simple_disk.hh"
+#include "base/trace.hh"
 
 using namespace std;
 

diff --git a/dev/simple_disk.hh b/dev/simple_disk.hh
index bf684950d246616ac704770bb10b7b6ade357dba..935865ba4839fdc32221d16ed70cf0f05e5adce7 100644 (file)
--- a/dev/simple_disk.hh
+++ b/dev/simple_disk.hh
@@ -33,8 +33,8 @@
 #ifndef __SIMPLE_DISK_HH__
 #define __SIMPLE_DISK_HH__
 
-#include "physical_memory.hh"
-#include "sim_object.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "sim/sim_object.hh"
 
 class DiskImage;
 

diff --git a/kern/tru64/tru64_syscalls.cc b/kern/tru64/tru64_syscalls.cc
index dbaf4dbff5f44d7e83b00af7a4a4fe082c535bbc..e28c6729490eeee49d47af3ac8939bd683d065e3 100644 (file)
--- a/kern/tru64/tru64_syscalls.cc
+++ b/kern/tru64/tru64_syscalls.cc
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "tru64_syscalls.hh"
+#include "kern/tru64/tru64_syscalls.hh"
 
 namespace {
     const char *

diff --git a/kern/tru64/tru64_syscalls.hh b/kern/tru64/tru64_syscalls.hh
index 2e76234c0b6e8327f9129d019a390e4085c77e40..f4853e3f8b6fadd5ace39b506650ac31f8dfa6be 100644 (file)
--- a/kern/tru64/tru64_syscalls.hh
+++ b/kern/tru64/tru64_syscalls.hh
@@ -29,8 +29,8 @@
 #ifndef __TRU64_SYSCALLS_HH__
 #define __TRU64_SYSCALLS_HH__
 
-#include "syscalls.hh"
-#include "tru64.hh"
+#include "targetarch/syscalls.hh"
+#include "kern/tru64/tru64.hh"
 
 struct SystemCalls<Tru64>
 {

diff --git a/sim/debug.cc b/sim/debug.cc
index bfc5c998703b74047b8d97a0b24a15f872043ff4..b18642942c9a02e179ef9a50faa5d0b4a50fff71 100644 (file)
--- 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 36ef8aab29fbf092a5c64f87e773c848aadcdb6d..6ffce4c0e00c7c646453baa63db8f86397da1ee3 100644 (file)
--- 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 71b027768b06e1584b94066e4c2d033cab99146b..df8e00bd87f7ccbf4003b32168961232c3e1e172 100644 (file)
--- 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 ebf96741d1014bbff4f404beac3aa701b47ab7c5..ae4b5af77f5a70413027e1fa18a793ab5b0ca023 100644 (file)
--- 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 4329536705f7379a08ab636df66efb7393dfefc3..8284983a8b528a30fcd0e55333e9c1c152be35b8 100644 (file)
--- 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 98303285446b817ba5b8cca9ba57e7cac838b13c..fb2c9dd447d28e0d320c42b3f66db933f74f096b 100644 (file)
--- 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 0c9191d5dc7b590a6043757e0566dbeabdd8074c..c52d51f631d755178b54d1deab01d8ba1776734e 100644 (file)
--- 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 0afd06ffd1b6bf5ed1a6500fbeadac60e4569781..ee4bc59feb49dd4588c05836191737510f996add 100644 (file)
--- 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 a2e3d725024199ab7ec7875e2c1c8578cce28461..6144c97d053b5a5725c5e9eee2ae62334ab2fb41 100644 (file)
--- 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 c5fb86140efd18e2ed888676ba7cc03f809c9d0d..ffcbbcdc20203055708b7355d9a21febaefd069a 100644 (file)
--- 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 8a248148499bc2331f586923f8f63315edce4c2b..98480e76bfb069708669877dba5205c1aa398534 100644 (file)
--- 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 e9a5f3251abc6b416caea8941dad9a8e9cd5f0d5..b1ae7793aa92f47212ebf502a1c3d4182f465a56 100644 (file)
--- 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 3583c30c25af311865e4308aa6124b484ff6bb7b..955c43bb8a113849ad643c35e2b34f5b961df0bd 100644 (file)
--- 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 141b58e0a18f24dafd41660c03feb0aca0242a6b..7f71d185230293a2b5dba0071ab866bd79fb07a5 100644 (file)
--- 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 c235be5db12e02dca52547a301cabc067cac361d..3d91eba834108ee7e362d95ddd1ea7091edb7506 100644 (file)
--- 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 0f6dce10ce9838c6382843f9ad44f4aad42a5536..74216176a2dc6977398ae4dd286c861014c36d23 100644 (file)
--- 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 bd2fd89b14e622f176d6f6ef6832fb1612e68423..830e78f4abbf6c882b00d372ccfcea1ac987e469 100644 (file)
--- 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 83f268b1468c3c7aac31b877eeeb87e4667104c7..8274d84ca6a31f5f6e4c7d31dd41406bb424ea35 100644 (file)
--- 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;
 

diff --git a/test/circletest.cc b/test/circletest.cc
index 5123cfc9a145c474811a6d2a7b33d27ecb0cc2ea..5c8f148a598877b21948844953a3d94edb085884 100644 (file)
--- a/test/circletest.cc
+++ b/test/circletest.cc
@@ -30,7 +30,7 @@
 #include <iostream.h>
 #include <unistd.h>
 
-#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 87518c3c39d8b97bad1809eac3ad4f991375a5d0..98af6b6ceef41eb4492f556dcb0f537fa3481478 100644 (file)
--- a/test/cprintftest.cc
+++ b/test/cprintftest.cc
@@ -32,7 +32,7 @@
 #include <string>
 #include <sstream>
 
-#include "cprintf.hh"
+#include "base/cprintf.hh"
 
 using namespace std;
 

diff --git a/test/initest.cc b/test/initest.cc
index d45e9eaa7f8b552d1a0d25da39b2e5b00ba6f330..51089a46b86ad40fa064fd8edfe94c6138de006f 100644 (file)
--- a/test/initest.cc
+++ b/test/initest.cc
@@ -33,7 +33,7 @@
 #include <string>
 #include <vector>
 
-#include "inifile.hh"
+#include "base/inifile.hh"
 
 char *progname;
 

diff --git a/test/nmtest.cc b/test/nmtest.cc
index 701f831883bff79092ca29cc9a5162280d7ae1bb..391536c0a4733438eca0cca656cbfa6fb9f377e3 100644 (file)
--- a/test/nmtest.cc
+++ b/test/nmtest.cc
@@ -31,9 +31,9 @@
 #include <vector>
 
 #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 6970ecf72765b6c37b569659f68eb83b25926744..f0f5909733c324285a62bf96b0b841cc4032a905 100644 (file)
--- a/test/offtest.cc
+++ b/test/offtest.cc
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 #include <stddef.h>
 #include <stdio.h>
-#include "pcireg.h"
+#include "dev/pcireg.h"
 
 int
 main()

diff --git a/test/paramtest.cc b/test/paramtest.cc
index 343d75b9116f70a77584764b1a80808a97dc9b4b..d63a3aad48ea227ee06e7d8237a47c9a4ec1c5df 100644 (file)
--- 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 01c69bb26912873ab10071f16a0f012f62237c1a..f44d835b7f3f334426349a7f87f9da29e537a02b 100644 (file)
--- a/test/rangetest.cc
+++ b/test/rangetest.cc
@@ -29,7 +29,7 @@
 #include <iostream>
 #include <string>
 
-#include "range.hh"
+#include "base/range.hh"
 
 
 int

diff --git a/test/stattest.cc b/test/stattest.cc
index 02f65169aefdd5bb118e6508f220a08ac73a7a51..a009c16d833a3436f6a3a8987c14e5d77e29a24b 100644 (file)
--- a/test/stattest.cc
+++ b/test/stattest.cc
@@ -31,10 +31,10 @@
 #include <string>
 #include <unistd.h>
 
-#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 1e0a6676f9cf5c5db783f1b00f93c6a8ef51b4f9..e971a7dfd863d252903719591eb0ee68daaf6a3f 100644 (file)
--- a/test/strnumtest.cc
+++ b/test/strnumtest.cc
@@ -31,7 +31,7 @@
 #include <string>
 #include <vector>
 
-#include "str.hh"
+#include "base/str.hh"
 
 int
 main(int argc, char *argv[])

diff --git a/test/symtest.cc b/test/symtest.cc
index bc03fc1dfbd2526e0e17d7dca064470b326c7c8c..4efa24cef0b54e8285be3724821e2ca66d7eb193 100644 (file)
--- a/test/symtest.cc
+++ b/test/symtest.cc
@@ -28,8 +28,8 @@
 
 #include <iostream.h>
 
-#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 4a455188390d224da3d2273e7e0ac555a99fcb0d..eca34f4a2c3f7b72169e703adcf7480349561bf1 100644 (file)
--- a/test/tokentest.cc
+++ b/test/tokentest.cc
@@ -30,7 +30,7 @@
 #include <string>
 #include <vector>
 
-#include "str.hh"
+#include "base/str.hh"
 
 int
 main(int argc, char *argv[])

diff --git a/test/tracetest.cc b/test/tracetest.cc
index 51236123c6128f83c246f12222b87fa5a9e55cb3..1ad454347d90d9f689182fa498ed06ec23dd47d5 100644 (file)
--- 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;
 

diff --git a/util/tap/tap.cc b/util/tap/tap.cc
index 0ef49dfd7e89fe3608d96034611302980db7b31c..0d94f0b17c9d5697207f4b609542a27db09ea385 100644 (file)
--- a/util/tap/tap.cc
+++ b/util/tap/tap.cc
@@ -52,7 +52,7 @@ extern "C" {
 #include <list>
 #include <string>
 
-#include "cprintf.hh"
+#include "base/cprintf.hh"
 
 #define panic(arg...) \
   do { cprintf("Panic: " arg); exit(1); } while (0)