From 4b256577e01111e676f021c67478afec2289e175 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 27 Feb 2006 01:32:49 -0500
Subject: [PATCH] Where architecture independent sources included
 arch/alpha/xxx.hh, they were changed to include targetarch/xxx.hh

cpu/base_dyn_inst.cc:
cpu/o3/bpred_unit.hh:
cpu/o3/comm.hh:
cpu/o3/cpu.hh:
cpu/o3/regfile.hh:
cpu/ozone/cpu_impl.hh:
cpu/ozone/ea_list.cc:
cpu/ozone/ea_list.hh:
kern/kernel_stats.cc:
    Changed arch/alpha to targetarch
sim/process.cc:
    Changed arch/alpha to targetarch, and removed gaurding ifdef

--HG--
extra : convert_revision : 3c29e6baeb1cd900f7b5e11144a5d547a6c7c5ab
---
 cpu/base_dyn_inst.cc  | 2 +-
 cpu/o3/bpred_unit.hh  | 2 +-
 cpu/o3/comm.hh        | 2 +-
 cpu/o3/cpu.hh         | 2 +-
 cpu/o3/regfile.hh     | 6 +++---
 cpu/ozone/cpu_impl.hh | 2 +-
 cpu/ozone/ea_list.cc  | 2 +-
 cpu/ozone/ea_list.hh  | 2 +-
 kern/kernel_stats.cc  | 2 +-
 sim/process.cc        | 6 ++----
 10 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/cpu/base_dyn_inst.cc b/cpu/base_dyn_inst.cc
index 296717f2a..633c0ee28 100644
--- a/cpu/base_dyn_inst.cc
+++ b/cpu/base_dyn_inst.cc
@@ -36,7 +36,7 @@
 #include "base/cprintf.hh"
 #include "base/trace.hh"
 
-#include "arch/alpha/faults.hh"
+#include "targetarch/faults.hh"
 #include "cpu/exetrace.hh"
 #include "mem/mem_req.hh"
 
diff --git a/cpu/o3/bpred_unit.hh b/cpu/o3/bpred_unit.hh
index 0a77b83dc..786ed861d 100644
--- a/cpu/o3/bpred_unit.hh
+++ b/cpu/o3/bpred_unit.hh
@@ -30,7 +30,7 @@
 #define __BPRED_UNIT_HH__
 
 // For Addr type.
-#include "arch/alpha/isa_traits.hh"
+#include "targetarch/isa_traits.hh"
 #include "base/statistics.hh"
 #include "cpu/inst_seq.hh"
 
diff --git a/cpu/o3/comm.hh b/cpu/o3/comm.hh
index e4de1d304..76ff4d689 100644
--- a/cpu/o3/comm.hh
+++ b/cpu/o3/comm.hh
@@ -31,7 +31,7 @@
 
 #include <vector>
 
-#include "arch/alpha/isa_traits.hh"
+#include "targetarch/isa_traits.hh"
 #include "cpu/inst_seq.hh"
 #include "sim/host.hh"
 
diff --git a/cpu/o3/cpu.hh b/cpu/o3/cpu.hh
index 321d61dce..f9e449548 100644
--- a/cpu/o3/cpu.hh
+++ b/cpu/o3/cpu.hh
@@ -50,7 +50,7 @@
 #include "sim/process.hh"
 
 #if FULL_SYSTEM
-#include "arch/alpha/ev5.hh"
+#include "targetarch/ev5.hh"
 using namespace EV5;
 #endif
 
diff --git a/cpu/o3/regfile.hh b/cpu/o3/regfile.hh
index 7e36a6ead..85df06b76 100644
--- a/cpu/o3/regfile.hh
+++ b/cpu/o3/regfile.hh
@@ -31,14 +31,14 @@
 
 // @todo: Destructor
 
-#include "arch/alpha/isa_traits.hh"
-#include "arch/alpha/faults.hh"
+#include "targetarch/isa_traits.hh"
+#include "targetarch/faults.hh"
 #include "base/trace.hh"
 #include "config/full_system.hh"
 #include "cpu/o3/comm.hh"
 
 #if FULL_SYSTEM
-#include "arch/alpha/ev5.hh"
+#include "targetarch/ev5.hh"
 #include "kern/kernel_stats.hh"
 
 using namespace EV5;
diff --git a/cpu/ozone/cpu_impl.hh b/cpu/ozone/cpu_impl.hh
index 009a81b98..581a72520 100644
--- a/cpu/ozone/cpu_impl.hh
+++ b/cpu/ozone/cpu_impl.hh
@@ -29,7 +29,7 @@
 #ifndef __CPU_OOO_CPU_OOO_IMPL_HH__
 #define __CPU_OOO_CPU_OOO_IMPL_HH__
 
-#include "arch/alpha/isa_traits.hh"
+#include "targetarch/isa_traits.hh"
 
 template <class Impl>
 class OoOCPU;
diff --git a/cpu/ozone/ea_list.cc b/cpu/ozone/ea_list.cc
index 80cf80fb8..e7922902a 100644
--- a/cpu/ozone/ea_list.cc
+++ b/cpu/ozone/ea_list.cc
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "arch/alpha/isa_traits.hh"
+#include "targetarch/isa_traits.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/ooo_cpu/ea_list.hh"
 
diff --git a/cpu/ozone/ea_list.hh b/cpu/ozone/ea_list.hh
index def7e67d5..8eee3b1ec 100644
--- a/cpu/ozone/ea_list.hh
+++ b/cpu/ozone/ea_list.hh
@@ -32,7 +32,7 @@
 #include <list>
 #include <utility>
 
-#include "arch/alpha/isa_traits.hh"
+#include "targetarch/isa_traits.hh"
 #include "cpu/inst_seq.hh"
 
 /**
diff --git a/kern/kernel_stats.cc b/kern/kernel_stats.cc
index 31a3049f1..ff65389d2 100644
--- a/kern/kernel_stats.cc
+++ b/kern/kernel_stats.cc
@@ -30,7 +30,7 @@
 #include <stack>
 #include <string>
 
-#include "arch/alpha/osfpal.hh"
+#include "targetarch/osfpal.hh"
 #include "base/trace.hh"
 #include "cpu/exec_context.hh"
 #include "kern/kernel_stats.hh"
diff --git a/sim/process.cc b/sim/process.cc
index 0a7e46082..171470eb2 100644
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -48,10 +48,8 @@
 #include "sim/stats.hh"
 #include "sim/syscall_emul.hh"
 
-#ifdef TARGET_ALPHA
-#include "arch/alpha/alpha_tru64_process.hh"
-#include "arch/alpha/alpha_linux_process.hh"
-#endif
+#include "targetarch/alpha_tru64_process.hh"
+#include "targetarch/alpha_linux_process.hh"
 
 using namespace std;
 using namespace TheISA;
-- 
2.30.2