Merge remote branch 'upstream/master'

.gitignore

@@ -10,7 +10,6 @@
 *.txt
 /build-simulation
 /release-simulation
-/dram/src/common/third_party/DRAMPower/*
 *.*~
 dram/build-*/
 ._.DS_Store

.gitmodules

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

dram/dramSys/dramSys.pro

@@ -3,6 +3,7 @@ CONFIG += console
 CONFIG -= app_bundle
 CONFIG -= qt
 
+system(cd ../src/common/third_party/DRAMPower; make parserlib; make lib;)
 
 LIBS += -L/opt/systemc/lib-linux64 -lsystemc
 LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system
@@ -33,7 +34,7 @@ QMAKE_CXXFLAGS += -isystem /opt/boost/include
 QMAKE_CXXFLAGS += -iquote ../src/common/third_party/DRAMPower/src/
 
 SOURCES += \
-    ../src/common/third_party/tinyxml2.cpp \
+    ../src/common/third_party/tinyxml2/tinyxml2.cpp \
     ../src/common/xmlAddressdecoder.cpp \
     ../src/common/Utils.cpp \
     ../src/common/TlmRecorder.cpp \
@@ -77,7 +78,7 @@ SOURCES += \
     ../src/error/flip_memory.cpp
 
 HEADERS += \
-    ../src/common/third_party/tinyxml2.h \
+    ../src/common/third_party/tinyxml2/tinyxml2.h \
     ../src/common/xmlAddressdecoder.h \
     ../src/common/Utils.h \
     ../src/common/TlmRecorder.h \

dram/src/common/Utils.h

@@ -45,7 +45,7 @@
 #include <boost/preprocessor.hpp>
 #include <iomanip>
 #include "dramExtension.h"
-#include "third_party/tinyxml2.h"
+#include "third_party/tinyxml2/tinyxml2.h"
 
 //TODO : move to timing specific header
 sc_time getDistance(sc_time a, sc_time b);

dram/src/common/xmlAddressdecoder.h

@@ -43,7 +43,7 @@
 #include <math.h>
 #include <map>
 
-#include "third_party/tinyxml2.h"
+#include "third_party/tinyxml2/tinyxml2.h"
 
 struct DecodedAddress
 {

dram/src/controller/core/configuration/ConfigurationLoader.h

@@ -38,7 +38,7 @@
 #define CONFIGURATIONLOADER_H_
 
 #include <string>
-#include "../../../common/third_party/tinyxml2.h"
+#include "../../../common/third_party/tinyxml2/tinyxml2.h"
 #include "../../../common/Utils.h"
 #include "Configuration.h"
 

dram/src/simulation/Simulation.h

@@ -46,7 +46,7 @@
 #include <string>
 #include <systemc.h>
 #include "TracePlayerListener.h"
-#include "../common/third_party/tinyxml2.h"
+#include "../common/third_party/tinyxml2/tinyxml2.h"
 #include "../error/flip_memory.h"
 
 struct DramSetup

dram/src/simulation/SimulationManager.h

@@ -41,7 +41,7 @@
 #include <string>
 #include <map>
 #include "Simulation.h"
-#include "../common/third_party/tinyxml2.h"
+#include "../common/third_party/tinyxml2/tinyxml2.h"
 
 struct SimulationBatch
 {

install_prerequisites.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-cd dram/src/common/third_party/
-rm -rf DRAMPower
-git clone https://github.com/ravenrd/DRAMPower.git
-cd DRAMPower
-make parserlib
-make lib