From 98eae7fcf427f3a4e9fcc76e5078da4099b93be9 Mon Sep 17 00:00:00 2001 From: Derek Christ Date: Tue, 25 Mar 2025 16:48:46 +0100 Subject: [PATCH] Fix the forward declaration of the Dram class --- src/libdramsys/DRAMSys/simulation/DRAMSys.cpp | 5 +++++ src/libdramsys/DRAMSys/simulation/DRAMSys.h | 5 +++-- tests/tests_dramsys/b_transport/b_transport.cpp | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/libdramsys/DRAMSys/simulation/DRAMSys.cpp b/src/libdramsys/DRAMSys/simulation/DRAMSys.cpp index aa965a18..5bd6ae3b 100644 --- a/src/libdramsys/DRAMSys/simulation/DRAMSys.cpp +++ b/src/libdramsys/DRAMSys/simulation/DRAMSys.cpp @@ -43,6 +43,9 @@ #include "DRAMSys/common/DebugManager.h" #include "DRAMSys/common/utils.h" +#include "DRAMSys/simulation/Dram.h" +#include "DRAMSys/simulation/DramRecordable.h" + #include "DRAMSys/configuration/memspec/MemSpecDDR3.h" #include "DRAMSys/configuration/memspec/MemSpecDDR4.h" #include "DRAMSys/configuration/memspec/MemSpecGDDR5.h" @@ -158,6 +161,8 @@ DRAMSys::DRAMSys(const sc_core::sc_module_name& name, const Config::Configuratio report(); } +DRAMSys::~DRAMSys() = default; + void DRAMSys::setupTlmRecorders(const std::string& traceName, const Config::Configuration& config) { // Create TLM Recorders, one per channel. diff --git a/src/libdramsys/DRAMSys/simulation/DRAMSys.h b/src/libdramsys/DRAMSys/simulation/DRAMSys.h index 00c492ae..e1c29aeb 100644 --- a/src/libdramsys/DRAMSys/simulation/DRAMSys.h +++ b/src/libdramsys/DRAMSys/simulation/DRAMSys.h @@ -49,8 +49,6 @@ #include "DRAMSys/controller/McConfig.h" #include "DRAMSys/simulation/AddressDecoder.h" #include "DRAMSys/simulation/Arbiter.h" -#include "DRAMSys/simulation/Dram.h" -#include "DRAMSys/simulation/DramRecordable.h" #include "DRAMSys/simulation/SimConfig.h" #include @@ -64,6 +62,8 @@ namespace DRAMSys { +class Dram; + class DRAMSys : public sc_core::sc_module { public: @@ -71,6 +71,7 @@ public: SC_HAS_PROCESS(DRAMSys); DRAMSys(const sc_core::sc_module_name& name, const Config::Configuration& config); + ~DRAMSys(); const auto& getSimConfig() const { return simConfig; } const auto& getMcConfig() const { return mcConfig; } diff --git a/tests/tests_dramsys/b_transport/b_transport.cpp b/tests/tests_dramsys/b_transport/b_transport.cpp index 1ffe788e..381a4a7b 100644 --- a/tests/tests_dramsys/b_transport/b_transport.cpp +++ b/tests/tests_dramsys/b_transport/b_transport.cpp @@ -36,6 +36,7 @@ #include #include +#include class SystemCTest : public testing::Test {