From 89fb57e54f09be0afd04a7ae7fac026ed4cc0b15 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Wed, 12 Dec 2018 22:12:31 -0500
Subject: [PATCH] For --xml, add additional information, bug1372.

---
 src/V3EmitXml.cpp            |  5 +++++
 test_regress/t/t_xml_tag.out | 15 ++++++++++-----
 test_regress/t/t_xml_tag.v   |  2 ++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp
index 198b91059..8ca6cc20e 100644
--- a/src/V3EmitXml.cpp
+++ b/src/V3EmitXml.cpp
@@ -151,6 +151,11 @@ class EmitXmlFileVisitor : public AstNVisitor {
         puts(" direction="); putsQuoted(kw);
         outputChildrenEnd(nodep, "");
     }
+    virtual void visit(AstVarXRef* nodep) {
+        outputTag(nodep, "");
+        puts(" dotted="); putsQuoted(nodep->dotted());
+        outputChildrenEnd(nodep, "");
+    }
 
     // Data types
     virtual void visit(AstBasicDType* nodep) {
diff --git a/test_regress/t/t_xml_tag.out b/test_regress/t/t_xml_tag.out
index 1e24077e8..80376b7db 100644
--- a/test_regress/t/t_xml_tag.out
+++ b/test_regress/t/t_xml_tag.out
@@ -26,16 +26,21 @@
       <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"/>
+      <var fl="f32" name="dotted" dtype_id="5" vartype="logic" origName="dotted"/>
+      <contassign fl="f32" dtype_id="5">
+        <varxref fl="f32" name="value" dtype_id="6" dotted="itop"/>
+        <varref fl="f32" name="dotted" dtype_id="5"/>
+      </contassign>
     </module>
     <iface fl="f6" name="ifc" origName="ifc">
-      <var fl="f7" name="value" dtype_id="5" vartype="integer" origName="value"/>
+      <var fl="f7" name="value" dtype_id="6" vartype="integer" origName="value"/>
       <modport fl="f8" name="out_modport">
         <modportvarref fl="f8" name="value" direction="out"/>
       </modport>
     </iface>
     <typetable fl="a0">
-      <basicdtype  fl="f30" id="6" name="logic" left="31" right="0"/>
-      <basicdtype  fl="f7" id="5" name="integer" left="31" right="0"/>
+      <basicdtype  fl="f30" id="5" name="logic" left="31" right="0"/>
+      <basicdtype  fl="f7" id="6" name="integer" left="31" right="0"/>
       <basicdtype  fl="f13" id="1" name="logic"/>
       <structdtype fl="f19" id="2" name="m.my_struct">
         <memberdtype fl="f20" id="7" name="clk" tag="this is clk" sub_dtype_id="8"/>
@@ -50,8 +55,8 @@
       <ifacerefdtype fl="f28" id="3" modportname=""/>
       <unpackarraydtype fl="f30" id="4" sub_dtype_id="2">
         <range fl="f30">
-          <const fl="f30" name="32'h1" dtype_id="6"/>
-          <const fl="f30" name="32'h0" dtype_id="6"/>
+          <const fl="f30" name="32'h1" dtype_id="5"/>
+          <const fl="f30" name="32'h0" dtype_id="5"/>
         </range>
       </unpackarraydtype>
       <refdtype fl="f30" id="15" name="my_struct" sub_dtype_id="2"/>
diff --git a/test_regress/t/t_xml_tag.v b/test_regress/t/t_xml_tag.v
index a3b56364b..f5772107d 100644
--- a/test_regress/t/t_xml_tag.v
+++ b/test_regress/t/t_xml_tag.v
@@ -29,4 +29,6 @@ module m
 
    my_struct this_struct [2];  // verilator tag this_struct
 
+   wire [31:0] dotted = itop.value;
+
 endmodule