From eb526e7e83e36f47361b66b35f66ebf10ee28963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= <zulian@eit.uni-kl.de>
Date: Wed, 5 Apr 2017 16:46:52 +0200
Subject: [PATCH] AddressOffset is only used when we use gem5.

If gem5 is not used the configuration field AddressOffset is set to zero
despite the value in the xml file.
---
 DRAMSys/simulator/resources/configs/simulator/ddr3.xml        | 2 +-
 .../src/controller/core/configuration/Configuration.cpp       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/DRAMSys/simulator/resources/configs/simulator/ddr3.xml b/DRAMSys/simulator/resources/configs/simulator/ddr3.xml
index 3138494c..9e322605 100644
--- a/DRAMSys/simulator/resources/configs/simulator/ddr3.xml
+++ b/DRAMSys/simulator/resources/configs/simulator/ddr3.xml
@@ -14,6 +14,6 @@
     <!-- Gem5 Related Configuration:
     In the memory controller file the storage mode should be set to Store
     E.g. the DRAM is located at 0x80000000 for gem5
-    <AddressOffset value = "214748364c8" />
+    <AddressOffset value = "2147483648" />
     -->
 </simconfig>
diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
index 64391837..ded14c17 100644
--- a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
+++ b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
@@ -192,7 +192,11 @@ void Configuration::setParameter(std::string name, std::string value)
         NumberOfDevicesOnDIMM = string2int(value);
     else if(name == "AddressOffset")
     {
+#ifdef DRAMSYS_GEM5
         AddressOffset = string2ull(value);
+#else
+        AddressOffset = 0;
+#endif
         cout << "Address Offset: " << AddressOffset << endl;
     }
     else if(name == "CheckTLM2Protocol")