Merge pull request #17 from fzeder/master

Please see the individual commits

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "DRAMSys/dram/src/common/third_party/DRAMPower"]
-	path = DRAMSys/dram/src/common/third_party/DRAMPower
+[submodule "DRAMSys/dramSys/src/common/third_party/DRAMPower"]
+	path = DRAMSys/dramSys/src/common/third_party/DRAMPower
 	url = https://github.com/ravenrd/DRAMPower.git
-[submodule "DRAMSys/dram/src/common/third_party/tinyxml2"]
-	path = DRAMSys/dram/src/common/third_party/tinyxml2
+[submodule "DRAMSys/dramSys/src/common/third_party/tinyxml2"]
+	path = DRAMSys/dramSys/src/common/third_party/tinyxml2
 	url = https://github.com/leethomason/tinyxml2.git

DRAMSys/dram.vp.system.pro

@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS = dram/dramSys/dramSys.pro
-SUBDIRS += analyzer/analyzer/traceAnalyzer.pro
+SUBDIRS = dramSys/dramSys.pro
+SUBDIRS += analyzer/traceAnalyzer.pro
 

DRAMSys/dram/dramSys/dramSys.pro

@@ -1,132 +0,0 @@
-TEMPLATE = app
-CONFIG += console
-CONFIG -= app_bundle
-CONFIG -= qt
-
-system(cd ../../../DRAMSys/dram/src/common/third_party/DRAMPower; make lib;)
-
-LIBS += -L/opt/systemc/lib-linux64 -lsystemc
-LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system
-LIBS += -lsqlite3
-LIBS += -lpthread
-LIBS += -L../../../DRAMSys/dram/src/common/third_party/DRAMPower/src/ -ldrampower
-
-INCLUDEPATH += /opt/systemc/include
-INCLUDEPATH += /opt/boost/include
-INCLUDEPATH += ../src/common/third_party/DRAMPower/src
-INCLUDEPATH += ../src/common/third_party/DRAMPower/src/libdrampower
-
-
-DEFINES += TIXML_USE_STL
-DEFINES += SC_INCLUDE_DYNAMIC_PROCESSES
-release {
-  DEFINES += NDEBUG
-}
-
-QMAKE_CXXFLAGS += -std=c++11
-QMAKE_CXXFLAGS += -isystem /opt/systemc/include
-QMAKE_CXXFLAGS += -isystem /opt/boost/include
-
-SOURCES += \
-    ../src/common/third_party/tinyxml2/tinyxml2.cpp \
-    ../src/common/xmlAddressdecoder.cpp \
-    ../src/common/Utils.cpp \
-    ../src/common/TlmRecorder.cpp \
-    ../src/common/dramExtension.cpp \
-    ../src/common/DebugManager.cpp \
-    ../src/controller/core/configuration/Configuration.cpp \
-    ../src/controller/core/powerdown/PowerDownManagerTimeout.cpp \
-    ../src/controller/core/powerdown/PowerDownManagerBankwise.cpp \
-    ../src/controller/core/powerdown/PowerDownManager.cpp \
-    ../src/controller/scheduler/ThreadLoad.cpp \
-    ../src/controller/scheduler/PARBS.cpp \
-    ../src/controller/scheduler/Fr_Fcfs.cpp \
-    ../src/controller/scheduler/Fifo.cpp \
-    ../src/controller/core/refresh/RefreshManagerBankwise.cpp \
-    ../src/controller/core/refresh/RefreshManager.cpp \
-    ../src/controller/core/scheduling/checker/WriteChecker.cpp \
-    ../src/controller/core/scheduling/checker/RefreshChecker.cpp \
-    ../src/controller/core/scheduling/checker/ReadChecker.cpp \
-    ../src/controller/core/scheduling/checker/PrechargeChecker.cpp \
-    ../src/controller/core/scheduling/checker/PrechargeAllChecker.cpp \
-    ../src/controller/core/scheduling/checker/PowerDownChecker.cpp \
-    ../src/controller/core/scheduling/checker/ActivateChecker.cpp \
-    ../src/controller/core/scheduling/ScheduledCommand.cpp \
-    ../src/controller/core/TimingCalculation.cpp \
-    ../src/controller/core/Slots.cpp \
-    ../src/controller/core/ControllerCore.cpp \
-    ../src/simulation/SimulationManager.cpp \
-    ../src/simulation/Simulation.cpp \
-    ../src/simulation/MemoryManager.cpp \
-    ../src/simulation/main.cpp \
-    ../src/controller/scheduler/readwritegrouper.cpp \
-    ../src/controller/core/configuration/ConfigurationLoader.cpp \
-    ../src/controller/core/powerdown/NoPowerDown.cpp \
-    ../src/controller/Command.cpp \
-    ../src/controller/Controller.cpp \
-    ../src/controller/ControllerState.cpp \
-    ../src/controller/RowBufferStates.cpp \
-    ../src/controller/scheduler/IScheduler.cpp \
-    ../src/controller/scheduler/FifoStrict.cpp \
-    ../src/error/nest_map.cpp \
-    ../src/error/flip_memory.cpp
-
-HEADERS += \
-    ../src/common/third_party/tinyxml2/tinyxml2.h \
-    ../src/common/xmlAddressdecoder.h \
-    ../src/common/Utils.h \
-    ../src/common/TlmRecorder.h \
-    ../src/common/tlm2_base_protocol_checker.h \
-    ../src/common/protocol.h \
-    ../src/common/dramExtension.h \
-    ../src/common/DebugManager.h \
-    ../src/controller/core/configuration/Configuration.h \
-    ../src/controller/core/powerdown/PowerDownManagerTimeout.h \
-    ../src/controller/core/powerdown/PowerDownManagerBankwise.h \
-    ../src/controller/core/powerdown/PowerDownManager.h \
-    ../src/controller/scheduler/ThreadLoad.h \
-    ../src/controller/scheduler/PARBS.h \
-    ../src/controller/scheduler/Fr_Fcfs.h \
-    ../src/controller/scheduler/Fifo.h \
-    ../src/controller/Controller.h \
-    ../src/controller/core/refresh/RefreshManagerBankwise.h \
-    ../src/controller/core/refresh/RefreshManager.h \
-    ../src/controller/core/refresh/IRefreshManager.h \
-    ../src/controller/core/scheduling/checker/WriteChecker.h \
-    ../src/controller/core/scheduling/checker/RefreshChecker.h \
-    ../src/controller/core/scheduling/checker/ReadChecker.h \
-    ../src/controller/core/scheduling/checker/PrechargeChecker.h \
-    ../src/controller/core/scheduling/checker/PrechargeAllChecker.h \
-    ../src/controller/core/scheduling/checker/PowerDownChecker.h \
-    ../src/controller/core/scheduling/checker/ICommandChecker.h \
-    ../src/controller/core/scheduling/checker/ActivateChecker.h \
-    ../src/controller/core/scheduling/Trigger.h \
-    ../src/controller/core/scheduling/ScheduledCommand.h \
-    ../src/controller/core/TimingCalculation.h \
-    ../src/controller/core/Slots.h \
-    ../src/controller/core/ControllerCore.h \
-    ../src/simulation/TracePlayer.h \
-    ../src/simulation/SimulationManager.h \
-    ../src/simulation/Simulation.h \
-    ../src/simulation/MemoryManager.h \
-    ../src/simulation/Dram.h \
-    ../src/simulation/Arbiter.h \
-    ../src/common/libDRAMPower.h \
-    ../src/controller/scheduler/readwritegrouper.h \
-    ../src/simulation/ReorderBuffer.h \
-    ../src/controller/core/configuration/MemSpec.h \
-    ../src/simulation/StlPlayer.h \
-    ../src/simulation/TracePlayerListener.h \
-    ../src/simulation/TraceGenerator.h \
-    ../src/controller/core/powerdown/NoPowerDown.h \
-    ../src/controller/Command.h \
-    ../src/controller/RowBufferStates.h \
-    ../src/controller/ControllerState.h \
-    ../src/controller/core/powerdown/IPowerDownManager.h \
-    ../src/controller/scheduler/IScheduler.h \
-    ../src/controller/scheduler/FifoStrict.h \
-    ../src/controller/IController.h \
-    ../src/controller/core/configuration/ConfigurationLoader.h \
-    ../src/error/nest_map.h \
-    ../src/error/flip_memory.h
-

DRAMSys/dramSys/dramSys.pro

@@ -0,0 +1,132 @@
+TEMPLATE = app
+CONFIG += console
+CONFIG -= app_bundle
+CONFIG -= qt
+
+system(cd ../../DRAMSys/dramSys/src/common/third_party/DRAMPower; make lib;)
+
+LIBS += -L/opt/systemc/lib-linux64 -lsystemc
+LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system
+LIBS += -lsqlite3
+LIBS += -lpthread
+LIBS += -L../../DRAMSys/dramSys/src/common/third_party/DRAMPower/src/ -ldrampower
+
+INCLUDEPATH += /opt/systemc/include
+INCLUDEPATH += /opt/boost/include
+INCLUDEPATH += src/common/third_party/DRAMPower/src
+INCLUDEPATH += src/common/third_party/DRAMPower/src/libdrampower
+
+
+DEFINES += TIXML_USE_STL
+DEFINES += SC_INCLUDE_DYNAMIC_PROCESSES
+release {
+  DEFINES += NDEBUG
+}
+
+QMAKE_CXXFLAGS += -std=c++11
+QMAKE_CXXFLAGS += -isystem /opt/systemc/include
+QMAKE_CXXFLAGS += -isystem /opt/boost/include
+
+SOURCES += \
+    src/common/third_party/tinyxml2/tinyxml2.cpp \
+    src/common/xmlAddressdecoder.cpp \
+    src/common/Utils.cpp \
+    src/common/TlmRecorder.cpp \
+    src/common/dramExtension.cpp \
+    src/common/DebugManager.cpp \
+    src/controller/core/configuration/Configuration.cpp \
+    src/controller/core/powerdown/PowerDownManagerTimeout.cpp \
+    src/controller/core/powerdown/PowerDownManagerBankwise.cpp \
+    src/controller/core/powerdown/PowerDownManager.cpp \
+    src/controller/scheduler/ThreadLoad.cpp \
+    src/controller/scheduler/PARBS.cpp \
+    src/controller/scheduler/Fr_Fcfs.cpp \
+    src/controller/scheduler/Fifo.cpp \
+    src/controller/core/refresh/RefreshManagerBankwise.cpp \
+    src/controller/core/refresh/RefreshManager.cpp \
+    src/controller/core/scheduling/checker/WriteChecker.cpp \
+    src/controller/core/scheduling/checker/RefreshChecker.cpp \
+    src/controller/core/scheduling/checker/ReadChecker.cpp \
+    src/controller/core/scheduling/checker/PrechargeChecker.cpp \
+    src/controller/core/scheduling/checker/PrechargeAllChecker.cpp \
+    src/controller/core/scheduling/checker/PowerDownChecker.cpp \
+    src/controller/core/scheduling/checker/ActivateChecker.cpp \
+    src/controller/core/scheduling/ScheduledCommand.cpp \
+    src/controller/core/TimingCalculation.cpp \
+    src/controller/core/Slots.cpp \
+    src/controller/core/ControllerCore.cpp \
+    src/simulation/SimulationManager.cpp \
+    src/simulation/Simulation.cpp \
+    src/simulation/MemoryManager.cpp \
+    src/simulation/main.cpp \
+    src/controller/scheduler/readwritegrouper.cpp \
+    src/controller/core/configuration/ConfigurationLoader.cpp \
+    src/controller/core/powerdown/NoPowerDown.cpp \
+    src/controller/Command.cpp \
+    src/controller/Controller.cpp \
+    src/controller/ControllerState.cpp \
+    src/controller/RowBufferStates.cpp \
+    src/controller/scheduler/IScheduler.cpp \
+    src/controller/scheduler/FifoStrict.cpp \
+    src/error/nest_map.cpp \
+    src/error/flip_memory.cpp
+
+HEADERS += \
+    src/common/third_party/tinyxml2/tinyxml2.h \
+    src/common/xmlAddressdecoder.h \
+    src/common/Utils.h \
+    src/common/TlmRecorder.h \
+    src/common/tlm2_base_protocol_checker.h \
+    src/common/protocol.h \
+    src/common/dramExtension.h \
+    src/common/DebugManager.h \
+    src/controller/core/configuration/Configuration.h \
+    src/controller/core/powerdown/PowerDownManagerTimeout.h \
+    src/controller/core/powerdown/PowerDownManagerBankwise.h \
+    src/controller/core/powerdown/PowerDownManager.h \
+    src/controller/scheduler/ThreadLoad.h \
+    src/controller/scheduler/PARBS.h \
+    src/controller/scheduler/Fr_Fcfs.h \
+    src/controller/scheduler/Fifo.h \
+    src/controller/Controller.h \
+    src/controller/core/refresh/RefreshManagerBankwise.h \
+    src/controller/core/refresh/RefreshManager.h \
+    src/controller/core/refresh/IRefreshManager.h \
+    src/controller/core/scheduling/checker/WriteChecker.h \
+    src/controller/core/scheduling/checker/RefreshChecker.h \
+    src/controller/core/scheduling/checker/ReadChecker.h \
+    src/controller/core/scheduling/checker/PrechargeChecker.h \
+    src/controller/core/scheduling/checker/PrechargeAllChecker.h \
+    src/controller/core/scheduling/checker/PowerDownChecker.h \
+    src/controller/core/scheduling/checker/ICommandChecker.h \
+    src/controller/core/scheduling/checker/ActivateChecker.h \
+    src/controller/core/scheduling/Trigger.h \
+    src/controller/core/scheduling/ScheduledCommand.h \
+    src/controller/core/TimingCalculation.h \
+    src/controller/core/Slots.h \
+    src/controller/core/ControllerCore.h \
+    src/simulation/TracePlayer.h \
+    src/simulation/SimulationManager.h \
+    src/simulation/Simulation.h \
+    src/simulation/MemoryManager.h \
+    src/simulation/Dram.h \
+    src/simulation/Arbiter.h \
+    src/common/libDRAMPower.h \
+    src/controller/scheduler/readwritegrouper.h \
+    src/simulation/ReorderBuffer.h \
+    src/controller/core/configuration/MemSpec.h \
+    src/simulation/StlPlayer.h \
+    src/simulation/TracePlayerListener.h \
+    src/simulation/TraceGenerator.h \
+    src/controller/core/powerdown/NoPowerDown.h \
+    src/controller/Command.h \
+    src/controller/RowBufferStates.h \
+    src/controller/ControllerState.h \
+    src/controller/core/powerdown/IPowerDownManager.h \
+    src/controller/scheduler/IScheduler.h \
+    src/controller/scheduler/FifoStrict.h \
+    src/controller/IController.h \
+    src/controller/core/configuration/ConfigurationLoader.h \
+    src/error/nest_map.h \
+    src/error/flip_memory.h
+