Merge branch 'master' of https://git.rhrk.uni-kl.de/ehses/dram.vp.system into ehses-master

Conflicts:
	dram/dramSys/dramSys.pro

dram/src/common/xmlAddressdecoder.cpp

@@ -60,6 +60,17 @@ DecodedAddress xmlAddressDecoder::decodeAddress(sc_dt::uint64 addr)
     return result;
 }
 
+sc_dt::uint64 xmlAddressDecoder::encodeAddress(DecodedAddress n)
+{
+    return n.channel << shifts["channel"] |
+            n.rank << shifts["rank"] |
+            n.bankgroup << shifts["bankgroup"] |
+            n.row << shifts["row"] |
+            n.bank << shifts["bank"] |
+            n.column << shifts["column"] |
+            n.bytes << shifts["bytes"];
+}
+
 void xmlAddressDecoder::print()
 {
     cout << "Used addressmapping:"  << endl;