diff options
Diffstat (limited to 'backends/edif/edif.cc')
| -rw-r--r-- | backends/edif/edif.cc | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/backends/edif/edif.cc b/backends/edif/edif.cc index ccedd91d2..b089be143 100644 --- a/backends/edif/edif.cc +++ b/backends/edif/edif.cc @@ -27,6 +27,9 @@ #include "kernel/log.h" #include <string> +USING_YOSYS_NAMESPACE +PRIVATE_NAMESPACE_BEGIN + #define EDIF_DEF(_id) edif_names(RTLIL::unescape_id(_id), true).c_str() #define EDIF_REF(_id) edif_names(RTLIL::unescape_id(_id), false).c_str() @@ -108,7 +111,7 @@ struct EdifBackend : public Backend { log_header("Executing EDIF backend.\n"); std::string top_module_name; - std::map<RTLIL::IdString, std::set<RTLIL::IdString>> lib_cell_ports; + std::map<RTLIL::IdString, std::map<RTLIL::IdString, int>> lib_cell_ports; CellTypes ct(design); EdifNames edif_names; @@ -147,12 +150,8 @@ struct EdifBackend : public Backend { RTLIL::Cell *cell = cell_it.second; if (!design->modules_.count(cell->type) || design->modules_.at(cell->type)->get_bool_attribute("\\blackbox")) { lib_cell_ports[cell->type]; - for (auto p : cell->connections()) { - if (p.second.size() > 1) - log_error("Found multi-bit port %s on library cell %s.%s (%s): not supported in EDIF backend!\n", - RTLIL::id2cstr(p.first), RTLIL::id2cstr(module->name), RTLIL::id2cstr(cell->name), RTLIL::id2cstr(cell->type)); - lib_cell_ports[cell->type].insert(p.first); - } + for (auto p : cell->connections()) + lib_cell_ports[cell->type][p.first] = GetSize(p.second); } } } @@ -195,12 +194,15 @@ struct EdifBackend : public Backend { for (auto &port_it : cell_it.second) { const char *dir = "INOUT"; if (ct.cell_known(cell_it.first)) { - if (!ct.cell_output(cell_it.first, port_it)) + if (!ct.cell_output(cell_it.first, port_it.first)) dir = "INPUT"; - else if (!ct.cell_input(cell_it.first, port_it)) + else if (!ct.cell_input(cell_it.first, port_it.first)) dir = "OUTPUT"; } - *f << stringf(" (port %s (direction %s))\n", EDIF_DEF(port_it), dir); + if (port_it.second == 1) + *f << stringf(" (port %s (direction %s))\n", EDIF_DEF(port_it.first), dir); + else + *f << stringf(" (port (array %s %d) (direction %s))\n", EDIF_DEF(port_it.first), port_it.second, dir); } *f << stringf(" )\n"); *f << stringf(" )\n"); @@ -300,12 +302,12 @@ struct EdifBackend : public Backend { char digit_str[2] = { "0123456789abcdef"[digit_value], 0 }; hex_string = std::string(digit_str) + hex_string; } - *f << stringf("\n (property %s (string \"%s\"))", EDIF_DEF(p.first), hex_string.c_str()); + *f << stringf("\n (property %s (string \"%d'h%s\"))", EDIF_DEF(p.first), GetSize(p.second.bits), hex_string.c_str()); } *f << stringf(")\n"); for (auto &p : cell->connections()) { RTLIL::SigSpec sig = sigmap(p.second); - for (int i = 0; i < SIZE(sig); i++) + for (int i = 0; i < GetSize(sig); i++) if (sig.size() == 1) net_join_db[sig[i]].insert(stringf("(portRef %s (instanceRef %s))", EDIF_REF(p.first), EDIF_REF(cell->name))); else @@ -345,3 +347,4 @@ struct EdifBackend : public Backend { } } EdifBackend; +PRIVATE_NAMESPACE_END |