From 466fbab9baf8af3737bd168ade44857a4f1788ca Mon Sep 17 00:00:00 2001 From: Ana Mativi Date: Tue, 8 Aug 2017 13:25:36 +0200 Subject: [PATCH] loadMemSpec executes before loadMCConfig --- DRAMSys/simulator/src/simulation/DRAMSys.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/DRAMSys/simulator/src/simulation/DRAMSys.cpp b/DRAMSys/simulator/src/simulation/DRAMSys.cpp index 4378b721..32a90682 100644 --- a/DRAMSys/simulator/src/simulation/DRAMSys.cpp +++ b/DRAMSys/simulator/src/simulation/DRAMSys.cpp @@ -80,25 +80,22 @@ DRAMSys::DRAMSys(sc_module_name __attribute__((unused)) name, Configuration::getInstance().setPathToResources(pathToResources); - // The xmlAddressDecoder MUST be initialized before calling the - // ConfigurationLoader because some information from the xmlAddressDecoder - // is needed to assure the coherence of the configuration. xmlAddressDecoder::getInstance().setConfiguration(pathToResources + "configs/amconfigs/" + amconfig); xmlAddressDecoder::getInstance().print(); + ConfigurationLoader::loadMemSpec(Configuration::getInstance(), + pathToResources + + "configs/memspecs/" + + memspec); + // Setup the memory controller with the propriate xml file ConfigurationLoader::loadMCConfig(Configuration::getInstance(), pathToResources + "configs/mcconfigs/" + mcconfig); - ConfigurationLoader::loadMemSpec(Configuration::getInstance(), - pathToResources - + "configs/memspecs/" - + memspec); - ConfigurationLoader::loadSimConfig(Configuration::getInstance(), pathToResources + "configs/simulator/"