Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38995 )
Change subject: misc: Fix missing includes.
..
misc: Fix missing includes.
Change-Id: I545ff03041e8fe66dc489c6aa95c009e54df0970
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38995
Reviewed-by: Gabe Black
Maintainer: Gabe Black
Tested-by: kokoro
---
M src/arch/x86/pagetable.hh
M src/base/pollevent.hh
M src/base/remote_gdb.hh
M src/base/trace.hh
M src/cpu/testers/traffic_gen/base_gen.hh
M src/gpu-compute/fetch_stage.hh
M src/gpu-compute/fetch_unit.hh
M src/mem/multi_level_page_table.hh
M src/mem/physical.hh
M src/mem/request.hh
M src/mem/ruby/slicc_interface/RubySlicc_Util.hh
11 files changed, 34 insertions(+), 13 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/x86/pagetable.hh b/src/arch/x86/pagetable.hh
index 803d0de..36dffd7 100644
--- a/src/arch/x86/pagetable.hh
+++ b/src/arch/x86/pagetable.hh
@@ -39,18 +39,15 @@
#ifndef __ARCH_X86_PAGETABLE_HH__
#define __ARCH_X86_PAGETABLE_HH__
-#include
-#include
-#include
+#include
#include "arch/x86/isa_traits.hh"
#include "base/bitunion.hh"
#include "base/types.hh"
#include "base/trie.hh"
-#include "debug/MMU.hh"
#include "mem/port_proxy.hh"
+#include "sim/serialize.hh"
-class Checkpoint;
class ThreadContext;
namespace X86ISA
diff --git a/src/base/pollevent.hh b/src/base/pollevent.hh
index 28e16a6..5efa4fd 100644
--- a/src/base/pollevent.hh
+++ b/src/base/pollevent.hh
@@ -34,8 +34,8 @@
#include
#include "sim/core.hh"
+#include "sim/serialize.hh"
-class Checkpoint;
class PollQueue;
class PollEvent : public Serializable
diff --git a/src/base/remote_gdb.hh b/src/base/remote_gdb.hh
index 3ab0feb..c71abfe 100644
--- a/src/base/remote_gdb.hh
+++ b/src/base/remote_gdb.hh
@@ -44,15 +44,17 @@
#include
+#include
#include
#include
#include
#include "arch/types.hh"
-#include "base/intmath.hh"
#include "base/pollevent.hh"
#include "base/socket.hh"
+#include "base/types.hh"
#include "cpu/pc_event.hh"
+#include "sim/eventq.hh"
class System;
class ThreadContext;
diff --git a/src/base/trace.hh b/src/base/trace.hh
index aafb9c8..34997ed 100644
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -33,7 +33,9 @@
#define __BASE_TRACE_HH__
#include
+#include
+#include "base/compiler.hh"
#include "base/cprintf.hh"
#include "base/debug.hh"
#include "base/match.hh"
diff --git a/src/cpu/testers/traffic_gen/base_gen.hh
b/src/cpu/testers/traffic_gen/base_gen.hh
index ab9d385..8d50033 100644
--- a/src/cpu/testers/traffic_gen/base_gen.hh
+++ b/src/cpu/testers/traffic_gen/base_gen.hh
@@ -43,11 +43,14 @@
#ifndef __CPU_TRAFFIC_GEN_BASE_GEN_HH__
#define __CPU_TRAFFIC_GEN_BASE_GEN_HH__
-#include "base/bitfield.hh"
-#include "base/intmath.hh"
+#include
+
+#include "base/types.hh"
#include "mem/packet.hh"
+#include "mem/request.hh"
class BaseTrafficGen;
+class SimObject;
/**
* Base class for all generators, with the shared functionality and
diff --git a/src/gpu-compute/fetch_stage.hh b/src/gpu-compute/fetch_stage.hh
index 16c35d8..8e6996b 100644
--- a/src/gpu-compute/fetch_stage.hh
+++ b/src/gpu-compute/fetch_stage.hh
@@ -37,6 +37,7 @@
#include
#include
+#include "base/statistics.hh"
#include "gpu-compute/fetch_unit.hh"
// Instruction fetch stage.
diff --git a/src/gpu-compute/fetch_unit.hh b/src/gpu-compute/fetch_unit.hh
index ad341b3..11583fb 100644
--- a/src/gpu-compute/fetch_unit.hh
+++ b/src/gpu-compute/fetch_unit.hh
@@ -34,11 +34,15 @@
#ifndef __FETCH_UNIT_HH__
#define __FETCH_UNIT_HH__
-#include
+#include
+#include
+#include
+#include
#include
+#include
#include "arch/gpu_decoder.hh"
-#include "base/statistics.hh"
+#include "base/types.hh"
#include "config/the_gpu_isa.hh"
#include "gpu-compute/scheduler.hh"
#include "mem/packet.hh"
diff --git a/src/mem/multi_level_page_table.hh
b/src/mem/multi_level_page_table.hh
index 3d9ca9b..afa67d0 100644
--- a/src/mem/multi_level_page_table.hh
+++ b/src/mem/multi_level_page_table.hh
@@ -37,6 +37,7 @@
#include
#include "base/types.hh"
+#include "debug/MMU.hh"
#include "mem/page_table.hh"
#include "sim/system.hh"
diff --git a/src/mem/physical.hh b/src/mem/physical.hh
index 9d4ff9a..3e8ba28 100644
--- a/src/mem/physical.hh
+++ b/src/mem/physical.hh
@@ -38,8 +38,14 @@
#ifndef __MEM_PHYSICAL_HH__
#define __MEM_PHYSICAL_HH__
+#include
+#include
+#include
+
+#include "base/addr_range.hh"
#include "base/addr_range_map.hh"
#include "mem/packet.hh"
+#include "sim/serialize.hh"
/**
* Forward declaration to avoid header dependencies.
diff --git a/src/mem/request.hh b/src/mem/request.hh
index 79cb724..38b64fd 100644
--- a/src/mem/request.hh
+++ b/src/mem/request.hh
@@ -48,12 +48,16 @@
#ifndef __MEM_REQUEST_HH__
#define __MEM_REQUEST_HH__
+#include
#include