From: Rodrigo Alejandro Melo <rmelo@inti.gob.ar>
Date: Thu, 6 Feb 2020 13:10:29 +0000 (-0300)
Subject: Modified $readmem[hb] to use '\' or '/' according the OS
X-Git-Tag: working-ls180~803^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da485dc007b4dd9f72b8682a6809627e1f04513a;p=yosys.git

Modified $readmem[hb] to use '\' or '/' according the OS

Signed-off-by: Rodrigo Alejandro Melo <rmelo@inti.gob.ar>
---

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 52f157c6e..fe0412699 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -2904,7 +2904,12 @@ AstNode *AstNode::readmem(bool is_readmemh, std::string mem_filename, AstNode *m
 	std::ifstream f;
 	f.open(mem_filename.c_str());
 	if (f.fail()) {
-		std::string path = filename.substr(0, filename.find_last_of("\\/")+1);
+#ifdef _WIN32
+		char slash = '\\';
+#else
+		char slash = '/';
+#endif
+		std::string path = filename.substr(0, filename.find_last_of(slash)+1);
 		f.open(path + mem_filename.c_str());
 		yosys_input_files.insert(path + mem_filename);
 	} else {