mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-21 23:00:34 +00:00
Code Activity

wrapcell.cc: Avoid format name collision

Browse source
This commit is contained in:
Krystine Sherwin 2025-09-03 03:32:01 +12:00
parent 7fb6c1ee52
commit d70f132792
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
passes/cmds/wrapcell.cc
View file

@ -47,7 +47,7 @@ struct ContextData {
std::string unused_outputs; std::string unused_outputs;
}; };
std::optional<std::string> format(std::string fmt, const dict<IdString, Const> &parameters, std::optional<std::string> format_with_params(std::string fmt, const dict<IdString, Const> &parameters,
const ContextData &context) const ContextData &context)
{ {
std::stringstream result; std::stringstream result;
@ -230,7 +230,7 @@ struct WrapcellPass : Pass {
context.unused_outputs += "_" + RTLIL::unescape_id(chunk.format(cell)); context.unused_outputs += "_" + RTLIL::unescape_id(chunk.format(cell));
} }
std::optional<std::string> unescaped_name = format(name_fmt, cell->parameters, context); std::optional<std::string> unescaped_name = format_with_params(name_fmt, cell->parameters, context);
if (!unescaped_name) if (!unescaped_name)
log_error("Formatting error when processing cell '%s' in module '%s'\n", log_error("Formatting error when processing cell '%s' in module '%s'\n",
log_id(cell), log_id(module)); log_id(cell), log_id(module));
@ -270,7 +270,7 @@ struct WrapcellPass : Pass {
if (rule.value_fmt.empty()) { if (rule.value_fmt.empty()) {
subm->set_bool_attribute(rule.name); subm->set_bool_attribute(rule.name);
} else { } else {
std::optional<std::string> value = format(rule.value_fmt, cell->parameters, context); std::optional<std::string> value = format_with_params(rule.value_fmt, cell->parameters, context);
if (!value) if (!value)
log_error("Formatting error when processing cell '%s' in module '%s'\n", log_error("Formatting error when processing cell '%s' in module '%s'\n",