From 020a01fd78b811541a45200f2d312b17daaff8f9 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Tue, 19 Jan 2021 13:53:28 +0100 Subject: [PATCH] Only allow pointer to const for memspec. --- DRAMSys/library/src/common/TlmRecorder.cpp | 2 +- DRAMSys/library/src/configuration/Configuration.h | 2 +- DRAMSys/library/src/controller/BankMachine.cpp | 2 +- DRAMSys/library/src/controller/Controller.h | 2 +- DRAMSys/library/src/controller/checker/CheckerDDR3.cpp | 2 +- DRAMSys/library/src/controller/checker/CheckerDDR4.cpp | 2 +- DRAMSys/library/src/controller/checker/CheckerDDR5.cpp | 2 +- DRAMSys/library/src/controller/checker/CheckerGDDR5.cpp | 2 +- DRAMSys/library/src/controller/checker/CheckerGDDR5X.cpp | 2 +- DRAMSys/library/src/controller/checker/CheckerGDDR6.cpp | 2 +- DRAMSys/library/src/controller/checker/CheckerHBM2.cpp | 2 +- DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp | 2 +- DRAMSys/library/src/controller/checker/CheckerWideIO.cpp | 2 +- DRAMSys/library/src/controller/checker/CheckerWideIO2.cpp | 2 +- DRAMSys/library/src/simulation/AddressDecoder.cpp | 2 +- DRAMSys/library/src/simulation/dram/Dram.h | 2 +- DRAMSys/library/src/simulation/dram/DramDDR3.cpp | 2 +- DRAMSys/library/src/simulation/dram/DramDDR4.cpp | 2 +- DRAMSys/library/src/simulation/dram/DramWideIO.cpp | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/DRAMSys/library/src/common/TlmRecorder.cpp b/DRAMSys/library/src/common/TlmRecorder.cpp index ab7af256..17b20a34 100644 --- a/DRAMSys/library/src/common/TlmRecorder.cpp +++ b/DRAMSys/library/src/common/TlmRecorder.cpp @@ -377,7 +377,7 @@ void TlmRecorder::insertGeneralInfo() void TlmRecorder::insertCommandLengths() { - MemSpec *memSpec = Configuration::getInstance().memSpec; + const MemSpec *memSpec = Configuration::getInstance().memSpec; sqlite3_bind_int(insertCommandLengthsStatement, 1, static_cast(memSpec->getCommandLength(Command::NOP) / memSpec->tCK + 0.5)); sqlite3_bind_int(insertCommandLengthsStatement, 2, static_cast(memSpec->getCommandLength(Command::RD) / memSpec->tCK + 0.5)); diff --git a/DRAMSys/library/src/configuration/Configuration.h b/DRAMSys/library/src/configuration/Configuration.h index a236275e..54cfb6a1 100644 --- a/DRAMSys/library/src/configuration/Configuration.h +++ b/DRAMSys/library/src/configuration/Configuration.h @@ -102,7 +102,7 @@ public: unsigned long long int addressOffset = 0; // MemSpec (from DRAM-Power) - MemSpec *memSpec; + const MemSpec *memSpec; void setParameter(std::string name, nlohmann::json value); diff --git a/DRAMSys/library/src/controller/BankMachine.cpp b/DRAMSys/library/src/controller/BankMachine.cpp index 0c4f5770..5280a58d 100644 --- a/DRAMSys/library/src/controller/BankMachine.cpp +++ b/DRAMSys/library/src/controller/BankMachine.cpp @@ -40,7 +40,7 @@ using namespace tlm; BankMachine::BankMachine(SchedulerIF *scheduler, CheckerIF *checker, Bank bank) : scheduler(scheduler), checker(checker), bank(bank) { - MemSpec *memSpec = Configuration::getInstance().memSpec; + const MemSpec *memSpec = Configuration::getInstance().memSpec; rank = Rank(bank.ID() / memSpec->banksPerRank); bankgroup = BankGroup(bank.ID() / memSpec->banksPerGroup); } diff --git a/DRAMSys/library/src/controller/Controller.h b/DRAMSys/library/src/controller/Controller.h index d6cef920..354e3814 100644 --- a/DRAMSys/library/src/controller/Controller.h +++ b/DRAMSys/library/src/controller/Controller.h @@ -75,7 +75,7 @@ protected: virtual void controllerMethod(); SchedulerIF *scheduler; - MemSpec *memSpec; + const MemSpec *memSpec; sc_time phyDelay; diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp b/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp index 83312ac0..57687072 100644 --- a/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp @@ -37,7 +37,7 @@ CheckerDDR3::CheckerDDR3() { Configuration &config = Configuration::getInstance(); - memSpec = dynamic_cast(config.memSpec); + memSpec = dynamic_cast(config.memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("CheckerDDR3", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR4.cpp b/DRAMSys/library/src/controller/checker/CheckerDDR4.cpp index e2529753..5883dcf9 100644 --- a/DRAMSys/library/src/controller/checker/CheckerDDR4.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerDDR4.cpp @@ -37,7 +37,7 @@ CheckerDDR4::CheckerDDR4() { Configuration &config = Configuration::getInstance(); - memSpec = dynamic_cast(config.memSpec); + memSpec = dynamic_cast(config.memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("CheckerDDR4", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR5.cpp b/DRAMSys/library/src/controller/checker/CheckerDDR5.cpp index 0f57b9a9..79d6264a 100644 --- a/DRAMSys/library/src/controller/checker/CheckerDDR5.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerDDR5.cpp @@ -37,7 +37,7 @@ CheckerDDR5::CheckerDDR5() { Configuration &config = Configuration::getInstance(); - memSpec = dynamic_cast(config.memSpec); + memSpec = dynamic_cast(config.memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("CheckerDDR5", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR5.cpp b/DRAMSys/library/src/controller/checker/CheckerGDDR5.cpp index 61cefd4d..d3c5e022 100644 --- a/DRAMSys/library/src/controller/checker/CheckerGDDR5.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerGDDR5.cpp @@ -37,7 +37,7 @@ CheckerGDDR5::CheckerGDDR5() { Configuration &config = Configuration::getInstance(); - memSpec = dynamic_cast(config.memSpec); + memSpec = dynamic_cast(config.memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("CheckerGDDR5", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR5X.cpp b/DRAMSys/library/src/controller/checker/CheckerGDDR5X.cpp index 3cd3d157..a19c5714 100644 --- a/DRAMSys/library/src/controller/checker/CheckerGDDR5X.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerGDDR5X.cpp @@ -37,7 +37,7 @@ CheckerGDDR5X::CheckerGDDR5X() { Configuration &config = Configuration::getInstance(); - memSpec = dynamic_cast(config.memSpec); + memSpec = dynamic_cast(config.memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("CheckerGDDR5X", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR6.cpp b/DRAMSys/library/src/controller/checker/CheckerGDDR6.cpp index abfd6a32..a2de6ce6 100644 --- a/DRAMSys/library/src/controller/checker/CheckerGDDR6.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerGDDR6.cpp @@ -37,7 +37,7 @@ CheckerGDDR6::CheckerGDDR6() { Configuration &config = Configuration::getInstance(); - memSpec = dynamic_cast(config.memSpec); + memSpec = dynamic_cast(config.memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("CheckerGDDR6", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/controller/checker/CheckerHBM2.cpp b/DRAMSys/library/src/controller/checker/CheckerHBM2.cpp index a9dc4ec6..dfb2dd38 100644 --- a/DRAMSys/library/src/controller/checker/CheckerHBM2.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerHBM2.cpp @@ -37,7 +37,7 @@ CheckerHBM2::CheckerHBM2() { Configuration &config = Configuration::getInstance(); - memSpec = dynamic_cast(config.memSpec); + memSpec = dynamic_cast(config.memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("CheckerHBM2", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp b/DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp index 3dc894f9..e57b97d1 100644 --- a/DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp @@ -37,7 +37,7 @@ CheckerLPDDR4::CheckerLPDDR4() { Configuration &config = Configuration::getInstance(); - memSpec = dynamic_cast(config.memSpec); + memSpec = dynamic_cast(config.memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("CheckerLPDDR4", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/controller/checker/CheckerWideIO.cpp b/DRAMSys/library/src/controller/checker/CheckerWideIO.cpp index ed573585..946f7aff 100644 --- a/DRAMSys/library/src/controller/checker/CheckerWideIO.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerWideIO.cpp @@ -37,7 +37,7 @@ CheckerWideIO::CheckerWideIO() { Configuration &config = Configuration::getInstance(); - memSpec = dynamic_cast(config.memSpec); + memSpec = dynamic_cast(config.memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("CheckerWideIO", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/controller/checker/CheckerWideIO2.cpp b/DRAMSys/library/src/controller/checker/CheckerWideIO2.cpp index e5621a1f..b21bb0b2 100644 --- a/DRAMSys/library/src/controller/checker/CheckerWideIO2.cpp +++ b/DRAMSys/library/src/controller/checker/CheckerWideIO2.cpp @@ -37,7 +37,7 @@ CheckerWideIO2::CheckerWideIO2() { Configuration &config = Configuration::getInstance(); - memSpec = dynamic_cast(config.memSpec); + memSpec = dynamic_cast(config.memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("CheckerWideIO2", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/simulation/AddressDecoder.cpp b/DRAMSys/library/src/simulation/AddressDecoder.cpp index f4bf0400..0179821e 100644 --- a/DRAMSys/library/src/simulation/AddressDecoder.cpp +++ b/DRAMSys/library/src/simulation/AddressDecoder.cpp @@ -141,7 +141,7 @@ AddressDecoder::AddressDecoder(std::string pathToAddressMapping) bankgroups = bankgroupsPerRank * ranks; Configuration &config = Configuration::getInstance(); - MemSpec *memSpec = config.memSpec; + const MemSpec *memSpec = config.memSpec; if (memSpec->numberOfChannels != channels || memSpec->numberOfRanks != ranks || memSpec->numberOfBankGroups != bankgroups || memSpec->numberOfBanks != banks diff --git a/DRAMSys/library/src/simulation/dram/Dram.h b/DRAMSys/library/src/simulation/dram/Dram.h index 1d346e7a..43d08ddb 100644 --- a/DRAMSys/library/src/simulation/dram/Dram.h +++ b/DRAMSys/library/src/simulation/dram/Dram.h @@ -57,7 +57,7 @@ protected: Dram(sc_module_name); SC_HAS_PROCESS(Dram); - MemSpec *memSpec = Configuration::getInstance().memSpec; + const MemSpec *memSpec = Configuration::getInstance().memSpec; // Data Storage: Configuration::StoreMode storeMode; diff --git a/DRAMSys/library/src/simulation/dram/DramDDR3.cpp b/DRAMSys/library/src/simulation/dram/DramDDR3.cpp index 66e491df..be8ce944 100644 --- a/DRAMSys/library/src/simulation/dram/DramDDR3.cpp +++ b/DRAMSys/library/src/simulation/dram/DramDDR3.cpp @@ -49,7 +49,7 @@ DramDDR3::DramDDR3(sc_module_name name) : Dram(name) if (Configuration::getInstance().powerAnalysis) { - MemSpecDDR3 *memSpec = dynamic_cast(this->memSpec); + const MemSpecDDR3 *memSpec = dynamic_cast(this->memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("DramDDR3", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/simulation/dram/DramDDR4.cpp b/DRAMSys/library/src/simulation/dram/DramDDR4.cpp index 82255616..7ebbff11 100644 --- a/DRAMSys/library/src/simulation/dram/DramDDR4.cpp +++ b/DRAMSys/library/src/simulation/dram/DramDDR4.cpp @@ -49,7 +49,7 @@ DramDDR4::DramDDR4(sc_module_name name) : Dram(name) if (Configuration::getInstance().powerAnalysis) { - MemSpecDDR4 *memSpec = dynamic_cast(this->memSpec); + const MemSpecDDR4 *memSpec = dynamic_cast(this->memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("DramDDR4", "Wrong MemSpec chosen"); diff --git a/DRAMSys/library/src/simulation/dram/DramWideIO.cpp b/DRAMSys/library/src/simulation/dram/DramWideIO.cpp index 4e37cd09..c0fe072c 100644 --- a/DRAMSys/library/src/simulation/dram/DramWideIO.cpp +++ b/DRAMSys/library/src/simulation/dram/DramWideIO.cpp @@ -50,7 +50,7 @@ DramWideIO::DramWideIO(sc_module_name name) : Dram(name) { if (Configuration::getInstance().powerAnalysis) { - MemSpecWideIO *memSpec = dynamic_cast(this->memSpec); + const MemSpecWideIO *memSpec = dynamic_cast(this->memSpec); if (memSpec == nullptr) SC_REPORT_FATAL("DramWideIO", "Wrong MemSpec chosen");