Merge #591

bors[bot] · maximeborges · web-flow · commit e664fe24feba · 2021-08-15T14:44:40.000Z
591: [scripts/makehtml] Fix displaying of registers with the same addressOffset and parsing of addressOffset r=adamgreig a=maximeborges

This pull request fix two bugs in the `makehtml.py` script:

- When parsing the addressOffset value, the value is parsed as base16 even if it's in base10.
- When two registers have the same addressOffset, one of the two is suppressed

The first bug is fixed by checking if the addressOffset starts with `0x` to parse from base16, or parse from base10 by default (when a register is generated from a patch).

The second bug is fixed by changing the index used for the list of registers from the addressOffset to the register name.

Co-authored-by: Maxime Borges &lt;contact@maximeborg.es&gt;
Co-authored-by: Maxime BORGES &lt;contact@maximeborg.es&gt;
Co-authored-by: Maxime &lt;contact@maximeborg.es&gt;
diff --git a/scripts/makehtml.py b/scripts/makehtml.py
@@ -69,7 +69,7 @@ def parse_device(svdfile):
             rdesc = rtag.findtext('description')
             rrstv = rtag.findtext('resetValue')
             raccs = rtag.findtext('access') or "Unspecified"
-            roffset = int(rtag.findtext('addressOffset'), 16)
+            roffset = int(rtag.findtext('addressOffset'), 0)
             for ftag in rtag.iter('field'):
                 register_fields_total += 1
                 fname = ftag.findtext('name')
@@ -146,14 +146,14 @@ def parse_device(svdfile):
             # Bodge to prevent /0 when there are no fields in a register
             if register_fields_total == 0:
                 register_fields_total = 1
-            registers[roffset] = {"name": rname,
-                                  "offset": "0x{:X}".format(roffset),
-                                  "description": rdesc, "resetValue": rrstv,
-                                  "access": raccs, "fields": fields,
-                                  "table": table,
-                                  "fields_total": register_fields_total,
-                                  "fields_documented":
-                                      register_fields_documented}
+            registers[(roffset, rname)] = {"name": rname,
+                                           "offset": "0x{:X}".format(roffset),
+                                           "description": rdesc, "resetValue": rrstv,
+                                           "access": raccs, "fields": fields,
+                                           "table": table,
+                                           "fields_total": register_fields_total,
+                                           "fields_documented":
+                                               register_fields_documented}
             peripheral_fields_total += register_fields_total
             peripheral_fields_documented += register_fields_documented
         peripherals[pname] = {"name": pname, "base": pbase,
diff --git a/scripts/makehtml.template.html b/scripts/makehtml.template.html
@@ -118,7 +118,7 @@ <h3>
         <a class=toggle-registers href=#>Toggle Registers</a>.
       </p>
       <div class="container registers" id="{{ pname }}-registers">
-        {% for roffset, register in peripheral.registers|dictsort %}
+        {% for _, register in peripheral.registers|dictsort %}
         <div class=row>
           <div class="col-sm-11 register">
             <h4>
