changeset 845c8eb5ac49 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=845c8eb5ac49
description:
includes: fix up code after sorting
diffstat:
src/arch/power/isa/includes.isa | 7 +++----
src/base/statistics.hh | 2 +-
src/base/stats/mysql.hh | 9 ++++++---
src/base/stats/text.cc | 4 ++--
src/base/stats/visit.hh | 1 -
src/cpu/o3/commit.hh | 2 ++
src/cpu/o3/commit_impl.hh | 1 +
src/cpu/o3/decode_impl.hh | 4 ++++
src/cpu/o3/iew.hh | 1 +
src/cpu/o3/iew_impl.hh | 1 +
src/cpu/o3/lsq_unit.hh | 1 +
src/cpu/o3/rob.hh | 2 ++
src/cpu/smt.hh | 2 ++
13 files changed, 26 insertions(+), 11 deletions(-)
diffs (192 lines):
diff -r 78bf55f23338 -r 845c8eb5ac49 src/arch/power/isa/includes.isa
--- a/src/arch/power/isa/includes.isa Fri Apr 15 10:44:06 2011 -0700
+++ b/src/arch/power/isa/includes.isa Fri Apr 15 10:44:14 2011 -0700
@@ -71,14 +71,13 @@
output exec {{
#include <cmath>
+#if defined(linux)
+#include <fenv.h>
+#endif
#include "arch/power/faults.hh"
#include "arch/power/isa_traits.hh"
#include "arch/power/utility.hh"
-#if defined(linux)
-#include <fenv.h>
-#endif
-
#include "base/condcodes.hh"
#include "cpu/base.hh"
#include "cpu/exetrace.hh"
diff -r 78bf55f23338 -r 845c8eb5ac49 src/base/statistics.hh
--- a/src/base/statistics.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/base/statistics.hh Fri Apr 15 10:44:14 2011 -0700
@@ -50,7 +50,7 @@
#include <algorithm>
#include <cassert>
#ifdef __SUNPRO_CC
-#include <cmath>
+#include <math.h>
#endif
#include <cmath>
#include <functional>
diff -r 78bf55f23338 -r 845c8eb5ac49 src/base/stats/mysql.hh
--- a/src/base/stats/mysql.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/base/stats/mysql.hh Fri Apr 15 10:44:14 2011 -0700
@@ -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 @@
{
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 -r 78bf55f23338 -r 845c8eb5ac49 src/base/stats/text.cc
--- a/src/base/stats/text.cc Fri Apr 15 10:44:06 2011 -0700
+++ b/src/base/stats/text.cc Fri Apr 15 10:44:14 2011 -0700
@@ -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 -r 78bf55f23338 -r 845c8eb5ac49 src/base/stats/visit.hh
--- a/src/base/stats/visit.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/base/stats/visit.hh Fri Apr 15 10:44:14 2011 -0700
@@ -37,7 +37,6 @@
class ScalarInfo;
class VectorInfo;
class DistInfo;
-class DistInfo;
class VectorDistInfo;
class Vector2dInfo;
class FormulaInfo;
diff -r 78bf55f23338 -r 845c8eb5ac49 src/cpu/o3/commit.hh
--- a/src/cpu/o3/commit.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/cpu/o3/commit.hh Fri Apr 15 10:44:14 2011 -0700
@@ -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 -r 78bf55f23338 -r 845c8eb5ac49 src/cpu/o3/commit_impl.hh
--- a/src/cpu/o3/commit_impl.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/cpu/o3/commit_impl.hh Fri Apr 15 10:44:14 2011 -0700
@@ -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 -r 78bf55f23338 -r 845c8eb5ac49 src/cpu/o3/decode_impl.hh
--- a/src/cpu/o3/decode_impl.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/cpu/o3/decode_impl.hh Fri Apr 15 10:44:14 2011 -0700
@@ -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 -r 78bf55f23338 -r 845c8eb5ac49 src/cpu/o3/iew.hh
--- a/src/cpu/o3/iew.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/cpu/o3/iew.hh Fri Apr 15 10:44:14 2011 -0700
@@ -44,6 +44,7 @@
#define __CPU_O3_IEW_HH__
#include <queue>
+#include <set>
#include "base/statistics.hh"
#include "config/full_system.hh"
diff -r 78bf55f23338 -r 845c8eb5ac49 src/cpu/o3/iew_impl.hh
--- a/src/cpu/o3/iew_impl.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/cpu/o3/iew_impl.hh Fri Apr 15 10:44:14 2011 -0700
@@ -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 -r 78bf55f23338 -r 845c8eb5ac49 src/cpu/o3/lsq_unit.hh
--- a/src/cpu/o3/lsq_unit.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/cpu/o3/lsq_unit.hh Fri Apr 15 10:44:14 2011 -0700
@@ -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 -r 78bf55f23338 -r 845c8eb5ac49 src/cpu/o3/rob.hh
--- a/src/cpu/o3/rob.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/cpu/o3/rob.hh Fri Apr 15 10:44:14 2011 -0700
@@ -36,6 +36,8 @@
#include <utility>
#include <vector>
+#include "arch/registers.hh"
+#include "base/types.hh"
#include "config/the_isa.hh"
/**
diff -r 78bf55f23338 -r 845c8eb5ac49 src/cpu/smt.hh
--- a/src/cpu/smt.hh Fri Apr 15 10:44:06 2011 -0700
+++ b/src/cpu/smt.hh Fri Apr 15 10:44:14 2011 -0700
@@ -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
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
