Includes: Don't include isa_traits.hh and use the TheISA namespace unless really...

diff --git a/src/dev/baddev.cc b/src/dev/baddev.cc
index 356574c718593c56276619dd1664c756d309a7d2..1b4d04afc7e261a26efd45197fe959f44ca9c9e7 100644 (file)
--- 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 a91a5abf969826f83b141fe6f7c9cd62a0635c2a..c6078078682f9b20c13b81ffd5d2b2b93c401f29 100644 (file)
--- 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 5f6f1df813441dc8f063078ac0cff64a6f1ba76a..00d90a286e8ff21189f6519c808dcf2a8416d561 100644 (file)
--- 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 2f3802975e0035821003d036e5866491f2135c9c..83ba622e636c3b2cffe340e5130da5535f78ad26 100644 (file)
--- 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 6be09597c628e1ec7aa1becd551cf3edb175a528..bf17a303a446c5d26f547bf89b1809eabf20f0ef 100644 (file)
--- 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 bd9eb9accc720c730636cce27f5f168a40387694..d4ef886f0d16b602af7d2ade2451bfe1aa76a238 100644 (file)
--- 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 a6c2403ba008d41688387d48640747168b147fd0..700af37900b1c486fed16fa7ddd481fb14d93ec5 100644 (file)
--- 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 937fb80a2758a84c1832c31c40bd1a7b7b7f0f6e..db10e428cfaba5759bc427bcdc1db5df757ff454 100644 (file)
--- 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"