mirror of
https://github.com/YosysHQ/yosys
synced 2026-05-31 06:07:47 +00:00
Refactored uses of log_id()
This commit is contained in:
parent
89d83a3410
commit
e41b969da2
186 changed files with 1219 additions and 1220 deletions
|
|
@ -149,7 +149,7 @@ struct VlogHammerReporter
|
|||
|
||||
for (auto c : module->cells())
|
||||
if (!satgen.importCell(c))
|
||||
log_error("Failed to import cell %s (type %s) to SAT database.\n", log_id(c->name), log_id(c->type));
|
||||
log_error("Failed to import cell %s (type %s) to SAT database.\n", c->name.unescape(), c->type.unescape());
|
||||
|
||||
ez->assume(satgen.signals_eq(recorded_set_vars, recorded_set_vals));
|
||||
|
||||
|
|
@ -262,21 +262,21 @@ struct VlogHammerReporter
|
|||
if (module == modules.front()) {
|
||||
RTLIL::SigSpec sig(wire);
|
||||
if (!ce.eval(sig))
|
||||
log_error("Can't read back value for port %s!\n", log_id(inputs[i]));
|
||||
log_error("Can't read back value for port %s!\n", inputs[i].unescape());
|
||||
input_pattern_list += stringf(" %s", sig.as_const().as_string());
|
||||
log("++PAT++ %d %s %s #\n", idx, log_id(inputs[i]), sig.as_const().as_string());
|
||||
log("++PAT++ %d %s %s #\n", idx, inputs[i].unescape(), sig.as_const().as_string());
|
||||
}
|
||||
}
|
||||
|
||||
if (module->wire(ID(y)) == nullptr)
|
||||
log_error("No output wire (y) found in module %s!\n", log_id(module->name));
|
||||
log_error("No output wire (y) found in module %s!\n", module->name.unescape());
|
||||
|
||||
RTLIL::SigSpec sig(module->wire(ID(y)));
|
||||
RTLIL::SigSpec undef;
|
||||
|
||||
while (!ce.eval(sig, undef)) {
|
||||
// log_error("Evaluation of y in module %s failed: sig=%s, undef=%s\n", log_id(module->name), log_signal(sig), log_signal(undef));
|
||||
log_warning("Setting signal %s in module %s to undef.\n", log_signal(undef), log_id(module->name));
|
||||
// log_error("Evaluation of y in module %s failed: sig=%s, undef=%s\n", module, log_signal(sig), log_signal(undef));
|
||||
log_warning("Setting signal %s in module %s to undef.\n", log_signal(undef), module->name.unescape());
|
||||
ce.set(undef, RTLIL::Const(RTLIL::State::Sx, undef.size()));
|
||||
}
|
||||
|
||||
|
|
@ -288,7 +288,7 @@ struct VlogHammerReporter
|
|||
sat_check(module, recorded_set_vars, recorded_set_vals, sig, true);
|
||||
} else if (rtl_sig.size() > 0) {
|
||||
if (rtl_sig.size() != sig.size())
|
||||
log_error("Output (y) has a different width in module %s compared to rtl!\n", log_id(module->name));
|
||||
log_error("Output (y) has a different width in module %s compared to rtl!\n", module->name.unescape());
|
||||
for (int i = 0; i < GetSize(sig); i++)
|
||||
if (rtl_sig[i] == RTLIL::State::Sx)
|
||||
sig[i] = RTLIL::State::Sx;
|
||||
|
|
@ -319,10 +319,10 @@ struct VlogHammerReporter
|
|||
RTLIL::IdString esc_name = RTLIL::escape_id(name);
|
||||
for (auto mod : modules) {
|
||||
if (mod->wire(esc_name) == nullptr)
|
||||
log_error("Can't find input %s in module %s!\n", name, log_id(mod->name));
|
||||
log_error("Can't find input %s in module %s!\n", name, mod->name.unescape());
|
||||
RTLIL::Wire *port = mod->wire(esc_name);
|
||||
if (!port->port_input || port->port_output)
|
||||
log_error("Wire %s in module %s is not an input!\n", name, log_id(mod->name));
|
||||
log_error("Wire %s in module %s is not an input!\n", name, mod->name.unescape());
|
||||
if (width >= 0 && width != port->width)
|
||||
log_error("Port %s has different sizes in the different modules!\n", name);
|
||||
width = port->width;
|
||||
|
|
@ -443,7 +443,7 @@ struct EvalPass : public Pass {
|
|||
for (auto mod : design->selected_modules()) {
|
||||
if (module)
|
||||
log_cmd_error("Only one module must be selected for the EVAL pass! (selected: %s and %s)\n",
|
||||
log_id(module->name), log_id(mod->name));
|
||||
module->name.unescape(), mod->name.unescape());
|
||||
module = mod;
|
||||
}
|
||||
if (module == NULL)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue