mirror of
https://github.com/YosysHQ/yosys
synced 2025-06-12 17:06:15 +00:00
Fix warnings
This commit is contained in:
parent
e0ba08dd1d
commit
2c5811daa1
3 changed files with 14 additions and 8 deletions
|
@ -547,7 +547,7 @@ void yosys_setup()
|
||||||
if(already_setup)
|
if(already_setup)
|
||||||
return;
|
return;
|
||||||
already_setup = true;
|
already_setup = true;
|
||||||
backward::SignalHandling* sh = new backward::SignalHandling;
|
new backward::SignalHandling;
|
||||||
#ifdef WITH_PYTHON
|
#ifdef WITH_PYTHON
|
||||||
// With Python 3.12, calling PyImport_AppendInittab on an already
|
// With Python 3.12, calling PyImport_AppendInittab on an already
|
||||||
// initialized platform fails (such as when libyosys is imported
|
// initialized platform fails (such as when libyosys is imported
|
||||||
|
|
|
@ -409,10 +409,16 @@ struct OptDffWorker
|
||||||
} else {
|
} else {
|
||||||
if (ff.pol_set)
|
if (ff.pol_set)
|
||||||
tmp = module->Or(NEW_ID2_SUFFIX("aactive_aload"), ff.sig_ad, ff.sig_set, false, cell->get_src_attribute()); // SILIMATE: Improve the naming
|
tmp = module->Or(NEW_ID2_SUFFIX("aactive_aload"), ff.sig_ad, ff.sig_set, false, cell->get_src_attribute()); // SILIMATE: Improve the naming
|
||||||
else
|
else {
|
||||||
tmp = module->Or(NEW_ID2_SUFFIX("aactive_aload"), ff.sig_ad, module->Not(NEW_ID2_SUFFIX("aactive_aload_inv"), ff.sig_set, false, cell->get_src_attribute())); // SILIMATE: Improve the naming
|
IdString aactive_aload_idstr = NEW_ID2_SUFFIX("aactive_aload");
|
||||||
if (ff.pol_clr)
|
IdString aactive_aload_inv_idstr = NEW_ID2_SUFFIX("aactive_aload_inv");
|
||||||
module->addAnd(NEW_ID2_SUFFIX("aactive_aload"), tmp, module->Not(NEW_ID2_SUFFIX("aactive_aload_inv"), ff.sig_clr, false, cell->get_src_attribute()), ff.sig_q); // SILIMATE: Improve the naming
|
tmp = module->Or(aactive_aload_idstr, ff.sig_ad, module->Not(aactive_aload_inv_idstr, ff.sig_set, false, cell->get_src_attribute())); // SILIMATE: Improve the naming
|
||||||
|
}
|
||||||
|
if (ff.pol_clr) {
|
||||||
|
IdString aactive_aload_idstr = NEW_ID2_SUFFIX("aactive_aload");
|
||||||
|
IdString aactive_aload_inv_idstr = NEW_ID2_SUFFIX("aactive_aload_inv");
|
||||||
|
module->addAnd(aactive_aload_idstr, tmp, module->Not(aactive_aload_inv_idstr, ff.sig_clr, false, cell->get_src_attribute()), ff.sig_q); // SILIMATE: Improve the naming
|
||||||
|
}
|
||||||
else
|
else
|
||||||
module->addAnd(NEW_ID2_SUFFIX("aactive_aload"), tmp, ff.sig_clr, ff.sig_q, false, cell->get_src_attribute()); // SILIMATE: Improve the naming
|
module->addAnd(NEW_ID2_SUFFIX("aactive_aload"), tmp, ff.sig_clr, ff.sig_q, false, cell->get_src_attribute()); // SILIMATE: Improve the naming
|
||||||
}
|
}
|
||||||
|
|
|
@ -2556,15 +2556,15 @@ struct AnnotateActivity : public OutputWriter {
|
||||||
double totalActivity = 0.0f;
|
double totalActivity = 0.0f;
|
||||||
double totalDuty = 0.0f;
|
double totalDuty = 0.0f;
|
||||||
worker->top->write_output_header(
|
worker->top->write_output_header(
|
||||||
[this, debug](IdString name) {
|
[debug](IdString name) {
|
||||||
if (debug)
|
if (debug)
|
||||||
std::cout << stringf("module %s\n", log_id(name));
|
std::cout << stringf("module %s\n", log_id(name));
|
||||||
},
|
},
|
||||||
[this, debug]() {
|
[debug]() {
|
||||||
if (debug)
|
if (debug)
|
||||||
std::cout << "endmodule\n";
|
std::cout << "endmodule\n";
|
||||||
},
|
},
|
||||||
[this, &use_signal, &dataMap, max_time, real_timescale, clk_period, debug, &totalActivity, &totalDuty]
|
[&use_signal, &dataMap, max_time, real_timescale, clk_period, debug, &totalActivity, &totalDuty]
|
||||||
(const char *name, int size, Wire *w, int id, bool) {
|
(const char *name, int size, Wire *w, int id, bool) {
|
||||||
if (!use_signal.at(id) || (w == nullptr))
|
if (!use_signal.at(id) || (w == nullptr))
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue