Where architecture independent sources included arch/alpha/xxx.hh, they were changed...

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

diff --git a/cpu/base_dyn_inst.cc b/cpu/base_dyn_inst.cc
index 296717f2ad14d1af7fff19c87cb86aa4cb59113b..633c0ee28d8da3221c3519406e7a4fa4985a566e 100644 (file)
--- 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 0a77b83dccd6a7410794e02baadd8dd7830ff569..786ed861dd6db32c534721e1e27f0c1107966762 100644 (file)
--- 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 e4de1d3044a87613df2473cfdb82e82ac16624f8..76ff4d689c4f69269d026313d2defefdd9b84428 100644 (file)
--- 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 321d61dce6d700fcd90111ebb156cfb0c7c0a010..f9e4495481a4385e46c336de39a7cea314967162 100644 (file)
--- 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 7e36a6eada85a78321c8f5308f4e9692bad2d1cb..85df06b76ff893f7c565b1537f243b3146b08fd2 100644 (file)
--- 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 009a81b980eeb658e9cb6a5db1d9e8e23c6e3d6b..581a72520d04fccf11419bc8d202dc045c690919 100644 (file)
--- 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 80cf80fb849b0509d1da2174a9fa8a4c28b45831..e7922902aba971efa8509dbdb0e08ecd683ee33a 100644 (file)
--- 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 def7e67d52a6d89cb7600a8184eaf81dc9caeb73..8eee3b1ece0b1c30bf9511adf026125c9be90771 100644 (file)
--- 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 31a3049f1245065939f0015186893e3bdc71c7b2..ff65389d225cfaaccd7f09fe8c3315468db36283 100644 (file)
--- 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 0a7e4608209cc0e3bcde0e554253929471cc196b..171470eb203aab9bd384c6ee81922ed906970525 100644 (file)
--- 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;