From abcd2a910bfc520450e5363b37d1b02654944ac5 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Wed, 12 Jun 2019 20:25:38 +0200 Subject: [PATCH] Renaming files (Commit 2 of 2) --- DRAMSys/library/library.pro | 11 +++-- .../src/common/CongenAddressDecoder.cpp | 2 +- .../library/src/common/CongenAddressDecoder.h | 3 +- DRAMSys/library/src/common/DebugManager.h | 2 +- DRAMSys/library/src/common/TlmRecorder.h | 2 +- .../library/src/common/XmlAddressDecoder.cpp | 2 +- .../library/src/common/XmlAddressDecoder.h | 5 +-- DRAMSys/library/src/common/dramExtensions.cpp | 2 +- DRAMSys/library/src/common/dramExtensions.h | 1 - .../common/{rename_utils.cpp => utils.cpp} | 2 +- .../src/common/{rename_utils.h => utils.h} | 0 DRAMSys/library/src/controller/Command.h | 1 - DRAMSys/library/src/controller/Controller.h | 3 +- DRAMSys/library/src/controller/IController.h | 2 +- .../src/controller/RowBufferStates.cpp | 2 +- .../src/controller/core/ControllerCore.cpp | 2 +- .../core/configuration/Configuration.h | 4 +- .../core/configuration/ConfigurationLoader.h | 2 +- .../controller/core/configuration/MemSpec.h | 7 ++- ...rmalSimConfig.h => TemperatureSimConfig.h} | 12 ++--- .../controller/core/powerdown/NoPowerDown.h | 2 +- .../core/powerdown/PowerDownManager.cpp | 2 +- .../powerdown/PowerDownManagerBankwise.cpp | 2 +- .../powerdown/PowerDownManagerTimeout.cpp | 2 +- .../PowerDownManagerTimeoutBankwise.cpp | 2 +- .../src/controller/core/refresh/RGR.cpp | 2 +- .../core/refresh/RefreshManager.cpp | 2 +- .../core/refresh/RefreshManagerBankwise.cpp | 2 +- .../core/refresh/RefreshManagerBankwise.h | 6 +-- .../core/scheduling/ScheduledCommand.cpp | 2 +- .../core/scheduling/ScheduledCommand.h | 2 +- .../src/controller/core/scheduling/Trigger.h | 44 ------------------- .../core/scheduling/checker/ActBChecker.cpp | 2 +- .../scheduling/checker/ActivateChecker.cpp | 2 +- .../core/scheduling/checker/ReadChecker.cpp | 2 +- .../core/scheduling/checker/RefreshChecker.h | 2 +- .../core/scheduling/checker/WriteChecker.cpp | 2 +- .../core/scheduling/checker/WriteChecker.h | 2 +- .../controller/core/timingCalculations.cpp | 2 +- .../src/controller/core/timingCalculations.h | 1 - .../src/controller/scheduler/IScheduler.h | 1 - DRAMSys/library/src/simulation/DRAMSys.cpp | 2 +- DRAMSys/library/src/simulation/DRAMSys.h | 2 +- DRAMSys/library/src/simulation/Dram.cpp | 2 +- .../library/src/simulation/ExampleInitiator.h | 3 +- DRAMSys/library/src/simulation/IArbiter.h | 3 +- DRAMSys/library/src/simulation/Setup.h | 2 +- DRAMSys/library/src/simulation/StlPlayer.h | 3 +- .../src/simulation/TemperatureController.h | 2 +- .../library/src/simulation/TraceGenerator.h | 4 +- DRAMSys/library/src/simulation/TracePlayer.h | 3 +- DRAMSys/library/src/simulation/TraceSetup.h | 2 +- 52 files changed, 66 insertions(+), 115 deletions(-) rename DRAMSys/library/src/common/{rename_utils.cpp => utils.cpp} (99%) rename DRAMSys/library/src/common/{rename_utils.h => utils.h} (100%) rename DRAMSys/library/src/controller/core/configuration/{thermalSimConfig.h => TemperatureSimConfig.h} (96%) delete mode 100644 DRAMSys/library/src/controller/core/scheduling/Trigger.h diff --git a/DRAMSys/library/library.pro b/DRAMSys/library/library.pro index 2c4050f5..ab7ca602 100644 --- a/DRAMSys/library/library.pro +++ b/DRAMSys/library/library.pro @@ -141,9 +141,9 @@ SOURCES += \ src/simulation/Arbiter.cpp \ src/common/CongenAddressDecoder.cpp \ src/common/XmlAddressDecoder.cpp \ - src/common/rename_utils.cpp \ src/controller/core/timingCalculations.cpp \ - src/common/dramExtensions.cpp + src/common/dramExtensions.cpp \ + src/common/utils.cpp HEADERS += \ src/common/third_party/tinyxml2/tinyxml2.h \ @@ -173,7 +173,6 @@ HEADERS += \ src/controller/core/scheduling/checker/ActivateChecker.h \ src/controller/core/scheduling/checker/PreBChecker.h \ src/controller/core/scheduling/checker/ActBChecker.h \ - src/controller/core/scheduling/Trigger.h \ src/controller/core/scheduling/ScheduledCommand.h \ src/controller/core/Slots.h \ src/controller/core/ControllerCore.h \ @@ -184,7 +183,6 @@ HEADERS += \ src/common/libDRAMPower.h \ src/simulation/ReorderBuffer.h \ src/controller/core/configuration/MemSpec.h \ - src/controller/core/configuration/thermalSimConfig.h \ src/simulation/StlPlayer.h \ src/simulation/TracePlayerListener.h \ src/simulation/TraceGenerator.h \ @@ -219,9 +217,10 @@ HEADERS += \ src/common/AddressDecoder.h \ src/common/CongenAddressDecoder.h \ src/common/XmlAddressDecoder.h \ - src/common/rename_utils.h \ src/controller/core/timingCalculations.h \ - src/common/dramExtensions.h + src/common/dramExtensions.h \ + src/common/utils.h \ + src/controller/core/configuration/TemperatureSimConfig.h #src/common/third_party/json/include/nlohmann/json.hpp \ thermalsim = $$(THERMALSIM) diff --git a/DRAMSys/library/src/common/CongenAddressDecoder.cpp b/DRAMSys/library/src/common/CongenAddressDecoder.cpp index 8ca2ce74..ea11dcbc 100644 --- a/DRAMSys/library/src/common/CongenAddressDecoder.cpp +++ b/DRAMSys/library/src/common/CongenAddressDecoder.cpp @@ -34,7 +34,7 @@ */ #include "CongenAddressDecoder.h" -#include "rename_utils.h" +#include "utils.h" #include diff --git a/DRAMSys/library/src/common/CongenAddressDecoder.h b/DRAMSys/library/src/common/CongenAddressDecoder.h index e2d210a5..51778ecf 100644 --- a/DRAMSys/library/src/common/CongenAddressDecoder.h +++ b/DRAMSys/library/src/common/CongenAddressDecoder.h @@ -47,8 +47,7 @@ using std::vector; using std::pair; using std::map; -class CongenAddressDecoder - : private AddressDecoder +class CongenAddressDecoder : private AddressDecoder { // Friendship needed so that the AddressDecoder can access the // constructor of this class to create the object in CreateInstance. diff --git a/DRAMSys/library/src/common/DebugManager.h b/DRAMSys/library/src/common/DebugManager.h index f3810dee..dd35b796 100644 --- a/DRAMSys/library/src/common/DebugManager.h +++ b/DRAMSys/library/src/common/DebugManager.h @@ -40,7 +40,7 @@ #include #include #include -#include "rename_utils.h" +#include "utils.h" class DebugManager { diff --git a/DRAMSys/library/src/common/TlmRecorder.h b/DRAMSys/library/src/common/TlmRecorder.h index 8b8ef016..c69ad4f6 100644 --- a/DRAMSys/library/src/common/TlmRecorder.h +++ b/DRAMSys/library/src/common/TlmRecorder.h @@ -51,7 +51,7 @@ #include #include "XmlAddressDecoder.h" #include "DebugManager.h" -#include "rename_utils.h" +#include "utils.h" using namespace std; diff --git a/DRAMSys/library/src/common/XmlAddressDecoder.cpp b/DRAMSys/library/src/common/XmlAddressDecoder.cpp index caa49062..f94011d2 100644 --- a/DRAMSys/library/src/common/XmlAddressDecoder.cpp +++ b/DRAMSys/library/src/common/XmlAddressDecoder.cpp @@ -37,7 +37,7 @@ #include "XmlAddressDecoder.h" #include -#include "rename_utils.h" +#include "utils.h" #include "bitset" #include "../controller/core/configuration/Configuration.h" diff --git a/DRAMSys/library/src/common/XmlAddressDecoder.h b/DRAMSys/library/src/common/XmlAddressDecoder.h index 488eb4a7..dfd65072 100644 --- a/DRAMSys/library/src/common/XmlAddressDecoder.h +++ b/DRAMSys/library/src/common/XmlAddressDecoder.h @@ -40,12 +40,11 @@ #include -#include "rename_utils.h" +#include "utils.h" #include "third_party/tinyxml2/tinyxml2.h" #include "AddressDecoder.h" -class XmlAddressDecoder - : private AddressDecoder +class XmlAddressDecoder : private AddressDecoder { // Friendship needed so that the AddressDecoder can access the // constructor of this class to create the object in CreateInstance. diff --git a/DRAMSys/library/src/common/dramExtensions.cpp b/DRAMSys/library/src/common/dramExtensions.cpp index 51ee8578..9a2b9da3 100644 --- a/DRAMSys/library/src/common/dramExtensions.cpp +++ b/DRAMSys/library/src/common/dramExtensions.cpp @@ -38,7 +38,7 @@ #include "dramExtensions.h" #include "../controller/core/configuration/Configuration.h" #include "map" -#include "rename_utils.h" +#include "utils.h" using namespace tlm; diff --git a/DRAMSys/library/src/common/dramExtensions.h b/DRAMSys/library/src/common/dramExtensions.h index 2f62ab94..3a4b1a51 100644 --- a/DRAMSys/library/src/common/dramExtensions.h +++ b/DRAMSys/library/src/common/dramExtensions.h @@ -41,7 +41,6 @@ #include #include - class Thread { public: diff --git a/DRAMSys/library/src/common/rename_utils.cpp b/DRAMSys/library/src/common/utils.cpp similarity index 99% rename from DRAMSys/library/src/common/rename_utils.cpp rename to DRAMSys/library/src/common/utils.cpp index 9e0c19a8..69c6f899 100644 --- a/DRAMSys/library/src/common/rename_utils.cpp +++ b/DRAMSys/library/src/common/utils.cpp @@ -35,7 +35,7 @@ * Matthias Jung */ -#include "rename_utils.h" +#include "utils.h" #include #include #include diff --git a/DRAMSys/library/src/common/rename_utils.h b/DRAMSys/library/src/common/utils.h similarity index 100% rename from DRAMSys/library/src/common/rename_utils.h rename to DRAMSys/library/src/common/utils.h diff --git a/DRAMSys/library/src/controller/Command.h b/DRAMSys/library/src/controller/Command.h index c2b87464..e8aa28e7 100644 --- a/DRAMSys/library/src/controller/Command.h +++ b/DRAMSys/library/src/controller/Command.h @@ -39,7 +39,6 @@ #include #include - enum class Command { NOP, PreB, diff --git a/DRAMSys/library/src/controller/Controller.h b/DRAMSys/library/src/controller/Controller.h index 0a743632..133f10f9 100644 --- a/DRAMSys/library/src/controller/Controller.h +++ b/DRAMSys/library/src/controller/Controller.h @@ -53,7 +53,7 @@ #include "../common/DebugManager.h" #include "../common/protocol.h" #include "../common/TlmRecorder.h" -#include "../common/rename_utils.h" +#include "../common/utils.h" #include "core/configuration/Configuration.h" #include "core/configuration/MemSpec.h" #include "Command.h" @@ -62,7 +62,6 @@ #include "IController.h" #include "core/powerdown/IPowerDownManager.h" #include "core/scheduling/ScheduledCommand.h" -#include "core/scheduling/Trigger.h" #include "core/timingCalculations.h" #include "scheduler/Fifo.h" #include "scheduler/Grp.h" diff --git a/DRAMSys/library/src/controller/IController.h b/DRAMSys/library/src/controller/IController.h index 4504c4c3..b61fc0d7 100644 --- a/DRAMSys/library/src/controller/IController.h +++ b/DRAMSys/library/src/controller/IController.h @@ -41,9 +41,9 @@ #include #include #include "core/scheduling/ScheduledCommand.h" -#include "core/scheduling/Trigger.h" #include "../common/dramExtensions.h" +enum Trigger {REFTrigger, PDNTrigger}; // Utiliy class to pass around the Controller class to the controller Core and various schedulers, without having to propagate the template defintions // throughout all classes diff --git a/DRAMSys/library/src/controller/RowBufferStates.cpp b/DRAMSys/library/src/controller/RowBufferStates.cpp index 4c57d257..e47f5298 100644 --- a/DRAMSys/library/src/controller/RowBufferStates.cpp +++ b/DRAMSys/library/src/controller/RowBufferStates.cpp @@ -37,7 +37,7 @@ #include "RowBufferStates.h" #include "core/ControllerCore.h" #include "../common/DebugManager.h" -#include "../common/rename_utils.h" +#include "../common/utils.h" using namespace std; diff --git a/DRAMSys/library/src/controller/core/ControllerCore.cpp b/DRAMSys/library/src/controller/core/ControllerCore.cpp index 92dfe1a1..f966c965 100644 --- a/DRAMSys/library/src/controller/core/ControllerCore.cpp +++ b/DRAMSys/library/src/controller/core/ControllerCore.cpp @@ -50,7 +50,7 @@ #include "refresh/RefreshManager.h" #include "refresh/RGR.h" #include "../../common/dramExtensions.h" -#include "../../common/rename_utils.h" +#include "../../common/utils.h" #include "timingCalculations.h" #include "powerdown/PowerDownManager.h" diff --git a/DRAMSys/library/src/controller/core/configuration/Configuration.h b/DRAMSys/library/src/controller/core/configuration/Configuration.h index 6472a4c5..bd1e4bfe 100644 --- a/DRAMSys/library/src/controller/core/configuration/Configuration.h +++ b/DRAMSys/library/src/controller/core/configuration/Configuration.h @@ -43,8 +43,8 @@ #include #include #include "MemSpec.h" -#include "thermalSimConfig.h" -#include "../../../common/rename_utils.h" +#include "TemperatureSimConfig.h" +#include "../../../common/utils.h" #include "../../../error/eccbaseclass.h" diff --git a/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h b/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h index fe701b59..c4b77530 100644 --- a/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h +++ b/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h @@ -39,7 +39,7 @@ #include #include "../../../common/third_party/tinyxml2/tinyxml2.h" -#include "../../../common/rename_utils.h" +#include "../../../common/utils.h" #include "Configuration.h" class ConfigurationLoader diff --git a/DRAMSys/library/src/controller/core/configuration/MemSpec.h b/DRAMSys/library/src/controller/core/configuration/MemSpec.h index 79b10329..9a5e06d5 100644 --- a/DRAMSys/library/src/controller/core/configuration/MemSpec.h +++ b/DRAMSys/library/src/controller/core/configuration/MemSpec.h @@ -34,14 +34,13 @@ * Matthias Jung */ -#ifndef MemSpec_H_ -#define MemSpec_H_ +#ifndef MEMSPEC_H +#define MEMSPEC_H #include #include #include "../../../common/dramExtensions.h" - struct RefreshTiming { RefreshTiming() {} RefreshTiming(sc_time tRFC, sc_time tREFI) : tRFC(tRFC), tRFC2(SC_ZERO_TIME), @@ -165,5 +164,5 @@ struct MemSpec { } }; -#endif /* MemSpec_H_ */ +#endif // MEMSPEC_H diff --git a/DRAMSys/library/src/controller/core/configuration/thermalSimConfig.h b/DRAMSys/library/src/controller/core/configuration/TemperatureSimConfig.h similarity index 96% rename from DRAMSys/library/src/controller/core/configuration/thermalSimConfig.h rename to DRAMSys/library/src/controller/core/configuration/TemperatureSimConfig.h index 8d13a77d..b9acd733 100644 --- a/DRAMSys/library/src/controller/core/configuration/thermalSimConfig.h +++ b/DRAMSys/library/src/controller/core/configuration/TemperatureSimConfig.h @@ -34,8 +34,8 @@ * Matthias Jung */ -#ifndef THERMALSIM_CONFIG_H -#define THERMALSIM_CONFIG_H +#ifndef TEMPERATURESIMCONFIG_H +#define TEMPERATURESIMCONFIG_H #include #include @@ -43,10 +43,10 @@ #include "../../../common/DebugManager.h" #include "../../../common/third_party/tinyxml2/tinyxml2.h" -#include "../../../common/rename_utils.h" - -struct TemperatureSimConfig { +#include "../../../common/utils.h" +struct TemperatureSimConfig +{ // Temperature Scale std::string TemperatureScale; std::string pathToResources; @@ -132,5 +132,5 @@ struct TemperatureSimConfig { } }; -#endif /* THERMALSIM_CONFIG_H */ +#endif // TEMPERATURESIMCONFIG_H diff --git a/DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h b/DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h index e68d344a..19a53403 100644 --- a/DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h +++ b/DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h @@ -45,7 +45,7 @@ -class NoPowerDown: public IPowerDownManager +class NoPowerDown : public IPowerDownManager { public: NoPowerDown() {} diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp index 9d3a5258..d5281e05 100644 --- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp +++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp @@ -42,7 +42,7 @@ #include "../timingCalculations.h" #include "../../../common/DebugManager.h" #include -#include "../../../common/rename_utils.h" +#include "../../../common/utils.h" using namespace tlm; using namespace std; diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp index 344b1700..a73d7674 100644 --- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp +++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp @@ -36,7 +36,7 @@ #include "PowerDownManager.h" #include "../ControllerCore.h" -#include "../../../common/rename_utils.h" +#include "../../../common/utils.h" #include "../../../common/DebugManager.h" #include "../timingCalculations.h" diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp index 88a97766..997e9c37 100644 --- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp +++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp @@ -38,7 +38,7 @@ #include "PowerDownManagerTimeout.h" #include "../ControllerCore.h" -#include "../../../common/rename_utils.h" +#include "../../../common/utils.h" #include "../../../common/DebugManager.h" #include "../timingCalculations.h" diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp index 2e4a2a1a..cd743e02 100644 --- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp +++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp @@ -38,7 +38,7 @@ #include "PowerDownManagerTimeoutBankwise.h" #include "../ControllerCore.h" -#include "../../../common/rename_utils.h" +#include "../../../common/utils.h" #include "../../../common/DebugManager.h" #include "../timingCalculations.h" diff --git a/DRAMSys/library/src/controller/core/refresh/RGR.cpp b/DRAMSys/library/src/controller/core/refresh/RGR.cpp index ff4c72e5..e7f5b652 100644 --- a/DRAMSys/library/src/controller/core/refresh/RGR.cpp +++ b/DRAMSys/library/src/controller/core/refresh/RGR.cpp @@ -37,7 +37,7 @@ #include "RGR.h" #include "../ControllerCore.h" #include "../timingCalculations.h" -#include "../../../common/rename_utils.h" +#include "../../../common/utils.h" #define TRUE 1 #define FALSE !(TRUE) diff --git a/DRAMSys/library/src/controller/core/refresh/RefreshManager.cpp b/DRAMSys/library/src/controller/core/refresh/RefreshManager.cpp index ad1cea5b..8b4981ec 100644 --- a/DRAMSys/library/src/controller/core/refresh/RefreshManager.cpp +++ b/DRAMSys/library/src/controller/core/refresh/RefreshManager.cpp @@ -40,7 +40,7 @@ #include "RefreshManager.h" #include "../ControllerCore.h" #include "../timingCalculations.h" -#include "../../../common/rename_utils.h" +#include "../../../common/utils.h" using namespace tlm; diff --git a/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.cpp b/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.cpp index ab878ff0..a496ab8e 100644 --- a/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.cpp +++ b/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.cpp @@ -38,7 +38,7 @@ #include "RefreshManagerBankwise.h" #include "../ControllerCore.h" #include "../timingCalculations.h" -#include "../../../common/rename_utils.h" +#include "../../../common/utils.h" using namespace std; diff --git a/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h b/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h index 1c84d83e..a4728f4e 100644 --- a/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h +++ b/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h @@ -35,8 +35,8 @@ * Éder F. Zulian */ -#ifndef BANKWISEREFRESHMANAGER_H -#define BANKWISEREFRESHMANAGER_H +#ifndef REFRESHMANAGERBANKWISE_H +#define REFRESHMANAGERBANKWISE_H //#include "../../../common/dramExtension.h" #include "IRefreshManager.h" @@ -79,5 +79,5 @@ private: void printDebugMessage(std::string message); }; -#endif // BANKWISEREFRESHMANAGER_H +#endif // REFRESHMANAGERBANKWISE_H diff --git a/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp index 718e25f3..2945cc74 100644 --- a/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp +++ b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp @@ -36,7 +36,7 @@ #include "ScheduledCommand.h" #include "../timingCalculations.h" -#include "../../../common/rename_utils.h" +#include "../../../common/utils.h" #include "../configuration/Configuration.h" bool ScheduledCommand::isNoCommand() const diff --git a/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h index aa2f1121..bc4721b7 100644 --- a/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h +++ b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h @@ -41,7 +41,7 @@ #include #include "../../Command.h" #include "../../../common/dramExtensions.h" -#include "../../../common/rename_utils.h" +#include "../../../common/utils.h" class ScheduledCommand { diff --git a/DRAMSys/library/src/controller/core/scheduling/Trigger.h b/DRAMSys/library/src/controller/core/scheduling/Trigger.h deleted file mode 100644 index 3900bdbe..00000000 --- a/DRAMSys/library/src/controller/core/scheduling/Trigger.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2015, University of Kaiserslautern - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: - * Janik Schlemminger - * Matthias Jung - */ - -#ifndef TRIGGER_H -#define TRIGGER_H - - -enum Trigger {REFTrigger, PDNTrigger}; - - -#endif // TRIGGER_H diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.cpp index 2313d6cb..55edd9a9 100644 --- a/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.cpp +++ b/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.cpp @@ -39,7 +39,7 @@ #include "../../timingCalculations.h" #include "../../../../common/DebugManager.h" #include "../../../Command.h" -#include "../../../../common/rename_utils.h" +#include "../../../../common/utils.h" using namespace std; diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp index 51a10ea7..18236ba3 100644 --- a/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp +++ b/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp @@ -41,7 +41,7 @@ #include "../../timingCalculations.h" #include "../../../../common/DebugManager.h" #include "../../../Command.h" -#include "../../../../common/rename_utils.h" +#include "../../../../common/utils.h" using namespace std; diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp index f8ea3319..048f5cd5 100644 --- a/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp +++ b/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp @@ -36,7 +36,7 @@ #include "ReadChecker.h" #include "../../timingCalculations.h" -#include "../../../../common/rename_utils.h" +#include "../../../../common/utils.h" #include "WriteChecker.h" using namespace std; diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h index 919531da..ae7a4c9e 100644 --- a/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h +++ b/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h @@ -42,7 +42,7 @@ #include "../../configuration/Configuration.h" #include -class RefreshChecker: public ICommandChecker +class RefreshChecker : public ICommandChecker { public: RefreshChecker(const Configuration &config, ControllerState &state) : diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp index d793041b..b2aed2d2 100644 --- a/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp +++ b/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp @@ -36,7 +36,7 @@ #include "WriteChecker.h" #include "../../timingCalculations.h" -#include "../../../../common/rename_utils.h" +#include "../../../../common/utils.h" #include "ReadChecker.h" using namespace std; diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h index fa7eafba..4bddeb69 100644 --- a/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h +++ b/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h @@ -41,7 +41,7 @@ #include "../../configuration/Configuration.h" #include "../../../ControllerState.h" -class WriteChecker: public ICommandChecker +class WriteChecker : public ICommandChecker { public: WriteChecker(const Configuration &config, diff --git a/DRAMSys/library/src/controller/core/timingCalculations.cpp b/DRAMSys/library/src/controller/core/timingCalculations.cpp index 6a94cbc0..2f4b65cb 100644 --- a/DRAMSys/library/src/controller/core/timingCalculations.cpp +++ b/DRAMSys/library/src/controller/core/timingCalculations.cpp @@ -39,7 +39,7 @@ #include "ControllerCore.h" #include "../../common/DebugManager.h" #include "configuration/Configuration.h" -#include "../../common/rename_utils.h" +#include "../../common/utils.h" diff --git a/DRAMSys/library/src/controller/core/timingCalculations.h b/DRAMSys/library/src/controller/core/timingCalculations.h index 7a938f8b..e9f80d4e 100644 --- a/DRAMSys/library/src/controller/core/timingCalculations.h +++ b/DRAMSys/library/src/controller/core/timingCalculations.h @@ -42,7 +42,6 @@ #include "../../common/dramExtensions.h" #include "../Command.h" - sc_time getMinExecutionTimeForPowerDownCmd(Command command); sc_time getExecutionTime(Command command, tlm::tlm_generic_payload &payload); diff --git a/DRAMSys/library/src/controller/scheduler/IScheduler.h b/DRAMSys/library/src/controller/scheduler/IScheduler.h index 80b6debd..b40f29ec 100644 --- a/DRAMSys/library/src/controller/scheduler/IScheduler.h +++ b/DRAMSys/library/src/controller/scheduler/IScheduler.h @@ -38,7 +38,6 @@ #ifndef ISCHEDULER_H #define ISCHEDULER_H - #include #include "../../common/dramExtensions.h" #include "../Command.h" diff --git a/DRAMSys/library/src/simulation/DRAMSys.cpp b/DRAMSys/library/src/simulation/DRAMSys.cpp index a01a1cc8..46be1af4 100644 --- a/DRAMSys/library/src/simulation/DRAMSys.cpp +++ b/DRAMSys/library/src/simulation/DRAMSys.cpp @@ -50,7 +50,7 @@ #include "../common/CongenAddressDecoder.h" #include "../controller/core/ControllerCore.h" #include "../controller/core/configuration/ConfigurationLoader.h" -#include "../common/rename_utils.h" +#include "../common/utils.h" #include "../simulation/TemperatureController.h" #include "../controller/Controller.h" #include "../error/ecchamming.h" diff --git a/DRAMSys/library/src/simulation/DRAMSys.h b/DRAMSys/library/src/simulation/DRAMSys.h index a2fead62..288820e8 100644 --- a/DRAMSys/library/src/simulation/DRAMSys.h +++ b/DRAMSys/library/src/simulation/DRAMSys.h @@ -53,7 +53,7 @@ #include "../common/tlm2_base_protocol_checker.h" #include "../error/eccbaseclass.h" -class DRAMSys: public sc_module +class DRAMSys : public sc_module { public: tlm_utils::multi_passthrough_target_socket tSocket; diff --git a/DRAMSys/library/src/simulation/Dram.cpp b/DRAMSys/library/src/simulation/Dram.cpp index 0c7388d1..e18f1456 100644 --- a/DRAMSys/library/src/simulation/Dram.cpp +++ b/DRAMSys/library/src/simulation/Dram.cpp @@ -54,7 +54,7 @@ #include "../controller/core/timingCalculations.h" #include "../controller/core/configuration/Configuration.h" #include "../common/protocol.h" -#include "../common/rename_utils.h" +#include "../common/utils.h" #include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h" #include "../error/errormodel.h" diff --git a/DRAMSys/library/src/simulation/ExampleInitiator.h b/DRAMSys/library/src/simulation/ExampleInitiator.h index 6440d5a7..7b227709 100644 --- a/DRAMSys/library/src/simulation/ExampleInitiator.h +++ b/DRAMSys/library/src/simulation/ExampleInitiator.h @@ -10,7 +10,8 @@ using namespace std; -struct ExampleInitiator: sc_module { +struct ExampleInitiator : sc_module +{ // TLM-2 socket, defaults to 32-bits wide, base protocol tlm_utils::simple_initiator_socket socket; diff --git a/DRAMSys/library/src/simulation/IArbiter.h b/DRAMSys/library/src/simulation/IArbiter.h index 5dc93a6a..872fd929 100644 --- a/DRAMSys/library/src/simulation/IArbiter.h +++ b/DRAMSys/library/src/simulation/IArbiter.h @@ -49,7 +49,8 @@ using namespace std; using namespace tlm; -struct IArbiter: public sc_module { +struct IArbiter : public sc_module +{ public: tlm_utils::multi_passthrough_target_socket tSocket; tlm_utils::multi_passthrough_initiator_socket iSocket; diff --git a/DRAMSys/library/src/simulation/Setup.h b/DRAMSys/library/src/simulation/Setup.h index 8b8542ce..34d064e1 100644 --- a/DRAMSys/library/src/simulation/Setup.h +++ b/DRAMSys/library/src/simulation/Setup.h @@ -39,7 +39,7 @@ #include #include -#include "../common/rename_utils.h" +#include "../common/utils.h" #include "TracePlayer.h" #include "StlPlayer.h" diff --git a/DRAMSys/library/src/simulation/StlPlayer.h b/DRAMSys/library/src/simulation/StlPlayer.h index b8b0e9a8..b8e23bbd 100644 --- a/DRAMSys/library/src/simulation/StlPlayer.h +++ b/DRAMSys/library/src/simulation/StlPlayer.h @@ -46,7 +46,8 @@ using namespace std; using namespace tlm; -template class StlPlayer: public TracePlayer +template +class StlPlayer : public TracePlayer { public: StlPlayer(sc_module_name /*name*/, diff --git a/DRAMSys/library/src/simulation/TemperatureController.h b/DRAMSys/library/src/simulation/TemperatureController.h index 3f510d97..8d91d56a 100644 --- a/DRAMSys/library/src/simulation/TemperatureController.h +++ b/DRAMSys/library/src/simulation/TemperatureController.h @@ -43,7 +43,7 @@ #include #include "../common/DebugManager.h" -#include "../common/rename_utils.h" +#include "../common/utils.h" #include "../controller/core/configuration/Configuration.h" #ifdef THERMALSIM diff --git a/DRAMSys/library/src/simulation/TraceGenerator.h b/DRAMSys/library/src/simulation/TraceGenerator.h index 3019b6f5..7a1ebec4 100644 --- a/DRAMSys/library/src/simulation/TraceGenerator.h +++ b/DRAMSys/library/src/simulation/TraceGenerator.h @@ -38,13 +38,13 @@ #ifndef TRACEGENERATOR_H #define TRACEGENERATOR_H - #include "TracePlayer.h" using namespace std; using namespace tlm; -struct TraceGenerator: public TracePlayer { +struct TraceGenerator : public TracePlayer +{ public: TraceGenerator(sc_module_name /*name*/, unsigned int clkMhz, TracePlayerListener *listener) : TracePlayer(listener), transCounter(0) diff --git a/DRAMSys/library/src/simulation/TracePlayer.h b/DRAMSys/library/src/simulation/TracePlayer.h index 5a34df28..fbc2e004 100644 --- a/DRAMSys/library/src/simulation/TracePlayer.h +++ b/DRAMSys/library/src/simulation/TracePlayer.h @@ -56,7 +56,8 @@ using namespace std; using namespace tlm; -struct TracePlayer: public sc_module { +struct TracePlayer : public sc_module +{ public: tlm_utils::simple_initiator_socket iSocket; TracePlayer(TracePlayerListener *listener); diff --git a/DRAMSys/library/src/simulation/TraceSetup.h b/DRAMSys/library/src/simulation/TraceSetup.h index c4c39279..49f91049 100644 --- a/DRAMSys/library/src/simulation/TraceSetup.h +++ b/DRAMSys/library/src/simulation/TraceSetup.h @@ -39,7 +39,7 @@ #include #include -#include "../common/rename_utils.h" +#include "../common/utils.h" #include "TracePlayer.h" #include "StlPlayer.h"