From: Rodrigo Alejandro Melo <rodrigomelo9@gmail.com>
Date: Sat, 1 Feb 2020 01:10:51 +0000 (-0300)
Subject: Modified the new search for files of $readmem[hb] to be backward compatible
X-Git-Tag: working-ls180~803^2~11
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d74b9604e332fc89bd314f6df0d909f91f0db04a;p=yosys.git

Modified the new search for files of $readmem[hb] to be backward compatible

Signed-off-by: Rodrigo Alejandro Melo <rodrigomelo9@gmail.com>
---

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index f7364b9a8..4f105eed6 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -2887,9 +2887,13 @@ AstNode *AstNode::readmem(bool is_readmemh, std::string mem_filename, AstNode *m
 
 	std::ifstream f;
 	std::string path = filename.substr(0, filename.find_last_of("\\/")+1);
-	f.open(path + mem_filename.c_str());
-	yosys_input_files.insert(mem_filename);
-
+	f.open(mem_filename.c_str());
+	if (f.fail()) {
+		f.open(path + mem_filename.c_str());
+		yosys_input_files.insert(path + mem_filename);
+	} else {
+		yosys_input_files.insert(mem_filename);
+	}
 	if (f.fail())
 		log_file_error(filename, linenum, "Can not open file `%s` for %s.\n", mem_filename.c_str(), str.c_str());