diff --git a/dram/.cproject b/dram/.cproject index 0ebeb50d..356d1f93 100644 --- a/dram/.cproject +++ b/dram/.cproject @@ -1,27 +1,169 @@ - - - dram - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + make + + standalone + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dram/src/common/Utils.h b/dram/src/common/Utils.h index 503de3fa..209a54a0 100644 --- a/dram/src/common/Utils.h +++ b/dram/src/common/Utils.h @@ -40,11 +40,10 @@ bool isIn(const T& value, const std::vector& collection) void reportFatal(std::string sender, std::string message); std::string phaseNameToString(tlm::tlm_phase phase); - -std::string loadTextFileContents(std::string filename); -void loadXML(std::string uri, tinyxml2::XMLDocument& doc); - 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); bool queryBoolParameter(tinyxml2::XMLElement* node, std::string name); diff --git a/dram/src/core/utils/Utils.cpp b/dram/src/core/utils/Utils.cpp index 026cca39..163c2cb7 100644 --- a/dram/src/core/utils/Utils.cpp +++ b/dram/src/core/utils/Utils.cpp @@ -62,6 +62,8 @@ sc_time getBurstLengthOnDataStrobe(unsigned int burstlength) return config.Timings.clk * (burstlength / config.DataRate); } + + void setUpDummy(tlm::tlm_generic_payload& payload, Bank& bank) { payload.set_address(bank.getStartAddress());