mirror of
https://github.com/YosysHQ/yosys
synced 2025-10-05 23:44:01 +00:00
Remove .c_str() from stringf parameters
This commit is contained in:
parent
acac60302d
commit
e7f210b817
90 changed files with 773 additions and 773 deletions
|
@ -59,9 +59,9 @@ void create_ice40_wrapcarry(ice40_wrapcarry_pm &pm)
|
|||
cell->setParam(ID::LUT, st.lut->getParam(ID(LUT_INIT)));
|
||||
|
||||
for (const auto &a : st.carry->attributes)
|
||||
cell->attributes[stringf("\\SB_CARRY.%s", a.first.c_str())] = a.second;
|
||||
cell->attributes[stringf("\\SB_CARRY.%s", a.first)] = a.second;
|
||||
for (const auto &a : st.lut->attributes)
|
||||
cell->attributes[stringf("\\SB_LUT4.%s", a.first.c_str())] = a.second;
|
||||
cell->attributes[stringf("\\SB_LUT4.%s", a.first)] = a.second;
|
||||
cell->attributes[ID(SB_LUT4.name)] = Const(st.lut->name.str());
|
||||
if (st.carry->get_bool_attribute(ID::keep) || st.lut->get_bool_attribute(ID::keep))
|
||||
cell->attributes[ID::keep] = true;
|
||||
|
|
|
@ -302,7 +302,7 @@ struct SynthIce40Pass : public ScriptPass
|
|||
if (check_label("begin"))
|
||||
{
|
||||
run("read_verilog " + define + " -lib -specify +/ice40/cells_sim.v");
|
||||
run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
|
||||
run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
|
||||
run("proc");
|
||||
}
|
||||
|
||||
|
@ -419,10 +419,10 @@ struct SynthIce40Pass : public ScriptPass
|
|||
std::string abc9_opts;
|
||||
std::string k = "synth_ice40.abc9.W";
|
||||
if (active_design && active_design->scratchpad.count(k))
|
||||
abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k).c_str());
|
||||
abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k));
|
||||
else {
|
||||
k = stringf("synth_ice40.abc9.%s.W", device_opt.c_str());
|
||||
abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k).c_str());
|
||||
k = stringf("synth_ice40.abc9.%s.W", device_opt);
|
||||
abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k));
|
||||
}
|
||||
if (dff)
|
||||
abc9_opts += " -dff";
|
||||
|
@ -475,13 +475,13 @@ struct SynthIce40Pass : public ScriptPass
|
|||
if (check_label("edif"))
|
||||
{
|
||||
if (!edif_file.empty() || help_mode)
|
||||
run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file.c_str()));
|
||||
run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file));
|
||||
}
|
||||
|
||||
if (check_label("json"))
|
||||
{
|
||||
if (!json_file.empty() || help_mode)
|
||||
run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
|
||||
run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
|
||||
}
|
||||
}
|
||||
} SynthIce40Pass;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue