Merge pull request #28 from fzeder/master

Directory structure changed: dramSys --> simulator

.gitmodules

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

DRAMSys/dram.vp.system.pro

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

DRAMSys/simulator/resources/configs/memconfigs/fr_fcfs.xml

@@ -8,8 +8,8 @@
   <PowerDownTimeout value="100" />
   <!-- Error Model: -->
   <ErrorChipSeed value="42" />
-  <ErrorCSVFile value="../../DRAMSys/dramSys/src/error/error.csv" />
-  <ErrorStoreMode value="ErrorModel" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
+  <ErrorCSVFile value="../../DRAMSys/simulator/src/error/error.csv" />
+  <ErrorStoreMode value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
   <!-- 
   <Buswidth value="128" />
   <ReadWriteGrouping value="false" />

DRAMSys/simulator/resources/simulations/sim-batch.xml

@@ -8,15 +8,15 @@
     </simconfig>
 
     <memspecs>
-        <memspec src="../../DRAMSys/dramSys/resources/configs/memspecs/WideIO.xml"></memspec>
+        <memspec src="../../DRAMSys/simulator/resources/configs/memspecs/WideIO.xml"></memspec>
     </memspecs>
 
     <addressmappings>
-        <addressmapping src="../../DRAMSys/dramSys/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
+        <addressmapping src="../../DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
     </addressmappings>
 
     <memconfigs>
-        <memconfig src="../../DRAMSys/dramSys/resources/configs/memconfigs/fr_fcfs.xml"/>
+        <memconfig src="../../DRAMSys/simulator/resources/configs/memconfigs/fr_fcfs.xml"/>
     </memconfigs>
 
     <tracesetups>

DRAMSys/simulator/simulator.pro

@@ -1,15 +1,17 @@
+TARGET = dramSys
+
 TEMPLATE = app
 CONFIG += console
 CONFIG -= app_bundle
 CONFIG -= qt
 
-system(cd ../../DRAMSys/dramSys/src/common/third_party/DRAMPower; make lib;)
+system(cd ../../DRAMSys/simulator/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
+LIBS += -L../../DRAMSys/simulator/src/common/third_party/DRAMPower/src/ -ldrampower
 
 INCLUDEPATH += /opt/systemc/include
 INCLUDEPATH += /opt/boost/include

DRAMSys/simulator/src/common/TlmRecorder.h

@@ -130,7 +130,7 @@ private:
     sc_time simulationTimeCoveredByRecording;
 
     std::vector<tlm::tlm_phase> transactionTerminatingPhases;
-    sqlite3 *db;
+    sqlite3 *db = NULL;
     sqlite3_stmt *insertTransactionStatement, *insertRangeStatement, *updateRangeStatement,
             *insertPhaseStatement, *updatePhaseStatement, *insertGeneralInfoStatement, *insertDebugMessageStatement, *updateDataStrobeStatement;
     std::string insertTransactionString, insertRangeString, updateRangeString, insertPhaseString, updatePhaseString, insertGeneralInfoString,

DRAMSys/simulator/src/controller/core/powerdown/PowerDownManagerTimeout.h

@@ -66,7 +66,7 @@ private:
     std::map<Bank, tlm::tlm_generic_payload> powerDownPayloads;
     void sendPowerDownPayloads(ScheduledCommand& cmd);
 
-    PowerDownState powerDownState;
+    PowerDownState powerDownState = PowerDownState::Awake;
     void setPowerDownState(PowerDownState state);
     bool isInPowerDown();
 };