Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/38738 )
Change subject: misc: Fix some includes
......................................................................
misc: Fix some includes
Fix some missing and extra includes around the codebase.
Change-Id: Ibf314b43a966943a8096958f68382e1e245f29e3
Signed-off-by: Daniel R. Carvalho <oda...@yahoo.com.br>
---
M src/arch/generic/interrupts.hh
M src/base/trace.cc
M src/base/trace.hh
M src/cpu/testers/traffic_gen/base_gen.hh
M src/dev/arm/energy_ctrl.cc
M src/dev/i2c/bus.cc
M src/dev/ps2/device.cc
M src/dev/ps2/mouse.cc
M src/dev/serial/uart8250.cc
M src/dev/storage/disk_image.cc
M src/dev/virtio/base.cc
M src/mem/physical.cc
M src/sim/clock_domain.cc
M src/sim/dvfs_handler.cc
M src/sim/dvfs_handler.hh
M src/sim/eventq.hh
M src/sim/power/thermal_domain.cc
M src/sim/power/thermal_model.cc
M src/sim/power_state.cc
M src/sim/power_state.hh
M src/sim/redirect_path.cc
M src/sim/root.hh
M src/sim/serialize_handlers.hh
M src/sim/sim_exit.hh
M src/sim/ticked_object.cc
M src/sim/voltage_domain.cc
26 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/src/arch/generic/interrupts.hh b/src/arch/generic/interrupts.hh
index c8e1d0c..9acb5b5 100644
--- a/src/arch/generic/interrupts.hh
+++ b/src/arch/generic/interrupts.hh
@@ -28,6 +28,7 @@
#ifndef __ARCH_GENERIC_INTERRUPTS_HH__
#define __ARCH_GENERIC_INTERRUPTS_HH__
+#include "base/logging.hh"
#include "params/BaseInterrupts.hh"
#include "sim/sim_object.hh"
diff --git a/src/base/trace.cc b/src/base/trace.cc
index ed6fbd2..eee6a4d 100644
--- a/src/base/trace.cc
+++ b/src/base/trace.cc
@@ -35,10 +35,8 @@
#include <fstream>
#include <iostream>
#include <sstream>
-#include <string>
#include "base/atomicio.hh"
-#include "base/debug.hh"
#include "base/logging.hh"
#include "base/output.hh"
#include "base/str.hh"
diff --git a/src/base/trace.hh b/src/base/trace.hh
index aafb9c8..3238e58 100644
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -32,8 +32,10 @@
#ifndef __BASE_TRACE_HH__
#define __BASE_TRACE_HH__
+#include <ostream>
#include <string>
+#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..be3bad6 100644
--- a/src/cpu/testers/traffic_gen/base_gen.hh
+++ b/src/cpu/testers/traffic_gen/base_gen.hh
@@ -43,9 +43,14 @@
#ifndef __CPU_TRAFFIC_GEN_BASE_GEN_HH__
#define __CPU_TRAFFIC_GEN_BASE_GEN_HH__
+#include <cstdint>
+#include <string>
+
#include "base/bitfield.hh"
#include "base/intmath.hh"
+#include "base/types.hh"
#include "mem/packet.hh"
+#include "sim/sim_object.hh"
class BaseTrafficGen;
diff --git a/src/dev/arm/energy_ctrl.cc b/src/dev/arm/energy_ctrl.cc
index be2155d..43d0d3a 100644
--- a/src/dev/arm/energy_ctrl.cc
+++ b/src/dev/arm/energy_ctrl.cc
@@ -43,6 +43,7 @@
#include "mem/packet_access.hh"
#include "params/EnergyCtrl.hh"
#include "sim/dvfs_handler.hh"
+#include "sim/serialize.hh"
EnergyCtrl::EnergyCtrl(const Params &p)
: BasicPioDevice(p, PIO_NUM_FIELDS * 4), // each field is 32 bit
diff --git a/src/dev/i2c/bus.cc b/src/dev/i2c/bus.cc
index 345d71c..7e362ac 100644
--- a/src/dev/i2c/bus.cc
+++ b/src/dev/i2c/bus.cc
@@ -41,6 +41,7 @@
#include "debug/Checkpoint.hh"
#include "dev/i2c/device.hh"
#include "mem/packet_access.hh"
+#include "sim/serialize.hh"
// clang complains about std::set being overloaded with Packet::set if
// we open up the entire namespace std
diff --git a/src/dev/ps2/device.cc b/src/dev/ps2/device.cc
index c32288e..47eb026 100644
--- a/src/dev/ps2/device.cc
+++ b/src/dev/ps2/device.cc
@@ -45,6 +45,7 @@
#include "debug/PS2.hh"
#include "dev/ps2/types.hh"
#include "params/PS2Device.hh"
+#include "sim/serialize.hh"
PS2Device::PS2Device(const PS2DeviceParams &p)
: SimObject(p)
diff --git a/src/dev/ps2/mouse.cc b/src/dev/ps2/mouse.cc
index bc3d3f1..d8e32f4 100644
--- a/src/dev/ps2/mouse.cc
+++ b/src/dev/ps2/mouse.cc
@@ -45,6 +45,7 @@
#include "debug/PS2.hh"
#include "dev/ps2/types.hh"
#include "params/PS2Mouse.hh"
+#include "sim/serialize.hh"
PS2Mouse::PS2Mouse(const PS2MouseParams &p)
: PS2Device(p),
diff --git a/src/dev/serial/uart8250.cc b/src/dev/serial/uart8250.cc
index a6e9bd1..83238d6 100644
--- a/src/dev/serial/uart8250.cc
+++ b/src/dev/serial/uart8250.cc
@@ -41,6 +41,7 @@
#include "dev/platform.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
+#include "sim/serialize.hh"
using namespace std;
diff --git a/src/dev/storage/disk_image.cc b/src/dev/storage/disk_image.cc
index 58d2ac0..199ecc2 100644
--- a/src/dev/storage/disk_image.cc
+++ b/src/dev/storage/disk_image.cc
@@ -47,6 +47,7 @@
#include "debug/DiskImageRead.hh"
#include "debug/DiskImageWrite.hh"
#include "sim/byteswap.hh"
+#include "sim/serialize.hh"
#include "sim/sim_exit.hh"
using namespace std;
diff --git a/src/dev/virtio/base.cc b/src/dev/virtio/base.cc
index f5332e9..0624c7e 100644
--- a/src/dev/virtio/base.cc
+++ b/src/dev/virtio/base.cc
@@ -41,6 +41,7 @@
#include "debug/VIO.hh"
#include "params/VirtIODeviceBase.hh"
#include "params/VirtIODummyDevice.hh"
+#include "sim/serialize.hh"
VirtDescriptor::VirtDescriptor(PortProxy &_memProxy, ByteOrder bo,
VirtQueue &_queue, Index descIndex)
diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index a03f200..9877fad 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -54,6 +54,7 @@
#include "debug/AddrRanges.hh"
#include "debug/Checkpoint.hh"
#include "mem/abstract_mem.hh"
+#include "sim/serialize.hh"
/**
* On Linux, MAP_NORESERVE allow us to simulate a very large memory
diff --git a/src/sim/clock_domain.cc b/src/sim/clock_domain.cc
index 61d5654..f27a8f3 100644
--- a/src/sim/clock_domain.cc
+++ b/src/sim/clock_domain.cc
@@ -41,12 +41,14 @@
#include <algorithm>
#include <functional>
+#include "base/logging.hh"
#include "base/trace.hh"
#include "debug/ClockDomain.hh"
#include "params/ClockDomain.hh"
#include "params/DerivedClockDomain.hh"
#include "params/SrcClockDomain.hh"
#include "sim/clocked_object.hh"
+#include "sim/serialize.hh"
#include "sim/voltage_domain.hh"
ClockDomain::ClockDomainStats::ClockDomainStats(ClockDomain &cd)
diff --git a/src/sim/dvfs_handler.cc b/src/sim/dvfs_handler.cc
index 38ca35c..53b4271 100644
--- a/src/sim/dvfs_handler.cc
+++ b/src/sim/dvfs_handler.cc
@@ -40,12 +40,10 @@
#include <set>
#include <utility>
-#include "base/logging.hh"
#include "base/trace.hh"
#include "debug/DVFS.hh"
#include "params/DVFSHandler.hh"
-#include "sim/clock_domain.hh"
-#include "sim/eventq.hh"
+#include "sim/serialize.hh"
#include "sim/stat_control.hh"
#include "sim/voltage_domain.hh"
diff --git a/src/sim/dvfs_handler.hh b/src/sim/dvfs_handler.hh
index da04fc5..fccaf63 100644
--- a/src/sim/dvfs_handler.hh
+++ b/src/sim/dvfs_handler.hh
@@ -46,8 +46,12 @@
#ifndef __SIM_DVFS_HANDLER_HH__
#define __SIM_DVFS_HANDLER_HH__
+#include <cassert>
+#include <map>
#include <vector>
+#include "base/logging.hh"
+#include "base/types.hh"
#include "debug/DVFS.hh"
#include "params/DVFSHandler.hh"
#include "sim/clock_domain.hh"
diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index 45a5ab8..6ee168f 100644
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -40,6 +40,7 @@
#include <climits>
#include <functional>
#include <iosfwd>
+#include <list>
#include <memory>
#include <string>
diff --git a/src/sim/power/thermal_domain.cc
b/src/sim/power/thermal_domain.cc
index dabf2fe..e9f4d3c 100644
--- a/src/sim/power/thermal_domain.cc
+++ b/src/sim/power/thermal_domain.cc
@@ -46,6 +46,7 @@
#include "sim/linear_solver.hh"
#include "sim/power/thermal_model.hh"
#include "sim/probe/probe.hh"
+#include "sim/serialize.hh"
#include "sim/sub_system.hh"
ThermalDomain::ThermalDomain(const Params &p)
diff --git a/src/sim/power/thermal_model.cc b/src/sim/power/thermal_model.cc
index 65649e5..408642c 100644
--- a/src/sim/power/thermal_model.cc
+++ b/src/sim/power/thermal_model.cc
@@ -44,6 +44,7 @@
#include "sim/clocked_object.hh"
#include "sim/linear_solver.hh"
#include "sim/power/thermal_domain.hh"
+#include "sim/serialize.hh"
#include "sim/sim_object.hh"
/**
diff --git a/src/sim/power_state.cc b/src/sim/power_state.cc
index a11ed43..ffa1972 100644
--- a/src/sim/power_state.cc
+++ b/src/sim/power_state.cc
@@ -37,10 +37,13 @@
#include "sim/power_state.hh"
+#include <cassert>
+
#include "base/logging.hh"
#include "base/trace.hh"
#include "debug/PowerDomain.hh"
#include "sim/power_domain.hh"
+#include "sim/serialize.hh"
PowerState::PowerState(const PowerStateParams &p) :
SimObject(p), _currState(p.default_state),
diff --git a/src/sim/power_state.hh b/src/sim/power_state.hh
index fe869ff..fb9a581 100644
--- a/src/sim/power_state.hh
+++ b/src/sim/power_state.hh
@@ -44,6 +44,7 @@
#define __SIM_POWER_STATE_HH__
#include <set>
+#include <vector>
#include "base/callback.hh"
#include "base/statistics.hh"
diff --git a/src/sim/redirect_path.cc b/src/sim/redirect_path.cc
index f270057..57286f7 100644
--- a/src/sim/redirect_path.cc
+++ b/src/sim/redirect_path.cc
@@ -30,6 +30,8 @@
#include <unistd.h>
+#include "base/str.hh"
+
static std::string
normalizePath(std::string path)
{
diff --git a/src/sim/root.hh b/src/sim/root.hh
index fa152ff..a8337ed 100644
--- a/src/sim/root.hh
+++ b/src/sim/root.hh
@@ -53,6 +53,7 @@
#include "base/statistics.hh"
#include "base/time.hh"
+#include "base/types.hh"
#include "params/Root.hh"
#include "sim/eventq.hh"
#include "sim/sim_object.hh"
diff --git a/src/sim/serialize_handlers.hh b/src/sim/serialize_handlers.hh
index 8efd895..5e5c3ff 100644
--- a/src/sim/serialize_handlers.hh
+++ b/src/sim/serialize_handlers.hh
@@ -47,8 +47,8 @@
#include <iostream>
-#include <iterator>
#include <type_traits>
+#include <utility>
#include "base/str.hh"
diff --git a/src/sim/sim_exit.hh b/src/sim/sim_exit.hh
index a79d3e2..d1791f5 100644
--- a/src/sim/sim_exit.hh
+++ b/src/sim/sim_exit.hh
@@ -29,6 +29,7 @@
#ifndef __SIM_EXIT_HH__
#define __SIM_EXIT_HH__
+#include <functional>
#include <string>
#include "base/types.hh"
diff --git a/src/sim/ticked_object.cc b/src/sim/ticked_object.cc
index 3564b4d..79cbd41 100644
--- a/src/sim/ticked_object.cc
+++ b/src/sim/ticked_object.cc
@@ -39,6 +39,7 @@
#include "params/TickedObject.hh"
#include "sim/clocked_object.hh"
+#include "sim/serialize.hh"
Ticked::Ticked(ClockedObject &object_,
Stats::Scalar *imported_num_cycles,
diff --git a/src/sim/voltage_domain.cc b/src/sim/voltage_domain.cc
index f6f8396..d770af8 100644
--- a/src/sim/voltage_domain.cc
+++ b/src/sim/voltage_domain.cc
@@ -39,11 +39,11 @@
#include <algorithm>
-#include "base/statistics.hh"
+#include "base/logging.hh"
#include "base/trace.hh"
#include "debug/VoltageDomain.hh"
#include "params/VoltageDomain.hh"
-#include "sim/sim_object.hh"
+#include "sim/serialize.hh"
VoltageDomain::VoltageDomain(const Params &p)
: SimObject(p), voltageOpPoints(p.voltage), _perfLevel(0), stats(*this)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38738
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ibf314b43a966943a8096958f68382e1e245f29e3
Gerrit-Change-Number: 38738
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
