riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor fixes in handling of "init" attribute

This commit is contained in:
Clifford Wolf 2015-04-09 15:12:26 +02:00
parent 229825e1b8
commit d176e613c2
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backends/verilog/verilog_backend.cc
View File

@ -295,15 +295,15 @@ void dump_wire(std::ostream &f, std::string indent, RTLIL::Wire *wire)
f << stringf("%s" "output%s %s;\n", indent.c_str(), range.c_str(), id(wire->name).c_str());
if (wire->port_input && wire->port_output)
f << stringf("%s" "inout%s %s;\n", indent.c_str(), range.c_str(), id(wire->name).c_str());
if (reg_wires.count(wire->name))
if (reg_wires.count(wire->name)) {
f << stringf("%s" "reg%s %s;\n", indent.c_str(), range.c_str(), id(wire->name).c_str());
else if (!wire->port_input && !wire->port_output)
if (wire->attributes.count("\\init")) {
f << stringf("%s" "initial %s = ", indent.c_str(), id(wire->name).c_str());
dump_const(f, wire->attributes.at("\\init"));
f << stringf(";\n");
}
} else if (!wire->port_input && !wire->port_output)
f << stringf("%s" "wire%s %s;\n", indent.c_str(), range.c_str(), id(wire->name).c_str());
if (wire->attributes.count("\\init")) {
f << stringf("%s" "initial %s = ", indent.c_str(), id(wire->name).c_str());
dump_const(f, wire->attributes.at("\\init"));
f << stringf(";\n");
}
#endif
}

5
passes/proc/proc_arst.cc
View File

@ -244,6 +244,7 @@ struct ProcArstPass : public Pass {
}
extra_args(args, argidx, design);
pool<Wire*> delete_initattr_wires;
for (auto mod : design->modules())
if (design->selected(mod)) {
@ -265,6 +266,7 @@ struct ProcArstPass : public Pass {
value.extend_u0(chunk.wire->width, false);
arst_sig.append(chunk);
arst_val.append(value.extract(chunk.offset, chunk.width));
delete_initattr_wires.insert(chunk.wire);
}
if (arst_sig.size()) {
log("Added global reset to process %s: %s <- %s\n",
@ -281,6 +283,9 @@ struct ProcArstPass : public Pass {
}
}
}
for (auto wire : delete_initattr_wires)
wire->attributes.erase("\\init");
}
} ProcArstPass;