From 8467945a3a5ea3cec6145bd2d266ed64890ed072 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 3 Jul 2014 13:57:39 +0200 Subject: [PATCH] minor refactoring --- dram/src/common/Utils.h | 9 ++++++--- dram/src/controller/Controller.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dram/src/common/Utils.h b/dram/src/common/Utils.h index df203010..c13aab22 100644 --- a/dram/src/common/Utils.h +++ b/dram/src/common/Utils.h @@ -17,8 +17,8 @@ #include "third_party/tinyxml2.h" #include +//TODO : move to timing specific header sc_time getDistance(sc_time a, sc_time b); - struct TimeInterval { sc_time start,end; @@ -69,11 +69,15 @@ static inline void loadbar(unsigned int x, unsigned int n, unsigned int w = 50, std::cout << "]\r" << std::flush; } +//TODO : Move to debug manager void reportFatal(std::string sender, std::string message); std::string phaseNameToString(tlm::tlm_phase phase); + + +//TODO : Move to other source specific to xml +std::string getFileName(std::string uri); bool parameterExists(tinyxml2::XMLElement* node, std::string name); std::string loadTextFileContents(std::string filename); - void loadXML(std::string uri, tinyxml2::XMLDocument& doc); unsigned int queryUIntParameter(tinyxml2::XMLElement* node, std::string name); std::string queryStringParameter(tinyxml2::XMLElement* node, std::string name); @@ -82,6 +86,5 @@ double queryDoubleParameter(tinyxml2::XMLElement* node, std::string name); void setUpDummy(tlm::tlm_generic_payload& payload, Bank& bank); -std::string getFileName(std::string uri); #endif /* UTILS_COMMON_H_ */ diff --git a/dram/src/controller/Controller.h b/dram/src/controller/Controller.h index 4f8d22d7..5342a992 100644 --- a/dram/src/controller/Controller.h +++ b/dram/src/controller/Controller.h @@ -89,7 +89,7 @@ private: // ------- CONTROLLER CORE --------- void controllerCorePEQCallback(tlm_generic_payload& payload, const tlm_phase& phase); - //Helpers + //Helpers TODO move them void printDebugMessage(string message); bool containsPhase(tlm_phase phase, std::vector phases);