Tweaks suggested by Copilot

Signed-off-by: James Ball <jameball@qti.qualcomm.com>

Author: james-ball-qualcomm

tests/params/expected/test-csr-appendix-adoc-includes/test-ch2/qux.QQQ.adoc

@@ -1,5 +1,6 @@
 | qux.QQQ
-| Other
+a| Other +
+func-of: foo.GHI
 | FLD:qux.QQQ
 a|
 * https://riscv.github.io/riscv-isa-manual/snapshot/norm-rules/norm-rules.html#QUX_QQQ_WLRL_OTHER[QUX_QQQ_WLRL_OTHER]

tests/params/expected/test-csr-table-variants/test-csr-table-full-default/test-ch2/qux.QQQ.adoc

@@ -1,5 +1,6 @@
 | qux.QQQ
-| Other
+a| Other +
+func-of: foo.GHI
 | FLD:qux.QQQ
 a|
 * https://riscv.github.io/riscv-isa-manual/snapshot/norm-rules/norm-rules.html#QUX_QQQ_WLRL_OTHER[QUX_QQQ_WLRL_OTHER]

tests/params/expected/test-csr-table-variants/test-csr-table-reordered/test-ch2/qux.QQQ.adoc

@@ -1,4 +1,5 @@
-| Other
+a| Other +
+func-of: foo.GHI
 | FLD:qux.QQQ
 | qux.QQQ
 a|

tests/params/expected/test-params.html

@@ -456,7 +456,7 @@ <h1 class="grand-total-heading">42 Parameters, 5 WARL/WLRL CSRs</h1>
             </tr>
             <tr>
               <td rowspan=1 id="qux.QQQ">qux.QQQ</td>
-              <td rowspan=1>Other</td>
+              <td rowspan=1>Other<br>func-of: foo.GHI</td>
               <td rowspan=1>FLD:qux.QQQ</td>
               <td><a href="test-ch2.html#norm:qux_qqq_wlrl_other">The qux.QQQ CSR field has implementation-defined behavior<br>that doesn't match any of the defined WARL/WLRL types.</a></td>
             </tr>

tests/params/expected/test-params.json

@@ -1535,7 +1535,6 @@
       "chapter_name": "Two",
       "category": "WARL",
       "type": "LegalEnum",
-      "func-of-reg-name": "foo",
       "func-of-field-name": "GHI",
       "impl-defs": [
         {
@@ -1624,6 +1623,8 @@
       "chapter_name": "Two",
       "category": "WLRL",
       "type": "Other",
+      "func-of-reg-name": "foo",
+      "func-of-field-name": "GHI",
       "impl-defs": [
         {
           "name": "QUX_QQQ_WLRL_OTHER",

tests/params/test-ch2.yaml

@@ -54,7 +54,6 @@ csr_definitions:
   - reg-name: foo
     field-name: ABC
     type: LegalEnum
-    func-of-reg-name: foo
     func-of-field-name: GHI
     impl-def: FOO_ABC_WARL_ENUM
 
@@ -72,7 +71,10 @@ csr_definitions:
     impl-def: ZORT_XYZ_WLRL_RO_MASK
 
   # Case 4: CSR field that doesn't match any of the above cases.
+  # Also test func-of relationship to a field in a different register.
   - reg-name: qux
     field-name: QQQ
+    func-of-reg-name: foo
+    func-of-field-name: GHI
     type: Other
     impl-def: QUX_QQQ_WLRL_OTHER

tools/create_params.py

@@ -1235,9 +1235,14 @@ def html_csr_table_row(f, csr: Dict[str, Any], chapter_name: Optional[str]):
         isinstance(func_of_field_name, str)
         and func_of_field_name
     ):
-        func_of_target = ""
+        base_reg_name: str = ""
         if isinstance(func_of_reg_name, str) and func_of_reg_name:
-            func_of_target = func_of_reg_name
+            base_reg_name = func_of_reg_name
+        elif isinstance(func_of_field_name, str) and func_of_field_name:
+            if isinstance(reg_name, str) and reg_name:
+                base_reg_name = reg_name
+
+        func_of_target = base_reg_name
         if isinstance(func_of_field_name, str) and func_of_field_name:
             if func_of_target:
                 func_of_target = f"{func_of_target}.{func_of_field_name}"