mirror of
https://github.com/YosysHQ/yosys
synced 2026-05-24 02:49:43 +00:00
Fixing couple more conversion errors
This commit is contained in:
parent
9580ebabc5
commit
4a7878b17f
5 changed files with 9 additions and 9 deletions
|
|
@ -266,7 +266,7 @@ struct DesignPass : public Pass {
|
|||
|
||||
for (auto mod : copy_src_modules)
|
||||
{
|
||||
log("Importing %s as %s.\n", mod, prefix);
|
||||
log("Importing %s as %s.\n", mod, RTLIL::unescape_id(prefix));
|
||||
|
||||
RTLIL::Module *t = mod->clone();
|
||||
t->name = prefix;
|
||||
|
|
@ -295,7 +295,7 @@ struct DesignPass : public Pass {
|
|||
{
|
||||
std::string trg_name = prefix + "." + (cell->type.c_str() + (*cell->type.c_str() == '\\'));
|
||||
|
||||
log("Importing %s as %s.\n", fmod, trg_name);
|
||||
log("Importing %s as %s.\n", fmod, RTLIL::unescape_id(trg_name));
|
||||
|
||||
if (copy_to_design->module(trg_name) != nullptr)
|
||||
copy_to_design->remove(copy_to_design->module(trg_name));
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ static void rename_in_module(RTLIL::Module *module, std::string from_name, std::
|
|||
to_name = RTLIL::escape_id(to_name);
|
||||
|
||||
if (module->count_id(to_name))
|
||||
log_cmd_error("There is already an object `%s' in module `%s'.\n", to_name, module->name);
|
||||
log_cmd_error("There is already an object `%s' in module `%s'.\n", RTLIL::unescape_id(to_name), module->name);
|
||||
|
||||
RTLIL::Wire *wire_to_rename = module->wire(from_name);
|
||||
RTLIL::Cell *cell_to_rename = module->cell(from_name);
|
||||
|
||||
if (wire_to_rename != nullptr) {
|
||||
log("Renaming wire %s to %s in module %s.\n", wire_to_rename, to_name, module);
|
||||
log("Renaming wire %s to %s in module %s.\n", wire_to_rename, RTLIL::unescape_id(to_name), module);
|
||||
module->rename(wire_to_rename, to_name);
|
||||
if (wire_to_rename->port_id || flag_output) {
|
||||
if (flag_output)
|
||||
|
|
@ -50,12 +50,12 @@ static void rename_in_module(RTLIL::Module *module, std::string from_name, std::
|
|||
if (cell_to_rename != nullptr) {
|
||||
if (flag_output)
|
||||
log_cmd_error("Called with -output but the specified object is a cell.\n");
|
||||
log("Renaming cell %s to %s in module %s.\n", cell_to_rename, to_name, module);
|
||||
log("Renaming cell %s to %s in module %s.\n", cell_to_rename, RTLIL::unescape_id(to_name), module);
|
||||
module->rename(cell_to_rename, to_name);
|
||||
return;
|
||||
}
|
||||
|
||||
log_cmd_error("Object `%s' not found!\n", from_name);
|
||||
log_cmd_error("Object `%s' not found!\n", RTLIL::unescape_id(from_name));
|
||||
}
|
||||
|
||||
static std::string derive_name_from_src(const std::string &src, int counter)
|
||||
|
|
|
|||
|
|
@ -1265,7 +1265,7 @@ struct TechmapPass : public Pass {
|
|||
i.second.sort(RTLIL::sort_by_id_str());
|
||||
std::string maps = "";
|
||||
for (auto &map : i.second)
|
||||
maps += stringf(" %s", map);
|
||||
maps += stringf(" %s", map.unescape());
|
||||
log_debug(" %s:%s\n", i.first.unescape(), maps);
|
||||
}
|
||||
log_debug("\n");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue