diff options
Diffstat (limited to 'src/mem/cache/tags')
-rw-r--r-- | src/mem/cache/tags/base.cc | 3 | ||||
-rw-r--r-- | src/mem/cache/tags/base.hh | 3 | ||||
-rw-r--r-- | src/mem/cache/tags/cacheset.hh | 4 | ||||
-rw-r--r-- | src/mem/cache/tags/fa_lru.hh | 2 | ||||
-rw-r--r-- | src/mem/cache/tags/iic.cc | 2 | ||||
-rw-r--r-- | src/mem/cache/tags/iic.hh | 6 | ||||
-rw-r--r-- | src/mem/cache/tags/iic_repl/gen.cc | 2 | ||||
-rw-r--r-- | src/mem/cache/tags/iic_repl/repl.hh | 2 | ||||
-rw-r--r-- | src/mem/cache/tags/lru.cc | 2 | ||||
-rw-r--r-- | src/mem/cache/tags/lru.hh | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc index 41cc11b23..d4d7542a0 100644 --- a/src/mem/cache/tags/base.cc +++ b/src/mem/cache/tags/base.cc @@ -34,10 +34,9 @@ * Definitions of BaseTags. */ +#include "cpu/smt.hh" //maxThreadsPerCPU #include "mem/cache/tags/base.hh" - #include "mem/cache/base.hh" -#include "cpu/smt.hh" //maxThreadsPerCPU #include "sim/sim_exit.hh" using namespace std; diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh index 62ae4a032..93856c19e 100644 --- a/src/mem/cache/tags/base.hh +++ b/src/mem/cache/tags/base.hh @@ -38,8 +38,9 @@ #define __BASE_TAGS_HH__ #include <string> -#include "base/statistics.hh" + #include "base/callback.hh" +#include "base/statistics.hh" class BaseCache; diff --git a/src/mem/cache/tags/cacheset.hh b/src/mem/cache/tags/cacheset.hh index 135e993aa..a1cf937cf 100644 --- a/src/mem/cache/tags/cacheset.hh +++ b/src/mem/cache/tags/cacheset.hh @@ -36,9 +36,9 @@ #ifndef __CACHESET_HH__ #define __CACHESET_HH__ -#include "mem/cache/blk.hh" // base class -#include <assert.h> +#include <cassert> +#include "mem/cache/blk.hh" // base class /** * An associative set of cache blocks. diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh index 94ffeaa58..78f9ce1b4 100644 --- a/src/mem/cache/tags/fa_lru.hh +++ b/src/mem/cache/tags/fa_lru.hh @@ -39,8 +39,8 @@ #include <list> #include "base/hashmap.hh" -#include "mem/cache/blk.hh" #include "mem/cache/tags/base.hh" +#include "mem/cache/blk.hh" #include "mem/packet.hh" /** diff --git a/src/mem/cache/tags/iic.cc b/src/mem/cache/tags/iic.cc index 743c6894f..d0e97de02 100644 --- a/src/mem/cache/tags/iic.cc +++ b/src/mem/cache/tags/iic.cc @@ -40,8 +40,8 @@ #include "base/intmath.hh" #include "base/trace.hh" -#include "mem/cache/base.hh" #include "mem/cache/tags/iic.hh" +#include "mem/cache/base.hh" #include "sim/core.hh" using namespace std; diff --git a/src/mem/cache/tags/iic.hh b/src/mem/cache/tags/iic.hh index 5553b8ca3..0c3ea7a13 100644 --- a/src/mem/cache/tags/iic.hh +++ b/src/mem/cache/tags/iic.hh @@ -39,11 +39,11 @@ #include <list> #include <vector> -#include "mem/cache/blk.hh" -#include "mem/cache/tags/iic_repl/repl.hh" -#include "mem/packet.hh" #include "base/statistics.hh" +#include "mem/cache/tags/iic_repl/repl.hh" #include "mem/cache/tags/base.hh" +#include "mem/cache/blk.hh" +#include "mem/packet.hh" class BaseCache; // Forward declaration diff --git a/src/mem/cache/tags/iic_repl/gen.cc b/src/mem/cache/tags/iic_repl/gen.cc index 0d1b30220..7a1e7a110 100644 --- a/src/mem/cache/tags/iic_repl/gen.cc +++ b/src/mem/cache/tags/iic_repl/gen.cc @@ -38,8 +38,8 @@ #include "base/misc.hh" #include "base/types.hh" -#include "mem/cache/tags/iic.hh" #include "mem/cache/tags/iic_repl/gen.hh" +#include "mem/cache/tags/iic.hh" #include "params/GenRepl.hh" using namespace std; diff --git a/src/mem/cache/tags/iic_repl/repl.hh b/src/mem/cache/tags/iic_repl/repl.hh index c792e3350..994af5164 100644 --- a/src/mem/cache/tags/iic_repl/repl.hh +++ b/src/mem/cache/tags/iic_repl/repl.hh @@ -38,8 +38,8 @@ #ifndef __REPL_HH__ #define __REPL_HH__ -#include <string> #include <list> +#include <string> #include "base/types.hh" #include "cpu/smt.hh" diff --git a/src/mem/cache/tags/lru.cc b/src/mem/cache/tags/lru.cc index 25e98d293..33517a5f5 100644 --- a/src/mem/cache/tags/lru.cc +++ b/src/mem/cache/tags/lru.cc @@ -36,9 +36,9 @@ #include <string> #include "base/intmath.hh" -#include "mem/cache/base.hh" #include "mem/cache/tags/cacheset.hh" #include "mem/cache/tags/lru.hh" +#include "mem/cache/base.hh" #include "sim/core.hh" using namespace std; diff --git a/src/mem/cache/tags/lru.hh b/src/mem/cache/tags/lru.hh index ff9811046..4eb66b708 100644 --- a/src/mem/cache/tags/lru.hh +++ b/src/mem/cache/tags/lru.hh @@ -40,8 +40,8 @@ #include <cstring> #include <list> -#include "mem/cache/blk.hh" #include "mem/cache/tags/base.hh" +#include "mem/cache/blk.hh" #include "mem/packet.hh" class BaseCache; |