includes: fix up code after sorting

diff --git a/src/arch/power/isa/includes.isa b/src/arch/power/isa/includes.isa
index a9069710bdd1ff2c47c5bd50fb63acc1e6cf65e3..5c2b7414104e535563c5064edbbfb46078c06b2c 100644 (file)
--- a/src/arch/power/isa/includes.isa
+++ b/src/arch/power/isa/includes.isa
@@ -71,14 +71,13 @@ using std::isnan;
 
 output exec {{
 #include <cmath>
-
-#include "arch/power/faults.hh"
-#include "arch/power/isa_traits.hh"
-#include "arch/power/utility.hh"
 #if defined(linux)
 #include <fenv.h>
 #endif
 
+#include "arch/power/faults.hh"
+#include "arch/power/isa_traits.hh"
+#include "arch/power/utility.hh"
 #include "base/condcodes.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"

diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index bf2139caabd6e492b751096a0f6600f948f7c739..de55402726bf1fbf6fe29cb53c2f9c9564e45ddd 100644 (file)
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -50,7 +50,7 @@
 #include <algorithm>
 #include <cassert>
 #ifdef __SUNPRO_CC
-#include <cmath>
+#include <math.h>
 #endif
 #include <cmath>
 #include <functional>

diff --git a/src/base/stats/mysql.hh b/src/base/stats/mysql.hh
index a09ee095c74cc7890e9f7aa33540355735a0fb27..3422e48f9d49c97bfabb0e72012a1ecb6440e299 100644 (file)
--- a/src/base/stats/mysql.hh
+++ b/src/base/stats/mysql.hh
@@ -31,6 +31,8 @@
 #ifndef __BASE_STATS_MYSQL_HH__
 #define __BASE_STATS_MYSQL_HH__
 
+#include <cstdio>
+#include <list>
 #include <map>
 #include <string>
 
@@ -40,7 +42,8 @@
 namespace MySQL { class Connection; }
 namespace Stats {
 
-class DistInfo;
+class DistData;
+class DistParams;
 class MySqlRun;
 
 struct SetupStat
@@ -70,9 +73,9 @@ class InsertData
 {
   private:
     char *query;
-    size_type size;
+    std::size_t size;
     bool first;
-    static const size_type maxsize = 1024*1024;
+    static const std::size_t maxsize = 1024*1024;
 
   public:
     MySqlRun *run;

diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc
index 05bad04bfb8280b51c59464750a1966692eef704..ab5c7e8a92a0a9e382b9df0c0c1d4ad6db627d48 100644 (file)
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -33,12 +33,12 @@
 #endif
 
 #if defined(__sun)
-#include <cmath>
+#include <math.h>
 #endif
 
 #include <cassert>
 #ifdef __SUNPRO_CC
-#include <cmath>
+#include <math.h>
 #endif
 #include <cmath>
 #include <fstream>

diff --git a/src/base/stats/visit.hh b/src/base/stats/visit.hh
index fae7a88830f248fdf08dae71a2ac674bd108d700..606d1c633b61ad034fc8530830a681c3a3100916 100644 (file)
--- a/src/base/stats/visit.hh
+++ b/src/base/stats/visit.hh
@@ -37,7 +37,6 @@ class Info;
 class ScalarInfo;
 class VectorInfo;
 class DistInfo;
-class DistInfo;
 class VectorDistInfo;
 class Vector2dInfo;
 class FormulaInfo;

diff --git a/src/cpu/o3/commit.hh b/src/cpu/o3/commit.hh
index 2de381aeb5d76500acdd4340e82ad296d20a79dd..ffc2c16d218c71bb33db4984e31056c875a7d489 100644 (file)
--- a/src/cpu/o3/commit.hh
+++ b/src/cpu/o3/commit.hh
@@ -44,6 +44,8 @@
 #ifndef __CPU_O3_COMMIT_HH__
 #define __CPU_O3_COMMIT_HH__
 
+#include <queue>
+
 #include "base/statistics.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/inst_seq.hh"

diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index a48e5f046f0f3b8d1763a87c953dc51b04ed48c4..2512ab1f6ea28e268d7c7d6307fc5f1de8bb681a 100644 (file)
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -55,6 +55,7 @@
 #include "cpu/exetrace.hh"
 #include "cpu/timebuf.hh"
 #include "params/DerivO3CPU.hh"
+#include "sim/faults.hh"
 
 #if USE_CHECKER
 #include "cpu/checker/cpu.hh"

diff --git a/src/cpu/o3/decode_impl.hh b/src/cpu/o3/decode_impl.hh
index 5063e0f0721d3d85e6357d95abdaec359b6a756c..cee597716d1c43c82f120978b625533c36b1cd8f 100644 (file)
--- a/src/cpu/o3/decode_impl.hh
+++ b/src/cpu/o3/decode_impl.hh
@@ -28,8 +28,12 @@
  * Authors: Kevin Lim
  */
 
+#include "arch/types.hh"
+#include "base/trace.hh"
+#include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/decode.hh"
+#include "cpu/inst_seq.hh"
 #include "params/DerivO3CPU.hh"
 
 using namespace std;

diff --git a/src/cpu/o3/iew.hh b/src/cpu/o3/iew.hh
index d157b43836939bd992be84247136a064393f4482..75f6df7ab7411bb6803fbe07ee52cc052f47f81d 100644 (file)
--- a/src/cpu/o3/iew.hh
+++ b/src/cpu/o3/iew.hh
@@ -44,6 +44,7 @@
 #define __CPU_O3_IEW_HH__
 
 #include <queue>
+#include <set>
 
 #include "base/statistics.hh"
 #include "config/full_system.hh"

diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh
index 8b1bd4d00fe004c9c8326710cb8175beb995eba9..e76a6bc3d8e4362e6113f9ddf0668054f2963b0c 100644 (file)
--- a/src/cpu/o3/iew_impl.hh
+++ b/src/cpu/o3/iew_impl.hh
@@ -46,6 +46,7 @@
 
 #include <queue>
 
+#include "arch/utility.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/fu_pool.hh"
 #include "cpu/o3/iew.hh"

diff --git a/src/cpu/o3/lsq_unit.hh b/src/cpu/o3/lsq_unit.hh
index 36c2ff8c847af102acf3f3b9bbdde2d4b61b7497..2d9a6ce56dc621fc7cc85ff94905724465cc9c9b 100644 (file)
--- a/src/cpu/o3/lsq_unit.hh
+++ b/src/cpu/o3/lsq_unit.hh
@@ -44,6 +44,7 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
+#include "cpu/timebuf.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
 

diff --git a/src/cpu/o3/rob.hh b/src/cpu/o3/rob.hh
index 510c8c5dc031d29ae3ad383abc90e129d12a8ffa..fadd99849685aacaba50d5c04632ed141c3f5e3a 100644 (file)
--- a/src/cpu/o3/rob.hh
+++ b/src/cpu/o3/rob.hh
@@ -36,6 +36,8 @@
 #include <utility>
 #include <vector>
 
+#include "arch/registers.hh"
+#include "base/types.hh"
 #include "config/the_isa.hh"
 
 /**

diff --git a/src/cpu/smt.hh b/src/cpu/smt.hh
index d90a1833a6ebea888984a7025ad7d83b7450a489..e0993fc2ea2e0608d6dc27a82b4e4c02b19a9026 100644 (file)
--- a/src/cpu/smt.hh
+++ b/src/cpu/smt.hh
@@ -36,6 +36,8 @@
 #ifndef __SMT_HH__
 #define __SMT_HH__
 
+#include "base/types.hh"
+
 #ifndef SMT_MAX_THREADS
 /** The number of TPUs in any processor. */
 #define SMT_MAX_THREADS 4