From 957c1d606b26932fbded806f8cb739b7315335db Mon Sep 17 00:00:00 2001
From: Pieter Kapsenberg <pieter.kapsenberg@gmail.com>
Date: Wed, 22 Jan 2020 04:18:50 -0800
Subject: [PATCH] Add detailed XML location to cell elements, #2134, #2122.

This was accidentally omitted from the previous PR #2122.
---
 src/V3EmitXml.cpp               | 2 ++
 test_regress/t/t_xml_first.out  | 6 +++---
 test_regress/t/t_xml_output.out | 2 +-
 test_regress/t/t_xml_tag.out    | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp
index 28412fae5..84076a23b 100644
--- a/src/V3EmitXml.cpp
+++ b/src/V3EmitXml.cpp
@@ -299,6 +299,7 @@ private:
             && nodep->level() <=2 ) {  // ==2 because we don't add wrapper when in XML mode
             m_os<<"<cells>\n";
             m_os<<"<cell "<<nodep->fileline()->xml()
+                <<" "<<nodep->fileline()->xmlDetailedLocation()
                 <<" name=\""<<nodep->name()<<"\""
                 <<" submodname=\""<<nodep->name()<<"\""
                 <<" hier=\""<<nodep->name()<<"\"";
@@ -319,6 +320,7 @@ private:
         }
         if (!m_hasChildren) m_os<<">\n";
         m_os<<"<cell "<<nodep->fileline()->xml()
+            <<" "<<nodep->fileline()->xmlDetailedLocation()
             <<" name=\""<<nodep->name()<<"\""
             <<" submodname=\""<<nodep->modName()<<"\""
             <<" hier=\""<<m_hier+nodep->name()<<"\"";
diff --git a/test_regress/t/t_xml_first.out b/test_regress/t/t_xml_first.out
index 8a909a3b3..5e4edbca8 100644
--- a/test_regress/t/t_xml_first.out
+++ b/test_regress/t/t_xml_first.out
@@ -11,9 +11,9 @@
     <file id="d" filename="t/t_xml_first.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d6" name="t" submodname="t" hier="t">
-      <cell fl="d19" name="cell1" submodname="mod1__W4" hier="t.cell1"/>
-      <cell fl="d24" name="cell2" submodname="mod2" hier="t.cell2"/>
+    <cell fl="d6" loc="d,6,8,6,9" name="t" submodname="t" hier="t">
+      <cell fl="d19" loc="d,19,4,19,9" name="cell1" submodname="mod1__W4" hier="t.cell1"/>
+      <cell fl="d24" loc="d,24,6,24,11" name="cell2" submodname="mod2" hier="t.cell2"/>
     </cell>
   </cells>
   <netlist>
diff --git a/test_regress/t/t_xml_output.out b/test_regress/t/t_xml_output.out
index 0b540c9c4..52a262c06 100644
--- a/test_regress/t/t_xml_output.out
+++ b/test_regress/t/t_xml_output.out
@@ -11,7 +11,7 @@
     <file id="d" filename="t/t_xml_output.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d6" name="m" submodname="m" hier="m"/>
+    <cell fl="d6" loc="d,6,8,6,9" name="m" submodname="m" hier="m"/>
   </cells>
   <netlist>
     <module fl="d6" loc="d,6,8,6,9" name="m" origName="m">
diff --git a/test_regress/t/t_xml_tag.out b/test_regress/t/t_xml_tag.out
index 5425cecf2..e192a9b65 100644
--- a/test_regress/t/t_xml_tag.out
+++ b/test_regress/t/t_xml_tag.out
@@ -11,8 +11,8 @@
     <file id="d" filename="t/t_xml_tag.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d11" name="m" submodname="m" hier="m">
-      <cell fl="d28" name="itop" submodname="ifc" hier="m.itop"/>
+    <cell fl="d11" loc="d,11,8,11,9" name="m" submodname="m" hier="m">
+      <cell fl="d28" loc="d,28,8,28,12" name="itop" submodname="ifc" hier="m.itop"/>
     </cell>
   </cells>
   <netlist>