[riscv-config] Update PMP definitions in cv32q65x spec (#2401)

openhwgroup · Jul 25, 2024 · 96b0508 · 96b0508
1 parent b438a8b
commit 96b0508
Show file tree

Hide file tree

Showing 3 changed files with 1,307 additions and 273 deletions.
diff --git a/config/gen_from_riscv_config/scripts/libs/utils.py b/config/gen_from_riscv_config/scripts/libs/utils.py
@@ -454,11 +454,7 @@ def returnAsString(self):
                         field.name.upper(),
                         field.fieldreset,
                         field.fieldaccess,
-                        (
-                            Render.bitmask(field.andMask, field.orMask)
-                            if field.andMask and field.orMask
-                            else field.bitlegal
-                        ),
+                        field.bitlegal,
                     ]
                     _line.append(field.fieldDesc)
                     reg_table.append(_line)
@@ -1015,9 +1011,11 @@ def returnRegister(
                                     if matches:
                                         expr_type = str(matches.group(2))
                                         if expr_type == "bitmask":
-                                            # legal_value is left at default, cf. Render.bitmask().
                                             andMask = str(matches.group(4))
                                             orMask = str(matches.group(5))
+                                            legal_value = Render.bitmask(
+                                                andMask, orMask
+                                            )
                                         elif expr_type == "in":
                                             if matches.group(3).find(",") >= 0:
                                                 # list ==> set of values