mirror of
https://github.com/YosysHQ/yosys
synced 2025-04-24 01:25:33 +00:00
Revert "Merge upstream"
This reverts commitc58a50f880
, reversing changes made toa1c3c98773
.
This commit is contained in:
parent
c58a50f880
commit
e73d51dbf0
15 changed files with 49 additions and 110 deletions
|
@ -377,13 +377,6 @@ static void extract_fsm(RTLIL::Wire *wire)
|
|||
fsm_cell->setPort(ID::CTRL_OUT, ctrl_out);
|
||||
fsm_cell->parameters[ID::NAME] = RTLIL::Const(wire->name.str());
|
||||
fsm_cell->attributes = wire->attributes;
|
||||
if(fsm_cell->attributes.count(ID::hdlname)) {
|
||||
auto hdlname = fsm_cell->get_hdlname_attribute();
|
||||
hdlname.pop_back();
|
||||
fsm_cell->set_hdlname_attribute(hdlname);
|
||||
fsm_cell->set_string_attribute(ID(scopename), fsm_cell->get_string_attribute(ID::hdlname));
|
||||
fsm_cell->attributes.erase(ID::hdlname);
|
||||
}
|
||||
fsm_data.copy_to_cell(fsm_cell);
|
||||
|
||||
// rename original state wire
|
||||
|
@ -392,13 +385,6 @@ static void extract_fsm(RTLIL::Wire *wire)
|
|||
wire->attributes.erase(ID::fsm_encoding);
|
||||
wire->name = stringf("$fsm$oldstate%s", wire->name.c_str());
|
||||
module->wires_[wire->name] = wire;
|
||||
if(wire->attributes.count(ID::hdlname)) {
|
||||
auto hdlname = wire->get_hdlname_attribute();
|
||||
hdlname.pop_back();
|
||||
wire->set_hdlname_attribute(hdlname);
|
||||
wire->set_string_attribute(ID(scopename), wire->get_string_attribute(ID::hdlname));
|
||||
wire->attributes.erase(ID::hdlname);
|
||||
}
|
||||
|
||||
// unconnect control outputs from old drivers
|
||||
|
||||
|
|
|
@ -360,9 +360,6 @@ struct FlattenPass : public Pass {
|
|||
|
||||
FlattenWorker worker;
|
||||
|
||||
if (design->scratchpad.count("flatten.separator"))
|
||||
worker.separator = design->scratchpad_get_string("flatten.separator");
|
||||
|
||||
size_t argidx;
|
||||
for (argidx = 1; argidx < args.size(); argidx++) {
|
||||
if (args[argidx] == "-wb") {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue