diff --git a/dram/.cproject b/dram/.cproject index 256a525f..a6a2ab6a 100644 --- a/dram/.cproject +++ b/dram/.cproject @@ -2,7 +2,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -32,8 +32,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -160,7 +86,7 @@ - + @@ -171,10 +97,10 @@ diff --git a/dram/.gitignore b/dram/.gitignore index d8639600..9317c5ad 100644 --- a/dram/.gitignore +++ b/dram/.gitignore @@ -3,3 +3,5 @@ /standalone /standalone /platformArchitect +/simulation +/unit_test diff --git a/dram/.settings/language.settings.xml b/dram/.settings/language.settings.xml index 4e85dbab..6d713a79 100644 --- a/dram/.settings/language.settings.xml +++ b/dram/.settings/language.settings.xml @@ -1,6 +1,6 @@ - + @@ -10,17 +10,7 @@ - - - - - - - - - - - + diff --git a/dram/.settings/org.eclipse.cdt.core.prefs b/dram/.settings/org.eclipse.cdt.core.prefs index ad7d7b04..e2661c56 100644 --- a/dram/.settings/org.eclipse.cdt.core.prefs +++ b/dram/.settings/org.eclipse.cdt.core.prefs @@ -1,4 +1,15 @@ eclipse.preferences.version=1 +indexer/indexAllFiles=true +indexer/indexOnOpen=false +indexer/indexUnusedHeadersWithAlternateLang=false +indexer/indexUnusedHeadersWithDefaultLang=true +indexer/indexerId=org.eclipse.cdt.core.fastIndexer +indexer/skipFilesLargerThanMB=8 +indexer/skipImplicitReferences=false +indexer/skipMacroReferences=false +indexer/skipReferences=false +indexer/skipTypeReferences=false +indexer/useHeuristicIncludeResolution=true org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.cdt.core.formatter.alignment_for_assignment=16 org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=80 diff --git a/dram/src/core/CommandBus.cpp b/dram/src/core/CommandBus.cpp index abc94be2..9f0dc420 100644 --- a/dram/src/core/CommandBus.cpp +++ b/dram/src/core/CommandBus.cpp @@ -5,8 +5,8 @@ * Author: jonny */ -#include "CommandBus.h" #include +#include "CommandBus.h" namespace core { diff --git a/dram/src/core/CommandBus.h b/dram/src/core/CommandBus.h index 7c7e9853..2f9f0960 100644 --- a/dram/src/core/CommandBus.h +++ b/dram/src/core/CommandBus.h @@ -8,15 +8,15 @@ #ifndef INTERNALSCHEDULER_H_ #define INTERNALSCHEDULER_H_ -#include "scheduling/CommandSchedule.h" -#include "core/ControllerState.h" -#include "core/scheduling/Trigger.h" -#include "IInternalScheduler.h" -#include "core/Configuration.h" -#include "core/scheduling/checker/ICommandChecker.h" -#include "tlm/IControllerWrapper.h" #include #include +#include "../tlm/IControllerWrapper.h" +#include "ControllerState.h" +#include "IInternalScheduler.h" +#include "Configuration.h" +#include "scheduling/CommandSchedule.h" +#include "scheduling/Trigger.h" +#include "scheduling/checker/ICommandChecker.h" namespace core { diff --git a/dram/src/core/Controller.cpp b/dram/src/core/Controller.cpp index 6bc90e08..a0d20bef 100644 --- a/dram/src/core/Controller.cpp +++ b/dram/src/core/Controller.cpp @@ -5,12 +5,12 @@ * Author: jonny */ +#include #include "Controller.h" -#include "systemc.h" -#include "core/scheduling/checker/ActivateChecker.h" -#include "core/scheduling/checker/PrechargeChecker.h" -#include "core/scheduling/checker/ReadChecker.h" -#include "core/scheduling/checker/WriteChecker.h" +#include "scheduling/checker/ActivateChecker.h" +#include "scheduling/checker/PrechargeChecker.h" +#include "scheduling/checker/ReadChecker.h" +#include "scheduling/checker/WriteChecker.h" namespace core { diff --git a/dram/src/core/Controller.h b/dram/src/core/Controller.h index b59fc872..f1794648 100644 --- a/dram/src/core/Controller.h +++ b/dram/src/core/Controller.h @@ -9,15 +9,15 @@ #define CONTROLLER_H_ #include -#include "scheduling/CommandSequenceGenerator.h" +#include +#include "../tlm/IControllerWrapper.h" #include "CommandBus.h" #include "Configuration.h" -#include "refresh/RefreshManager.h" #include "powerdown/PowerDownManager.h" -#include +#include "refresh/RefreshManager.h" +#include "scheduling/CommandSequenceGenerator.h" #include "scheduling/checker/ICommandChecker.h" #include "scheduling/CommandSequenceScheduler.h" -#include "tlm/IControllerWrapper.h" namespace core { diff --git a/dram/src/core/IInternalScheduler.h b/dram/src/core/IInternalScheduler.h index 228fc7ef..e0df6f48 100644 --- a/dram/src/core/IInternalScheduler.h +++ b/dram/src/core/IInternalScheduler.h @@ -7,7 +7,9 @@ #ifndef IINTERNALSCHEDULER_H_ #define IINTERNALSCHEDULER_H_ + #include +#include "scheduling/ScheduledCommand.h" namespace core { diff --git a/dram/src/core/TimingConfiguration.h b/dram/src/core/TimingConfiguration.h index 05584260..ef11e3a7 100644 --- a/dram/src/core/TimingConfiguration.h +++ b/dram/src/core/TimingConfiguration.h @@ -9,7 +9,7 @@ #define TIMINGS_H_ #include -#include "core/utils/Utils.h" +#include "utils/Utils.h" namespace core{ diff --git a/dram/src/core/powerdown/PowerDownManager.cpp b/dram/src/core/powerdown/PowerDownManager.cpp index 1ee7f3e3..a1588773 100644 --- a/dram/src/core/powerdown/PowerDownManager.cpp +++ b/dram/src/core/powerdown/PowerDownManager.cpp @@ -5,7 +5,7 @@ * Author: jonny */ -#include +#include "PowerDownManager.h" namespace core { diff --git a/dram/src/core/refresh/BankwiseRefreshManager.cpp b/dram/src/core/refresh/BankwiseRefreshManager.cpp index 2cbe7ee2..57998fa5 100644 --- a/dram/src/core/refresh/BankwiseRefreshManager.cpp +++ b/dram/src/core/refresh/BankwiseRefreshManager.cpp @@ -5,7 +5,7 @@ * Author: jonny */ -#include +#include "BankwiseRefreshManager.h" using namespace std; diff --git a/dram/src/core/refresh/IRefreshManager.h b/dram/src/core/refresh/IRefreshManager.h index f54e4b7c..63c662e9 100644 --- a/dram/src/core/refresh/IRefreshManager.h +++ b/dram/src/core/refresh/IRefreshManager.h @@ -10,9 +10,9 @@ #include #include -#include "core/CommandBus.h" -#include "core/Configuration.h" -#include "core/scheduling/ScheduledCommand.h" +#include "../CommandBus.h" +#include "../Configuration.h" +#include "../scheduling/ScheduledCommand.h" namespace core { diff --git a/dram/src/core/refresh/RefreshManager.cpp b/dram/src/core/refresh/RefreshManager.cpp index 026c23ae..8596fe82 100644 --- a/dram/src/core/refresh/RefreshManager.cpp +++ b/dram/src/core/refresh/RefreshManager.cpp @@ -5,8 +5,8 @@ * Author: jonny */ -#include -#include "core/utils/Utils.h" +#include "RefreshManager.h" +#include "../utils/Utils.h" diff --git a/dram/src/core/scheduling/CommandSequenceGenerator.h b/dram/src/core/scheduling/CommandSequenceGenerator.h index 9be1c0cd..df8516e0 100644 --- a/dram/src/core/scheduling/CommandSequenceGenerator.h +++ b/dram/src/core/scheduling/CommandSequenceGenerator.h @@ -10,8 +10,8 @@ #include #include -#include "core/ControllerState.h" -#include "core/Command.h" +#include "../ControllerState.h" +#include "../Command.h" namespace core { diff --git a/dram/src/core/scheduling/CommandSequenceScheduler.cpp b/dram/src/core/scheduling/CommandSequenceScheduler.cpp index 9f612999..45092fc9 100644 --- a/dram/src/core/scheduling/CommandSequenceScheduler.cpp +++ b/dram/src/core/scheduling/CommandSequenceScheduler.cpp @@ -5,8 +5,8 @@ * Author: jonny */ -#include "core/scheduling/CommandSequenceScheduler.h" -#include "core/Controller.h" +#include "CommandSequenceScheduler.h" +#include "../Controller.h" namespace core { diff --git a/dram/src/core/scheduling/CommandSequenceScheduler.h b/dram/src/core/scheduling/CommandSequenceScheduler.h index e9c9a5a1..1e7eb07c 100644 --- a/dram/src/core/scheduling/CommandSequenceScheduler.h +++ b/dram/src/core/scheduling/CommandSequenceScheduler.h @@ -8,10 +8,10 @@ #ifndef COMMANDSEQUENCESCHEDULER_H_ #define COMMANDSEQUENCESCHEDULER_H_ -#include "CommandSchedule.h" -#include "core/Command.h" #include -#include "core/scheduling/checker/ICommandChecker.h" +#include "CommandSchedule.h" +#include "../Command.h" +#include "checker/ICommandChecker.h" diff --git a/dram/src/core/scheduling/ScheduledCommand.h b/dram/src/core/scheduling/ScheduledCommand.h index 8a5b271e..989448a6 100644 --- a/dram/src/core/scheduling/ScheduledCommand.h +++ b/dram/src/core/scheduling/ScheduledCommand.h @@ -10,7 +10,7 @@ #include #include -#include "core/Command.h" +#include "../Command.h" #include "common/dramExtension.h" namespace core { diff --git a/dram/src/core/scheduling/checker/ActivateChecker.cpp b/dram/src/core/scheduling/checker/ActivateChecker.cpp index 69285125..e2010c1c 100644 --- a/dram/src/core/scheduling/checker/ActivateChecker.cpp +++ b/dram/src/core/scheduling/checker/ActivateChecker.cpp @@ -7,8 +7,8 @@ #include #include -#include "core/utils/Utils.h" -#include "core/scheduling/checker/ActivateChecker.h" +#include "../../utils/Utils.h" +#include "ActivateChecker.h" namespace core { diff --git a/dram/src/core/scheduling/checker/ActivateChecker.h b/dram/src/core/scheduling/checker/ActivateChecker.h index e9844828..cdcbb9d9 100644 --- a/dram/src/core/scheduling/checker/ActivateChecker.h +++ b/dram/src/core/scheduling/checker/ActivateChecker.h @@ -9,10 +9,10 @@ #define ACTIVATESCHEDULER_H_ #include -#include "core/scheduling/checker/ICommandChecker.h" -#include "core/Configuration.h" -#include "core/utils/RingBuffer.h" -#include "core/CommandBus.h" +#include "ICommandChecker.h" +#include "../../Configuration.h" +#include "../../utils/RingBuffer.h" +#include "../../CommandBus.h" namespace core { diff --git a/dram/src/core/scheduling/checker/ICommandChecker.h b/dram/src/core/scheduling/checker/ICommandChecker.h index 05dbfd74..f4a4ebdd 100644 --- a/dram/src/core/scheduling/checker/ICommandChecker.h +++ b/dram/src/core/scheduling/checker/ICommandChecker.h @@ -9,7 +9,7 @@ #define ICOMMANDSCHEDULER_H_ #include "systemc.h" -#include "core/scheduling/ScheduledCommand.h" +#include "../ScheduledCommand.h" namespace core { diff --git a/dram/src/core/scheduling/checker/PrechargeChecker.cpp b/dram/src/core/scheduling/checker/PrechargeChecker.cpp index 39231b95..a126f873 100644 --- a/dram/src/core/scheduling/checker/PrechargeChecker.cpp +++ b/dram/src/core/scheduling/checker/PrechargeChecker.cpp @@ -5,7 +5,7 @@ * Author: jonny */ -#include +#include "PrechargeChecker.h" namespace core { diff --git a/dram/src/core/scheduling/checker/PrechargeChecker.h b/dram/src/core/scheduling/checker/PrechargeChecker.h index 7060f97e..789dde74 100644 --- a/dram/src/core/scheduling/checker/PrechargeChecker.h +++ b/dram/src/core/scheduling/checker/PrechargeChecker.h @@ -8,9 +8,9 @@ #ifndef PRECHARGECHECKER_H_ #define PRECHARGECHECKER_H_ -#include -#include "core/Configuration.h" -#include "core/CommandBus.h" +#include "ICommandChecker.h" +#include "../../Configuration.h" +#include "../../CommandBus.h" namespace core { diff --git a/dram/src/core/scheduling/checker/ReadChecker.cpp b/dram/src/core/scheduling/checker/ReadChecker.cpp index 6d42ba66..560240bd 100644 --- a/dram/src/core/scheduling/checker/ReadChecker.cpp +++ b/dram/src/core/scheduling/checker/ReadChecker.cpp @@ -5,8 +5,9 @@ * Author: jonny */ -#include -#include "core/utils/Utils.h" +#include "ReadChecker.h" +#include "../../utils/Utils.h" + namespace core { void ReadChecker::check(ScheduledCommand& command) const diff --git a/dram/src/core/scheduling/checker/ReadChecker.h b/dram/src/core/scheduling/checker/ReadChecker.h index 20482ede..4a2ca756 100644 --- a/dram/src/core/scheduling/checker/ReadChecker.h +++ b/dram/src/core/scheduling/checker/ReadChecker.h @@ -8,9 +8,9 @@ #ifndef READCHECKER_H_ #define READCHECKER_H_ -#include -#include "core/Configuration.h" -#include "core/CommandBus.h" +#include "ICommandChecker.h" +#include "../../Configuration.h" +#include "../../CommandBus.h" namespace core { diff --git a/dram/src/core/scheduling/checker/WriteChecker.cpp b/dram/src/core/scheduling/checker/WriteChecker.cpp index 88968cc1..6cf764fa 100644 --- a/dram/src/core/scheduling/checker/WriteChecker.cpp +++ b/dram/src/core/scheduling/checker/WriteChecker.cpp @@ -5,7 +5,7 @@ * Author: jonny */ -#include +#include "WriteChecker.h" namespace core { diff --git a/dram/src/core/scheduling/checker/WriteChecker.h b/dram/src/core/scheduling/checker/WriteChecker.h index 7c3a2c2e..d0af1328 100644 --- a/dram/src/core/scheduling/checker/WriteChecker.h +++ b/dram/src/core/scheduling/checker/WriteChecker.h @@ -8,9 +8,9 @@ #ifndef WRITECHECKER_H_ #define WRITECHECKER_H_ -#include -#include "core/Configuration.h" -#include "core/CommandBus.h" +#include "ICommandChecker.h" +#include "../../Configuration.h" +#include "../../CommandBus.h" namespace core { diff --git a/dram/src/core/utils/Utils.h b/dram/src/core/utils/Utils.h index 333dc58e..3c6c85db 100644 --- a/dram/src/core/utils/Utils.h +++ b/dram/src/core/utils/Utils.h @@ -8,9 +8,9 @@ #ifndef UTILS_H_ #define UTILS_H_ -#include "common/dramExtension.h" #include #include +#include "common/dramExtension.h" unsigned int getStartAddress(Bank bank); unsigned int getBurstLengthInBytes(const tlm::tlm_generic_payload& payload, unsigned int buswidth); diff --git a/dram/testing/checker/ActivateChecker_test.cpp b/dram/testing/checker/ActivateChecker_test.cpp deleted file mode 100644 index a38c1ff2..00000000 --- a/dram/testing/checker/ActivateChecker_test.cpp +++ /dev/null @@ -1,12 +0,0 @@ -/* - * ActivateScheduler_test.cpp - * - * Created on: Mar 12, 2014 - * Author: jonny - */ - -#include - -namespace core { - -} /* namespace controller */ diff --git a/dram/testing/checker/PrechargeChecker_test.cpp b/dram/testing/checker/PrechargeChecker_test.cpp deleted file mode 100644 index 6fcbde52..00000000 --- a/dram/testing/checker/PrechargeChecker_test.cpp +++ /dev/null @@ -1,12 +0,0 @@ -/* - * PrechargeChecker_test.cpp - * - * Created on: Mar 13, 2014 - * Author: jonny - */ - -#include - -namespace core { - -} /* namespace controller */ diff --git a/dram/testing/checker/ReadChecker_test.cpp b/dram/testing/checker/ReadChecker_test.cpp deleted file mode 100644 index 5af9ee64..00000000 --- a/dram/testing/checker/ReadChecker_test.cpp +++ /dev/null @@ -1,12 +0,0 @@ -/* - * ReadChecker_test.cpp - * - * Created on: Mar 13, 2014 - * Author: jonny - */ - -#include - -namespace core { - -} /* namespace controller */ diff --git a/dram/testing/checker/WriteChecker_test.cpp b/dram/testing/checker/WriteChecker_test.cpp deleted file mode 100644 index af3637d2..00000000 --- a/dram/testing/checker/WriteChecker_test.cpp +++ /dev/null @@ -1,12 +0,0 @@ -/* - * WriteChecker_test.cpp - * - * Created on: Mar 13, 2014 - * Author: jonny - */ - -#include - -namespace core { - -} /* namespace controller */