aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEddie Hung <eddieh@ece.ubc.ca>2019-02-25 15:34:02 -0800
committerEddie Hung <eddieh@ece.ubc.ca>2019-02-25 15:34:02 -0800
commit721f6a14fb632b671ba10ed13cafad1263e2b073 (patch)
tree71c940fbf95a5f15be3489043a42dfe3424cf287
parent0ca3fd6a1cca6f12db4069ed6f73b814aee2eeaf (diff)
downloadyosys-721f6a14fb632b671ba10ed13cafad1263e2b073.tar.gz
yosys-721f6a14fb632b671ba10ed13cafad1263e2b073.tar.bz2
yosys-721f6a14fb632b671ba10ed13cafad1263e2b073.zip
read_aiger to accept empty string for clk_name, passable only if no latches
-rw-r--r--frontends/aiger/aigerparse.cc2
-rw-r--r--passes/techmap/abc9.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc
index c8ba1bffd..a64729a27 100644
--- a/frontends/aiger/aigerparse.cc
+++ b/frontends/aiger/aigerparse.cc
@@ -524,6 +524,7 @@ void AigerReader::parse_aiger_ascii()
// Parse latches
RTLIL::Wire *clk_wire = nullptr;
if (L > 0) {
+ log_assert(clk_name != "");
clk_wire = module->wire(clk_name);
log_assert(!clk_wire);
log_debug("Creating %s\n", clk_name.c_str());
@@ -654,6 +655,7 @@ void AigerReader::parse_aiger_binary()
// Parse latches
RTLIL::Wire *clk_wire = nullptr;
if (L > 0) {
+ log_assert(clk_name != "");
clk_wire = module->wire(clk_name);
log_assert(!clk_wire);
log_debug("Creating %s\n", clk_name.c_str());
diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc
index 90234ea33..68e54f518 100644
--- a/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@ -523,8 +523,7 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
bool builtin_lib = liberty_file.empty();
RTLIL::Design *mapped_design = new RTLIL::Design;
//parse_blif(mapped_design, ifs, builtin_lib ? "\\DFF" : "\\_dff_", false, sop_mode);
- buffer = stringf("%s/%s", tempdir_name.c_str(), "input.symbols");
- AigerReader reader(mapped_design, ifs, "\\netlist", "\\clk", buffer, true /* wideports */);
+ AigerReader reader(mapped_design, ifs, "\\netlist", "" /* clk_name */, "" /* map_filename */, true /* wideports */);
reader.parse_xaiger();
ifs.close();