From 4767ae2267d761dc9b7b1b21ffc0bf30a0ebc893 Mon Sep 17 00:00:00 2001
From: Matthias Jung <jungma@eit.uni-kl.de>
Date: Wed, 29 Jul 2015 22:54:15 +0200
Subject: [PATCH] Added amount structure to the xmlAddress decoder With this
 structure it is possible to get e.g. the number of bytes from the mapping
 configuration.

---
 DRAMSys/dramSys/src/common/xmlAddressdecoder.cpp | 2 ++
 DRAMSys/dramSys/src/common/xmlAddressdecoder.h   | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/DRAMSys/dramSys/src/common/xmlAddressdecoder.cpp b/DRAMSys/dramSys/src/common/xmlAddressdecoder.cpp
index d712b98a..24c3c356 100644
--- a/DRAMSys/dramSys/src/common/xmlAddressdecoder.cpp
+++ b/DRAMSys/dramSys/src/common/xmlAddressdecoder.cpp
@@ -79,6 +79,8 @@ xmlAddressDecoder::xmlAddressDecoder(XMLElement* addressmap)
 
         shifts[child->Name()] = from;
         masks[child->Name()] = pow(2.0, to + 1.0) - pow(2.0, from + 0.0);
+        amount[child->Name()] = pow(2.0, to - from + 1.0);
+        //std::cout << child->Name() << " XXXX " << pow(2.0, to - from + 1.0) <<std::endl;
     }
 }
 
diff --git a/DRAMSys/dramSys/src/common/xmlAddressdecoder.h b/DRAMSys/dramSys/src/common/xmlAddressdecoder.h
index 8c5fab0e..19744117 100644
--- a/DRAMSys/dramSys/src/common/xmlAddressdecoder.h
+++ b/DRAMSys/dramSys/src/common/xmlAddressdecoder.h
@@ -62,9 +62,9 @@ struct DecodedAddress
 class xmlAddressDecoder
 {
 
-public:
+  public:
 
-static tinyxml2::XMLElement* addressmapping;
+    static tinyxml2::XMLElement* addressmapping;
     static inline xmlAddressDecoder& getInstance()
     {
         static xmlAddressDecoder decoder(xmlAddressDecoder::addressmapping);
@@ -83,12 +83,15 @@ static tinyxml2::XMLElement* addressmapping;
 
 
     void print();
-private:
+  private:
     xmlAddressDecoder(std::string URI);
     xmlAddressDecoder(tinyxml2::XMLElement* addressMap);
 
     std::map<std::string, sc_dt::uint64> masks;
     std::map<std::string, unsigned int> shifts;
+
+  public:
+    std::map<std::string, unsigned int> amount;
 };
 
 #endif