From f05f35df99e2b9be3353d7585142b91139965e22 Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Wed, 23 Feb 2011 15:10:49 -0600
Subject: [PATCH] Includes: Don't include isa_traits.hh and use the TheISA
 namespace unless really needed.

---
 src/dev/baddev.cc                | 1 -
 src/dev/platform.cc              | 1 -
 src/dev/platform.hh              | 1 -
 src/dev/simple_disk.hh           | 1 -
 src/mem/cache/blk.hh             | 1 -
 src/mem/cache/builder.cc         | 1 -
 src/mem/cache/prefetch/tagged.cc | 1 -
 src/mem/physical.cc              | 1 +
 8 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/dev/baddev.cc b/src/dev/baddev.cc
index 356574c71..1b4d04afc 100644
--- a/src/dev/baddev.cc
+++ b/src/dev/baddev.cc
@@ -45,7 +45,6 @@
 #include "sim/system.hh"
 
 using namespace std;
-using namespace TheISA;
 
 BadDevice::BadDevice(Params *p)
     : BasicPioDevice(p), devname(p->devicename)
diff --git a/src/dev/platform.cc b/src/dev/platform.cc
index a91a5abf9..c60780786 100644
--- a/src/dev/platform.cc
+++ b/src/dev/platform.cc
@@ -35,7 +35,6 @@
 #include "sim/sim_exit.hh"
 
 using namespace std;
-using namespace TheISA;
 
 Platform::Platform(const Params *p)
     : SimObject(p), intrctrl(p->intrctrl)
diff --git a/src/dev/platform.hh b/src/dev/platform.hh
index 5f6f1df81..00d90a286 100644
--- a/src/dev/platform.hh
+++ b/src/dev/platform.hh
@@ -41,7 +41,6 @@
 #include <set>
 
 #include "sim/sim_object.hh"
-#include "arch/isa_traits.hh"
 #include "params/Platform.hh"
 
 class PciConfigAll;
diff --git a/src/dev/simple_disk.hh b/src/dev/simple_disk.hh
index 2f3802975..83ba622e6 100644
--- a/src/dev/simple_disk.hh
+++ b/src/dev/simple_disk.hh
@@ -36,7 +36,6 @@
 #define __DEV_SIMPLE_DISK_HH__
 
 #include "sim/sim_object.hh"
-#include "arch/isa_traits.hh"
 #include "params/SimpleDisk.hh"
 
 class DiskImage;
diff --git a/src/mem/cache/blk.hh b/src/mem/cache/blk.hh
index 6be09597c..bf17a303a 100644
--- a/src/mem/cache/blk.hh
+++ b/src/mem/cache/blk.hh
@@ -39,7 +39,6 @@
 
 #include "base/printable.hh"
 #include "sim/core.hh"          // for Tick
-#include "arch/isa_traits.hh"   // for Addr
 #include "mem/packet.hh"
 #include "mem/request.hh"
 
diff --git a/src/mem/cache/builder.cc b/src/mem/cache/builder.cc
index bd9eb9acc..d4ef886f0 100644
--- a/src/mem/cache/builder.cc
+++ b/src/mem/cache/builder.cc
@@ -64,7 +64,6 @@
 
 
 using namespace std;
-using namespace TheISA;
 
 #define BUILD_CACHE(TAGS, tags)                         \
     do {                                                \
diff --git a/src/mem/cache/prefetch/tagged.cc b/src/mem/cache/prefetch/tagged.cc
index a6c2403ba..700af3790 100644
--- a/src/mem/cache/prefetch/tagged.cc
+++ b/src/mem/cache/prefetch/tagged.cc
@@ -33,7 +33,6 @@
  * Describes a tagged prefetcher based on template policies.
  */
 
-#include "arch/isa_traits.hh"
 #include "mem/cache/prefetch/tagged.hh"
 
 TaggedPrefetcher::TaggedPrefetcher(const BaseCacheParams *p)
diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index 937fb80a2..db10e428c 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -53,6 +53,7 @@
 #include <iostream>
 #include <string>
 
+#include "arch/isa_traits.hh"
 #include "arch/registers.hh"
 #include "base/intmath.hh"
 #include "base/misc.hh"
-- 
2.30.2