Changed Version to the new Main Branch of DRAMPower

dram/dramSys/dramSys.pro

@@ -9,19 +9,23 @@ LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system
 LIBS += -L/opt/sqlite3/lib -lsqlite3
 LIBS += -lpthread
 LIBS += -lxerces-c
-LIBS += -L../src/common/third_party/DRAMPower/src -ldrampower
+LIBS += -L../src/common/third_party/DRAMPower/src/ -ldrampowerxml
+LIBS += -L../src/common/third_party/DRAMPower/src/ -ldrampower
 
 INCLUDEPATH += /opt/systemc/include
 INCLUDEPATH += /opt/boost/include
 INCLUDEPATH += /opt/sqlite3/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
+DEFINES += USE_XERCES=1
 
 QMAKE_CXXFLAGS += -std=c++11
 QMAKE_CXXFLAGS += -isystem /opt/systemc/include
 QMAKE_CXXFLAGS += -isystem /opt/boost/include
+QMAKE_CXXFLAGS += -iquote ../src/common/third_party/DRAMPower/src/
 
 SOURCES += \
     ../src/common/third_party/tinyxml2.cpp \

dram/src/simulation/Dram.h

@@ -19,7 +19,8 @@
 #include "../common/protocol.h"
 #include "../common/Utils.h"
 #include "../common/TlmRecorder.h"
-#include "../common/third_party/DRAMPower/src/LibDRAMPower.h"
+#include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"
+#include "../common/third_party/DRAMPower/src/xmlparser/MemSpecParser.h"
 
 
 using namespace std;
@@ -33,11 +34,12 @@ struct Dram: sc_module
     tlm_utils::simple_target_socket<Dram, BUSWIDTH, tlm::tlm_base_protocol_types> tSocket;
     libDRAMPower *DRAMPower;
 
-    SC_CTOR(Dram) :
-            tSocket("socket")
+    SC_CTOR(Dram) : tSocket("socket")
     {
         tSocket.register_nb_transport_fw(this, &Dram::nb_transport_fw);
-        MemorySpecification memSpec(MemorySpecification::getMemSpecFromXML(Configuration::getInstance().memspecUri));
+
+        MemorySpecification memSpec(MemSpecParser::getMemSpecFromXML(Configuration::getInstance().memspecUri));
+        //MemorySpecification::getMemSpecFromXML(Configuration::getInstance().memspecUri));
         DRAMPower = new libDRAMPower( memSpec, 1,1,1,0,0 );
     }
 

install_prerequisites.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 cd dram/src/common/third_party/
-git clone https://github.com/myzinsky/DRAMPower.git
+git clone https://github.com/ravenrd/DRAMPower.git
 cd DRAMPower
+make parserlib
 make lib