changeset a733a8eb6363 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=a733a8eb6363
description:
arch: Header clean up for NOISA resurrection
This patch is a first step to getting NOISA working again. A number of
redundant includes make life more difficult than it has to be and this
patch simply removes them. There are also some redundant forward
declarations removed.
diffstat:
src/base/vnc/vncserver.hh | 1 -
src/cpu/intr_control.hh | 1 -
src/cpu/static_inst.hh | 6 ------
src/dev/ns_gige.cc | 1 -
src/dev/sinic.cc | 2 --
src/kern/kernel_stats.hh | 5 +----
src/sim/stat_control.cc | 2 +-
7 files changed, 2 insertions(+), 16 deletions(-)
diffs (99 lines):
diff -r 29941c87f7b0 -r a733a8eb6363 src/base/vnc/vncserver.hh
--- a/src/base/vnc/vncserver.hh Wed Sep 04 13:22:55 2013 -0400
+++ b/src/base/vnc/vncserver.hh Wed Sep 04 13:22:55 2013 -0400
@@ -53,7 +53,6 @@
#include "base/circlebuf.hh"
#include "base/pollevent.hh"
#include "base/socket.hh"
-#include "cpu/intr_control.hh"
#include "params/VncServer.hh"
#include "sim/sim_object.hh"
diff -r 29941c87f7b0 -r a733a8eb6363 src/cpu/intr_control.hh
--- a/src/cpu/intr_control.hh Wed Sep 04 13:22:55 2013 -0400
+++ b/src/cpu/intr_control.hh Wed Sep 04 13:22:55 2013 -0400
@@ -35,7 +35,6 @@
#include <vector>
#include "base/misc.hh"
-#include "cpu/base.hh"
#include "params/IntrControl.hh"
#include "sim/sim_object.hh"
#include "sim/system.hh"
diff -r 29941c87f7b0 -r a733a8eb6363 src/cpu/static_inst.hh
--- a/src/cpu/static_inst.hh Wed Sep 04 13:22:55 2013 -0400
+++ b/src/cpu/static_inst.hh Wed Sep 04 13:22:55 2013 -0400
@@ -46,20 +46,14 @@
#include "sim/fault_fwd.hh"
// forward declarations
-struct AlphaSimpleImpl;
-struct OzoneImpl;
-struct SimpleImpl;
-class DynInst;
class Packet;
struct O3CPUImpl;
template <class Impl> class BaseO3DynInst;
typedef BaseO3DynInst<O3CPUImpl> O3DynInst;
-template <class Impl> class OzoneDynInst;
class InOrderDynInst;
class CheckerCPU;
-class FastCPU;
class AtomicSimpleCPU;
class TimingSimpleCPU;
class InorderCPU;
diff -r 29941c87f7b0 -r a733a8eb6363 src/dev/ns_gige.cc
--- a/src/dev/ns_gige.cc Wed Sep 04 13:22:55 2013 -0400
+++ b/src/dev/ns_gige.cc Wed Sep 04 13:22:55 2013 -0400
@@ -40,7 +40,6 @@
#include "base/inet.hh"
#include "base/types.hh"
#include "config/the_isa.hh"
-#include "cpu/thread_context.hh"
#include "debug/EthernetAll.hh"
#include "dev/etherlink.hh"
#include "dev/ns_gige.hh"
diff -r 29941c87f7b0 -r a733a8eb6363 src/dev/sinic.cc
--- a/src/dev/sinic.cc Wed Sep 04 13:22:55 2013 -0400
+++ b/src/dev/sinic.cc Wed Sep 04 13:22:55 2013 -0400
@@ -38,8 +38,6 @@
#include "base/inet.hh"
#include "base/types.hh"
#include "config/the_isa.hh"
-#include "cpu/intr_control.hh"
-#include "cpu/thread_context.hh"
#include "debug/EthernetAll.hh"
#include "dev/etherlink.hh"
#include "dev/sinic.hh"
diff -r 29941c87f7b0 -r a733a8eb6363 src/kern/kernel_stats.hh
--- a/src/kern/kernel_stats.hh Wed Sep 04 13:22:55 2013 -0400
+++ b/src/kern/kernel_stats.hh Wed Sep 04 13:22:55 2013 -0400
@@ -34,13 +34,10 @@
#include <string>
-#include "cpu/static_inst.hh"
+#include "config/the_isa.hh"
#include "sim/serialize.hh"
#include "sim/stats.hh"
-class BaseCPU;
-class ThreadContext;
-class FnEvent;
// What does kernel stats expect is included?
class System;
diff -r 29941c87f7b0 -r a733a8eb6363 src/sim/stat_control.cc
--- a/src/sim/stat_control.cc Wed Sep 04 13:22:55 2013 -0400
+++ b/src/sim/stat_control.cc Wed Sep 04 13:22:55 2013 -0400
@@ -59,7 +59,7 @@
#include "cpu/base.hh"
#endif
-#include "sim/eventq.hh"
+#include "sim/eventq_impl.hh"
#include "sim/stat_control.hh"
using namespace std;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
