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

For --xml, add additional information, bug1372.

This commit is contained in:
Wilson Snyder 2018-12-10 19:11:35 -05:00
parent 66b23be746
commit 8a3e9748b3
4 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -7,7 +7,7 @@ The contributors that suggested a given feature are shown in []. Thanks!
*** Removed --trace-lxt2, use --trace-fst instead. *** Removed --trace-lxt2, use --trace-fst instead.
**** For --xml, add additional var information, bug1372. [Jonathan Kimmitt] **** For --xml, add additional information, bug1372. [Jonathan Kimmitt]
* Verilator 4.008 2018-12-01 * Verilator 4.008 2018-12-01

7
src/V3EmitXml.cpp
View File

@ -161,6 +161,13 @@ class EmitXmlFileVisitor : public AstNVisitor {
} }
puts("/>\n"); puts("/>\n");
} }
virtual void visit(AstIfaceRefDType* nodep) {
string mpn;
outputTag(nodep, "");
if (nodep->isModport()) mpn = nodep->modportName();
puts(" modportname="); putsQuoted(mpn);
outputChildrenEnd(nodep, "");
}
// Default // Default
virtual void visit(AstNode* nodep) { virtual void visit(AstNode* nodep) {

58
test_regress/t/t_xml_tag.out
View File

@ -13,36 +13,48 @@
<file id="f" filename="t/t_xml_tag.v" language="1800-2017"/> <file id="f" filename="t/t_xml_tag.v" language="1800-2017"/>
</module_files> </module_files>
<cells> <cells>
<cell fl="f6" name="m" submodname="m" hier="m"/> <cell fl="f11" name="m" submodname="m" hier="m">
<cell fl="f28" name="itop" submodname="ifc" hier="m.itop"/>
</cell>
</cells> </cells>
<netlist> <netlist>
<module fl="f6" name="m" origName="m"> <module fl="f11" name="m" origName="m" topModule="1">
<var fl="f8" name="clk_ip" tag="clk_ip" dtype_id="1" dir="input" vartype="logic" origName="clk_ip"/> <var fl="f13" name="clk_ip" tag="clk_ip" dtype_id="1" dir="input" vartype="logic" origName="clk_ip"/>
<var fl="f9" name="rst_ip" dtype_id="1" dir="input" vartype="logic" origName="rst_ip"/> <var fl="f14" name="rst_ip" dtype_id="1" dir="input" vartype="logic" origName="rst_ip"/>
<var fl="f10" name="foo_op" tag="foo_op" dtype_id="1" dir="output" vartype="logic" origName="foo_op"/> <var fl="f15" name="foo_op" tag="foo_op" dtype_id="1" dir="output" vartype="logic" origName="foo_op"/>
<typedef fl="f14" name="my_struct" tag="my_struct" dtype_id="2"/> <typedef fl="f19" name="my_struct" tag="my_struct" dtype_id="2"/>
<var fl="f23" name="this_struct" tag="this_struct" dtype_id="3" vartype="" origName="this_struct"/> <instance fl="f28" name="itop" defName="ifc" origName="itop"/>
<var fl="f28" name="itop__Viftop" dtype_id="3" vartype="ifaceref" origName="itop__Viftop"/>
<var fl="f30" name="this_struct" tag="this_struct" dtype_id="4" vartype="" origName="this_struct"/>
</module> </module>
<iface fl="f6" name="ifc" origName="ifc">
<var fl="f7" name="value" dtype_id="5" vartype="integer" origName="value"/>
<modport fl="f8" name="out_modport">
<modportvarref fl="f8" name="value" direction="out"/>
</modport>
</iface>
<typetable fl="a0"> <typetable fl="a0">
<basicdtype fl="f23" id="4" name="logic" left="31" right="0"/> <basicdtype fl="f30" id="6" name="logic" left="31" right="0"/>
<basicdtype fl="f8" id="1" name="logic"/> <basicdtype fl="f7" id="5" name="integer" left="31" right="0"/>
<structdtype fl="f14" id="2" name="m.my_struct"> <basicdtype fl="f13" id="1" name="logic"/>
<memberdtype fl="f15" id="5" name="clk" tag="this is clk" sub_dtype_id="6"/> <structdtype fl="f19" id="2" name="m.my_struct">
<memberdtype fl="f16" id="7" name="k" sub_dtype_id="8"/> <memberdtype fl="f20" id="7" name="clk" tag="this is clk" sub_dtype_id="8"/>
<memberdtype fl="f17" id="9" name="enable" tag="enable" sub_dtype_id="10"/> <memberdtype fl="f21" id="9" name="k" sub_dtype_id="10"/>
<memberdtype fl="f18" id="11" name="data" tag="data" sub_dtype_id="12"/> <memberdtype fl="f22" id="11" name="enable" tag="enable" sub_dtype_id="12"/>
<memberdtype fl="f23" id="13" name="data" tag="data" sub_dtype_id="14"/>
</structdtype> </structdtype>
<basicdtype fl="f15" id="6" name="logic"/> <basicdtype fl="f20" id="8" name="logic"/>
<basicdtype fl="f16" id="8" name="logic"/> <basicdtype fl="f21" id="10" name="logic"/>
<basicdtype fl="f17" id="10" name="logic"/> <basicdtype fl="f22" id="12" name="logic"/>
<basicdtype fl="f18" id="12" name="logic"/> <basicdtype fl="f23" id="14" name="logic"/>
<unpackarraydtype fl="f23" id="3" sub_dtype_id="2"> <ifacerefdtype fl="f28" id="3" modportname=""/>
<range fl="f23"> <unpackarraydtype fl="f30" id="4" sub_dtype_id="2">
<const fl="f23" name="32'h1" dtype_id="4"/> <range fl="f30">
<const fl="f23" name="32'h0" dtype_id="4"/> <const fl="f30" name="32'h1" dtype_id="6"/>
<const fl="f30" name="32'h0" dtype_id="6"/>
</range> </range>
</unpackarraydtype> </unpackarraydtype>
<refdtype fl="f23" id="13" name="my_struct" sub_dtype_id="2"/> <refdtype fl="f30" id="15" name="my_struct" sub_dtype_id="2"/>
</typetable> </typetable>
</netlist> </netlist>
</verilator_xml> </verilator_xml>

7
test_regress/t/t_xml_tag.v
View File

@ -3,6 +3,11 @@
// This file ONLY is placed into the Public Domain, for any use, // This file ONLY is placed into the Public Domain, for any use,
// without warranty, 2017 by Chris Randall. // without warranty, 2017 by Chris Randall.
interface ifc;
integer value;
modport out_modport (output value);
endinterface
module m module m
( (
input clk_ip, // verilator tag clk_ip input clk_ip, // verilator tag clk_ip
@ -20,6 +25,8 @@ module m
// This is a comment // This is a comment
ifc itop();
my_struct this_struct [2]; // verilator tag this_struct my_struct this_struct [2]; // verilator tag this_struct
endmodule endmodule