Merge branch 'master' of git.rhrk.uni-kl.de:EIT-Wehn/dram.vp.system

Conflicts:
	dram/src/simulation/Dram.h

dram/dramSys/dramSys.pro

@@ -8,13 +8,14 @@ LIBS += -L/opt/systemc/lib-linux64 -lsystemc
 LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system
 LIBS += -L/opt/sqlite3/lib -lsqlite3
 LIBS += -lpthread
-LIBS += -lxerces-c
+LIBS += -L/opt/xerces-c-3.1.1/lib -lxerces-c
 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 += /opt/xerces-c-3.1.1/include
 INCLUDEPATH += ../src/common/third_party/DRAMPower/src
 INCLUDEPATH += ../src/common/third_party/DRAMPower/src/libdrampower
 

dram/resources/configs/memconfigs/fifo.xml

@@ -1,6 +1,6 @@
 <memspec>
   <memconfig>
-    <parameter id="bankwiseLogic" type="bool" value="1" />
+    <parameter id="bankwiseLogic" type="bool" value="0" />
     <parameter id="openPagePolicy" type="bool" value="1" />
     <parameter id="adaptiveOpenPagePolicy" type="bool" value="0" />
     <parameter id="refreshAwareScheduling" type="bool" value="0" />

dram/resources/simulations/sim-batch.xml

@@ -16,7 +16,7 @@
 
 
 <trace-setup id="media">
-      <device clkMhz="800">chstone-sha_32.stl</device> 
+      <device clkMhz="800">small.stl</device> 
 </trace-setup>
     
   </trace-setups>

dram/src/simulation/Dram.h

@@ -67,7 +67,6 @@ class column
 
     void set(unsigned char * payloadDataPtr)
     {
-        //printf("Dest: %p Source: %p\n",data,payloadDataPtr);
         memcpy(data, payloadDataPtr, bytes);
     }
 

dram/src/simulation/main.cpp

@@ -32,6 +32,7 @@ int main(int argc, char **argv)
 
 int sc_main(int argc, char **argv)
 {
+    cout<<"hello"<<endl;
     sc_set_time_resolution(1, SC_PS);
     resources = pathOfFile(argv[0]) + string("/../resources/");