diff options
author | Eddie Hung <eddie@fpgeh.com> | 2019-06-21 11:17:19 -0700 |
---|---|---|
committer | Eddie Hung <eddie@fpgeh.com> | 2019-06-21 11:17:19 -0700 |
commit | 63eb5cace980cd34e59065e577c04abaad239ddf (patch) | |
tree | be065a052bda42a4654e4a1483f9fcde0beacef9 /backends | |
parent | 776d7cea6ad42a58f47cdcb7a71a801e1ea1055f (diff) | |
parent | c4ea6fff65d6b2e69a31649af7e10b129c6ae0f5 (diff) | |
download | yosys-63eb5cace980cd34e59065e577c04abaad239ddf.tar.gz yosys-63eb5cace980cd34e59065e577c04abaad239ddf.tar.bz2 yosys-63eb5cace980cd34e59065e577c04abaad239ddf.zip |
Merge branch 'master' into eddie/muxpack
Diffstat (limited to 'backends')
-rw-r--r-- | backends/aiger/aiger.cc | 4 | ||||
-rw-r--r-- | backends/ilang/ilang_backend.cc | 1 | ||||
-rw-r--r-- | backends/json/json.cc | 1 | ||||
-rw-r--r-- | backends/protobuf/protobuf.cc | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/backends/aiger/aiger.cc b/backends/aiger/aiger.cc index dfe506c66..6863b40fa 100644 --- a/backends/aiger/aiger.cc +++ b/backends/aiger/aiger.cc @@ -89,7 +89,8 @@ struct AigerWriter aig_map[bit] = mkgate(a0, a1); } else if (alias_map.count(bit)) { - aig_map[bit] = bit2aig(alias_map.at(bit)); + int a = bit2aig(alias_map.at(bit)); + aig_map[bit] = a; } if (bit == State::Sx || bit == State::Sz) @@ -776,6 +777,7 @@ struct AigerBackend : public Backend { writer.write_aiger(*f, ascii_mode, miter_mode, symbols_mode); if (!map_filename.empty()) { + rewrite_filename(filename); std::ofstream mapf; mapf.open(map_filename.c_str(), std::ofstream::trunc); if (mapf.fail()) diff --git a/backends/ilang/ilang_backend.cc b/backends/ilang/ilang_backend.cc index 04d1ee311..b4ba2b03f 100644 --- a/backends/ilang/ilang_backend.cc +++ b/backends/ilang/ilang_backend.cc @@ -483,6 +483,7 @@ struct DumpPass : public Pass { std::stringstream buf; if (!filename.empty()) { + rewrite_filename(filename); std::ofstream *ff = new std::ofstream; ff->open(filename.c_str(), append ? std::ofstream::app : std::ofstream::trunc); if (ff->fail()) { diff --git a/backends/json/json.cc b/backends/json/json.cc index f5c687981..5022d5da1 100644 --- a/backends/json/json.cc +++ b/backends/json/json.cc @@ -525,6 +525,7 @@ struct JsonPass : public Pass { std::stringstream buf; if (!filename.empty()) { + rewrite_filename(filename); std::ofstream *ff = new std::ofstream; ff->open(filename.c_str(), std::ofstream::trunc); if (ff->fail()) { diff --git a/backends/protobuf/protobuf.cc b/backends/protobuf/protobuf.cc index 549fc73ae..fff110bb0 100644 --- a/backends/protobuf/protobuf.cc +++ b/backends/protobuf/protobuf.cc @@ -336,6 +336,7 @@ struct ProtobufPass : public Pass { std::stringstream buf; if (!filename.empty()) { + rewrite_filename(filename); std::ofstream *ff = new std::ofstream; ff->open(filename.c_str(), std::ofstream::trunc); if (ff->fail()) { |