13 files changed, 63 insertions, 63 deletions
diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc
index 29faa2c64..669fe92bb 100644
--- 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 06fea32e4..88ea3ee94 100644
--- 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 91e0576f5..38f7a400c 100644
--- 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 c5fdb60ad..69c69d0d7 100644
--- 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 c1631872a..476a84d26 100644
--- 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 c3330bc01..921aeb12d 100644
--- 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 ad3c86515..584b07801 100644
--- 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 c3c19eb58..a800f9886 100644
--- 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 e6ac01f28..53f279b4e 100644
--- 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 d77505651..9840636e0 100644
--- 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 796651666..4c0ace8c0 100644
--- 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 33f8f02ad..5dc0013fc 100644
--- 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 0b65a506f..8d121ec5b 100644
--- 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; }