diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2020-02-10 08:31:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-10 08:31:01 -0800 |
| commit | d4ff5b2d007c73cd95fa61bafdb65a47796014d9 (patch) | |
| tree | fa5764c37cfcdb479acd7e6bce90e4cd7261ec88 /frontends | |
| parent | 224dc033aad4081944e004e0e681d4606e9c9655 (diff) | |
| parent | 9da5936c0555de28fc9d254242bd2a33b3399ad6 (diff) | |
| download | yosys-d4ff5b2d007c73cd95fa61bafdb65a47796014d9.tar.gz yosys-d4ff5b2d007c73cd95fa61bafdb65a47796014d9.tar.bz2 yosys-d4ff5b2d007c73cd95fa61bafdb65a47796014d9.zip | |
Merge pull request #1670 from rodrigomelo9/master
$readmem[hb] file inclusion is now relative to the Verilog file
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/ast/simplify.cc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index 8855d9954..fe0412699 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -2903,9 +2903,19 @@ AstNode *AstNode::readmem(bool is_readmemh, std::string mem_filename, AstNode *m std::ifstream f; f.open(mem_filename.c_str()); - yosys_input_files.insert(mem_filename); - - if (f.fail()) + if (f.fail()) { +#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 { + yosys_input_files.insert(mem_filename); + } + if (f.fail() || GetSize(mem_filename) == 0) log_file_error(filename, linenum, "Can not open file `%s` for %s.\n", mem_filename.c_str(), str.c_str()); log_assert(GetSize(memory->children) == 2 && memory->children[1]->type == AST_RANGE && memory->children[1]->range_valid); |