summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2011-04-15 10:44:14 -0700
committerNathan Binkert <nate@binkert.org>2011-04-15 10:44:14 -0700
commitbbb1392c088f8c41e7e438380f5b5358c41c178a (patch)
tree616bde92e651a4e4e556ff2a002083e4037b5780 /src
parent39a055645f77e0fa7bf49406635dba6bd65e361f (diff)
downloadgem5-bbb1392c088f8c41e7e438380f5b5358c41c178a.tar.xz
includes: fix up code after sorting
Diffstat (limited to 'src')
-rw-r--r--src/arch/power/isa/includes.isa7
-rw-r--r--src/base/statistics.hh2
-rw-r--r--src/base/stats/mysql.hh9
-rw-r--r--src/base/stats/text.cc4
-rw-r--r--src/base/stats/visit.hh1
-rw-r--r--src/cpu/o3/commit.hh2
-rw-r--r--src/cpu/o3/commit_impl.hh1
-rw-r--r--src/cpu/o3/decode_impl.hh4
-rw-r--r--src/cpu/o3/iew.hh1
-rw-r--r--src/cpu/o3/iew_impl.hh1
-rw-r--r--src/cpu/o3/lsq_unit.hh1
-rw-r--r--src/cpu/o3/rob.hh2
-rw-r--r--src/cpu/smt.hh2
13 files changed, 26 insertions, 11 deletions
diff --git a/src/arch/power/isa/includes.isa b/src/arch/power/isa/includes.isa
index a9069710b..5c2b74141 100644
--- 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 bf2139caa..de5540272 100644
--- 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 a09ee095c..3422e48f9 100644
--- 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 05bad04bf..ab5c7e8a9 100644
--- 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 fae7a8883..606d1c633 100644
--- 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 2de381aeb..ffc2c16d2 100644
--- 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 a48e5f046..2512ab1f6 100644
--- 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 5063e0f07..cee597716 100644
--- 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 d157b4383..75f6df7ab 100644
--- 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 8b1bd4d00..e76a6bc3d 100644
--- 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 36c2ff8c8..2d9a6ce56 100644
--- 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 510c8c5dc..fadd99849 100644
--- 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 d90a1833a..e0993fc2e 100644
--- 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