in the arch/alpha directory we should use arch/alpha, not

targetarch.

arch/alpha/alpha_memory.cc:
arch/alpha/arguments.cc:
arch/alpha/arguments.hh:
arch/alpha/faults.cc:
arch/alpha/isa_traits.hh:
arch/alpha/osfpal.cc:
arch/alpha/vtophys.cc:
arch/alpha/vtophys.hh:
    in the arch/alpha directory we should use arch/alpha, not
    targetarch.  sort includes while we're here.

--HG--
extra : convert_revision : 99a71540e2997173db5c1072cef910a26acc75b2

diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc
index 4a350dbfc60480293b693d5142af16dea3de36e3..b9187a92e1f0fc66a875eb20591f39700f0d7c6b 100644 (file)
--- a/arch/alpha/alpha_memory.cc
+++ b/arch/alpha/alpha_memory.cc
@@ -30,13 +30,13 @@
 #include <string>
 #include <vector>
 
+#include "arch/alpha/alpha_memory.hh"
+#include "arch/alpha/ev5.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"
 #include "base/trace.hh"
 #include "cpu/exec_context.hh"
 #include "sim/builder.hh"
-#include "targetarch/alpha_memory.hh"
-#include "targetarch/ev5.hh"
 
 using namespace std;
 

diff --git a/arch/alpha/arguments.cc b/arch/alpha/arguments.cc
index 2dca3f51e027d9c1408f1d36f8ea8614c4a5ce5c..905d6b9ae11193370c543c400d4e7116b8a78676 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 "arch/alpha/arguments.hh"
+#include "arch/alpha/vtophys.hh"
 #include "cpu/exec_context.hh"
 #include "mem/functional_mem/physical_memory.hh"
-#include "targetarch/arguments.hh"
-#include "targetarch/vtophys.hh"
 
 AlphaArguments::Data::~Data()
 {

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

diff --git a/arch/alpha/faults.cc b/arch/alpha/faults.cc
index a800f9886801e86e74b4ec217e9da8f5003225af..c98bb91a51e4057b3926d7d7049187022b176fa6 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 "targetarch/faults.hh"
+#include "arch/alpha/faults.hh"
 
 namespace {
     const char *

diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh
index 6559368e46ba59227dde5e98c34c929c26b7fb3f..c73e790241200f5be26d5b214b539678617235bf 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 "sim/host.hh"
-#include "targetarch/faults.hh"
+#include "arch/alpha/faults.hh"
 #include "base/misc.hh"
+#include "sim/host.hh"
 
 class FastCPU;
 class FullCPU;
@@ -125,7 +125,7 @@ class AlphaISA
 
     typedef uint64_t InternalProcReg;
 
-#include "targetarch/isa_fullsys_traits.hh"
+#include "arch/alpha/isa_fullsys_traits.hh"
 
 #else
     enum {
@@ -278,7 +278,7 @@ const int NumInterruptLevels = TheISA::NumInterruptLevels;
 
 // more stuff that should be imported here, but I'm too tired to do it
 // right now...
-#include "targetarch/ev5.hh"
+#include "arch/alpha/ev5.hh"
 #endif
 
 #endif // __ALPHA_ISA_H__

diff --git a/arch/alpha/osfpal.cc b/arch/alpha/osfpal.cc
index 2717079ab9085dd74620d92d10e307d82924cd6e..3cdc3864ae0ea84f8e23c77e02df97d65a1a0a9c 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 "targetarch/osfpal.hh"
+#include "arch/alpha/osfpal.hh"
 
 namespace {
     const char *strings[PAL::NumCodes] = {

diff --git a/arch/alpha/vtophys.cc b/arch/alpha/vtophys.cc
index ca6c280bc669c194624f6b2b82dadd88420622e4..493a2380e66d1f261e7a1568a65562a14b154931 100644 (file)
--- a/arch/alpha/vtophys.cc
+++ b/arch/alpha/vtophys.cc
@@ -28,12 +28,11 @@
 
 #include <string>
 
-#include "targetarch/pmap.h"
-
+#include "arch/alpha/pmap.h"
+#include "arch/alpha/vtophys.hh"
+#include "base/trace.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 7c22e33714e4e831ea6d102ded30c1a9a381fcae..f264049247c31cbe3e8d876f331be3242ef2eaf1 100644 (file)
--- a/arch/alpha/vtophys.hh
+++ b/arch/alpha/vtophys.hh
@@ -29,8 +29,8 @@
 #ifndef __VTOPHYS_H__
 #define __VTOPHYS_H__
 
-#include "targetarch/isa_traits.hh"
-#include "targetarch/pmap.h"
+#include "arch/alpha/isa_traits.hh"
+#include "arch/alpha/pmap.h"
 
 inline bool entry_valid(uint64_t entry)
 { return (entry & ALPHA_PTE_VALID) != 0; }