VeniVidiVici
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix formatting vars in protect-lib wrapper

This commit is contained in:
Wilson Snyder 2021-02-27 20:06:46 -05:00
parent 5489bbcc41
commit 05e5fb04ed
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/make_protect_lib/secret_impl.v
View File

@ -17,7 +17,7 @@ module secret_impl
logic [31:0] accum_q = 0; logic [31:0] accum_q = 0;
logic [31:0] secret_value = 9; logic [31:0] secret_value = 9;
initial $display("%m: initialized"); initial $display("[%0t] %m: initialized", $time);
always @(posedge clk) begin always @(posedge clk) begin
accum_q <= accum_q + a; accum_q <= accum_q + a;

40
src/V3EmitV.cpp
View File

@ -310,13 +310,15 @@ class EmitVBaseVisitor VL_NOT_FINAL : public EmitCBaseVisitor {
} }
virtual void visit(AstNodeFor* nodep) override { virtual void visit(AstNodeFor* nodep) override {
putfs(nodep, "for ("); putfs(nodep, "for (");
m_suppressSemi = true; {
iterateAndNextNull(nodep->initsp()); VL_RESTORER(m_suppressSemi);
puts(";"); m_suppressSemi = true;
iterateAndNextNull(nodep->condp()); iterateAndNextNull(nodep->initsp());
puts(";"); puts(";");
iterateAndNextNull(nodep->incsp()); iterateAndNextNull(nodep->condp());
m_suppressSemi = false; puts(";");
iterateAndNextNull(nodep->incsp());
}
puts(") begin\n"); puts(") begin\n");
iterateAndNextNull(nodep->bodysp()); iterateAndNextNull(nodep->bodysp());
putqs(nodep, "end\n"); putqs(nodep, "end\n");
@ -381,9 +383,13 @@ class EmitVBaseVisitor VL_NOT_FINAL : public EmitCBaseVisitor {
} }
virtual void visit(AstTextBlock* nodep) override { virtual void visit(AstTextBlock* nodep) override {
visit(VN_CAST(nodep, NodeSimpleText)); visit(VN_CAST(nodep, NodeSimpleText));
for (AstNode* childp = nodep->nodesp(); childp; childp = childp->nextp()) { {
iterate(childp); VL_RESTORER(m_suppressSemi);
if (nodep->commas() && childp->nextp()) puts(", "); m_suppressVarSemi = nodep->commas();
for (AstNode* childp = nodep->nodesp(); childp; childp = childp->nextp()) {
iterate(childp);
if (nodep->commas() && childp->nextp()) puts(", ");
}
} }
} }
virtual void visit(AstScopeName* nodep) override {} virtual void visit(AstScopeName* nodep) override {}
@ -659,11 +665,7 @@ class EmitVBaseVisitor VL_NOT_FINAL : public EmitCBaseVisitor {
puts(cvtToStr(unpackp->rangep()->rightConst())); puts(cvtToStr(unpackp->rangep()->rightConst()));
puts("]"); puts("]");
} }
if (!m_suppressVarSemi) { puts(m_suppressVarSemi ? "\n" : ";\n");
puts(";\n");
} else {
puts("\n");
}
} }
virtual void visit(AstActive* nodep) override { virtual void visit(AstActive* nodep) override {
m_sensesp = nodep->sensesp(); m_sensesp = nodep->sensesp();
@ -711,12 +713,10 @@ class EmitVFileVisitor final : public EmitVBaseVisitor {
virtual void putsNoTracking(const string& str) override { ofp()->putsNoTracking(str); } virtual void putsNoTracking(const string& str) override { ofp()->putsNoTracking(str); }
public: public:
EmitVFileVisitor(AstNode* nodep, V3OutFile* ofp, bool trackText, bool suppressVarSemi, EmitVFileVisitor(AstNode* nodep, V3OutFile* ofp, bool trackText, bool suppressUnknown)
bool suppressUnknown)
: EmitVBaseVisitor{suppressUnknown, nullptr} { : EmitVBaseVisitor{suppressUnknown, nullptr} {
m_ofp = ofp; m_ofp = ofp;
m_trackText = trackText; m_trackText = trackText;
m_suppressVarSemi = suppressVarSemi;
iterate(nodep); iterate(nodep);
} }
virtual ~EmitVFileVisitor() override = default; virtual ~EmitVFileVisitor() override = default;
@ -840,7 +840,7 @@ void V3EmitV::emitvFiles() {
V3OutVFile of(vfilep->name()); V3OutVFile of(vfilep->name());
of.puts("// DESCR" of.puts("// DESCR"
"IPTION: Verilator generated Verilog\n"); "IPTION: Verilator generated Verilog\n");
EmitVFileVisitor visitor(vfilep->tblockp(), &of, true, true, false); EmitVFileVisitor visitor(vfilep->tblockp(), &of, true, false);
} }
} }
} }
@ -849,5 +849,5 @@ void V3EmitV::debugEmitV(const string& stage) {
UINFO(2, __FUNCTION__ << ": " << endl); UINFO(2, __FUNCTION__ << ": " << endl);
string filename = v3Global.opt.makeDir() + "/" + v3Global.opt.prefix() + "__" + stage + ".v"; string filename = v3Global.opt.makeDir() + "/" + v3Global.opt.prefix() + "__" + stage + ".v";
V3OutVFile of(filename); V3OutVFile of(filename);
EmitVFileVisitor visitor(v3Global.rootp(), &of, true, false, true); EmitVFileVisitor visitor(v3Global.rootp(), &of, true, true);
} }

3
src/V3ProtectLib.cpp
View File

@ -263,7 +263,7 @@ private:
m_seqAssignsp = new AstTextBlock(fl, "if (last_seq_seqnum__V > " m_seqAssignsp = new AstTextBlock(fl, "if (last_seq_seqnum__V > "
"last_combo_seqnum__V) begin\n"); "last_combo_seqnum__V) begin\n");
txtp->addNodep(m_seqAssignsp); txtp->addNodep(m_seqAssignsp);
m_comboAssignsp = new AstTextBlock(fl, "end else begin\n"); m_comboAssignsp = new AstTextBlock(fl, "end\nelse begin\n");
txtp->addNodep(m_comboAssignsp); txtp->addNodep(m_comboAssignsp);
txtp->addText(fl, "end\n"); txtp->addText(fl, "end\n");
} else { } else {
@ -437,7 +437,6 @@ private:
AstVar* newVarp AstVar* newVarp
= new AstVar(varp->fileline(), AstVarType::VAR, varp->name() + suffix, varp->dtypep()); = new AstVar(varp->fileline(), AstVarType::VAR, varp->name() + suffix, varp->dtypep());
textp->addNodep(newVarp); textp->addNodep(newVarp);
textp->addText(varp->fileline(), ";\n");
} }
void handleOutput(AstVar* varp) { void handleOutput(AstVar* varp) {