Merge pull request #990 from riscv/tdata1

Fix tdata1 having duplicate register diagrams

registers.py

@@ -989,9 +989,7 @@ def write_adoc( fd, registers ):
         fd.write(remove_indent(r.description))
         fd.write("\n\n")
 
-        if r.diagram:
-            fd.write(f"{remove_indent(r.diagram)}\n")
-        if r.fields:
+        if r.fields or r.diagram:
             if registers.prefix == "CSR_":
                 if int(r.address, 0) >= 0xc00:
                     fd.write("This CSR is read-only.\n")
@@ -1002,7 +1000,10 @@ def write_adoc( fd, registers ):
             elif all(f.access in ('R', '0') for f in r.fields):
                 fd.write("This entire register is read-only.\n")
 
-            write_bytefield( fd, r )
+            if r.diagram:
+                fd.write(f"{remove_indent(r.diagram)}\n")
+            else:
+                write_bytefield( fd, r )
 
         columns = [("<2", "Field", lambda f: f"(({f.name}))")]
         columns += [("<6", "Description", lambda f: f.latex_description())]

xml/hwbp_registers.xml

@@ -53,27 +53,6 @@ same project unless stated otherwise.
         If this trigger supports multiple types, then the hardware should
         disable it by changing {tdata1-type} to 15.
 
-        <!-- Just an example of how <diagram> works. This is exactly what is
-        auto-generated, so doesn't actually change the net output. -->
-        <diagram>
-            [bytefield]
-            ----
-            (defattrs :plain [:plain {:font-family "M+ 1p Fallback"}])
-            (def row-height 45)
-            (def row-header-fn nil)
-            (def boxes-per-row 24)
-            (draw-column-headers {:labels ["XLEN-1" "" "" "" "XLEN-4" "" "XLEN-5" "" "XLEN-6" "" "" "" "" "" "" "" "0" "" "" "" "" "" "" ""]})
-            (draw-box "type" {:span 5})
-            (draw-box "dmode" {:span 3})
-            (draw-box "data" {:span 9})
-            (draw-box "" {:span 7 :borders {}})
-            (draw-box "4" {:span 5 :borders {}})
-            (draw-box "1" {:span 3 :borders {}})
-            (draw-box "XLEN - 5" {:span 9 :borders {}})
-            (draw-box "" {:span 7 :borders {}})
-            ----
-        </diagram>
-
         <field name="type" bits="XLEN-1:XLEN-4" access="WARL" reset="Preset">
             <value v="0" name="none">
             There is no trigger at this {csr-tselect}.