udb 0.1.9 → 0.1.14

data/.data/spec/schemas/ext_schema.json

@@ -1,6 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "v0.1",
+  "description": "An ISA extension defines a named set of instructions, CSRs, and behaviors that can be implemented by a RISC-V processor. Each extension has one or more versioned releases, with various ratification states (development, frozen, public-review, ratification-ready, ratified, or nonstandard-released).\n\n## Key Fields\n\n- `name`: Short identifier used throughout the database (e.g., `I`, `M`, `Zicsr`, `Smstateen`)\n- `long_name`: Human-readable one-line description\n- `description`: Full AsciiDoc documentation of the extension\n- `type`: Whether the extension is `unprivileged` or `privileged`\n- `versions`: Array of versioned releases, each with a `state` and optional `ratification_date`\n- `requirements`: Optional condition that must be true for the extension to be implementable (e.g., requires another extension)\n- `company`: Organization that developed the extension (defaults to RISC-V International for standard extensions)\n- `doc_license`: License for the extension documentation",
   "type": "object",
   "required": [
     "$schema",
@@ -11,50 +12,105 @@
     "long_name",
     "versions"
   ],
+  "examples": [
+    {
+      "_title": "Minimal Extension (Zicsr)",
+      "_quick_start": true,
+      "$schema": "ext_schema.json#",
+      "kind": "extension",
+      "name": "Zicsr",
+      "long_name": "Control and status register instructions",
+      "description": "Control and status register instructions",
+      "type": "unprivileged",
+      "versions": [
+        {
+          "version": "2.0.0",
+          "state": "ratified",
+          "ratification_date": "2019-04"
+        }
+      ]
+    },
+    {
+      "_title": "Extension with Requirements (B)",
+      "$schema": "ext_schema.json#",
+      "kind": "extension",
+      "name": "B",
+      "long_name": "Bit Manipulation",
+      "description": "The B standard extension comprises instructions provided by the Zba, Zbb, and Zbs extensions.",
+      "type": "unprivileged",
+      "company": {
+        "name": "RISC-V International",
+        "url": "https://riscv.org"
+      },
+      "doc_license": {
+        "name": "Creative Commons Attribution 4.0 International License",
+        "url": "https://creativecommons.org/licenses/by/4.0/"
+      },
+      "versions": [
+        {
+          "version": "1.0.0",
+          "state": "ratified",
+          "ratification_date": "2024-04",
+          "url": "https://drive.google.com/file/d/1SgLoasaBjs5WboQMaU3wpHkjUwV71UZn/view",
+          "requirements": {
+            "extension": {
+              "allOf": [
+                { "name": "Zba", "version": "= 1.0.0" },
+                { "name": "Zbb", "version": "= 1.0.0" },
+                { "name": "Zbs", "version": "= 1.0.0" }
+              ]
+            }
+          }
+        }
+      ]
+    }
+  ],
   "properties": {
     "$schema": {
       "type": "string",
       "format": "uri-reference",
-      "description": "Path to schema, relative to <UDB ROOT>/schemas",
+      "description": "Schema reference - must be `ext_schema.json#`",
       "const": "ext_schema.json#"
     },
     "kind": {
       "type": "string",
       "const": "extension",
-      "description": "Object type"
+      "description": "Document type identifier - must be `extension`"
     },
     "name": {
       "$ref": "schema_defs.json#/$defs/extension_name"
     },
     "long_name": {
       "type": "string",
-      "description": "One line description for the extension"
+      "description": "One-line human-readable name for the extension (e.g., `Address generation`, `Bit Manipulation`)"
     },
     "description": {
       "$ref": "schema_defs.json#/$defs/spec_text",
-      "description": "Full documentation of the extension"
+      "description": "Full AsciiDoc documentation of the extension. May include multiple paragraphs, code examples, and cross-references."
     },
     "rvi_jira_issue": {
       "type": "string",
-      "description": "JIRA issue number for the RVI issue that tracks this extension"
+      "description": "JIRA issue number tracking this extension in the RISC-V International issue tracker"
     },
     "company": {
-      "description": "The company that developed this extension",
+      "description": "Organization that developed this extension. Omit for RISC-V International standard extensions.",
       "$ref": "schema_defs.json#/$defs/company"
     },
     "doc_license": {
+      "description": "License for the extension documentation",
       "$ref": "schema_defs.json#/$defs/license"
     },
     "type": {
       "enum": ["unprivileged", "privileged"],
-      "description": "Either unprivileged or privileged"
+      "description": "Privilege level of the extension. `unprivileged` extensions add instructions or behaviors accessible in user mode; `privileged` extensions add supervisor- or machine-mode functionality."
     },
     "requirements": {
-      "description": "Condition represeting requirements of this extension. If the condition is false, the extension cannot be implemented",
+      "description": "Condition that must be true for this extension to be implementable. If the condition is false, the extension cannot be implemented. Typically used to express that one extension requires another (e.g., `D` requires `F`).",
       "$ref": "schema_defs.json#/$defs/condition"
     },
     "versions": {
       "type": "array",
+      "description": "Ordered list of versioned releases of this extension, from oldest to newest.",
       "items": {
         "type": "object",
         "required": ["version", "state"],
@@ -100,31 +156,34 @@
         ],
         "properties": {
           "version": {
-            "$ref": "schema_defs.json#/$defs/extension_version"
+            "$ref": "schema_defs.json#/$defs/extension_version",
+            "description": "Version number in `MAJOR.MINOR.PATCH` format (e.g., `1.0.0`, `2.1.0`)"
           },
           "state": {
             "$ref": "schema_defs.json#/$defs/spec_state",
-            "description": "Current state of this version"
+            "description": "Ratification state of this version. See `spec_state` in schema_defs for all possible values and their meanings."
           },
           "repositories": {
-            "description": "Repositories associated with this extension",
+            "description": "Source repositories where this version of the extension is developed",
             "type": "array",
             "items": {
               "type": "object",
               "properties": {
                 "url": {
                   "type": "string",
-                  "format": "uri"
+                  "format": "uri",
+                  "description": "Repository URL"
                 },
                 "branch": {
                   "type": "string",
-                  "description": "Branch/tag where the work is done"
+                  "description": "Branch or tag containing the work for this version"
                 }
               },
               "additionalProperties": false
             }
           },
           "ratification_date": {
+            "description": "Month when this version was ratified, in `YYYY-MM` format. Use `unknown` if the date is not recorded. Required when `state` is `ratified`.",
             "oneOf": [
               {
                 "type": "string",
@@ -169,37 +228,37 @@
             "items": {
               "type": "string"
             },
-            "description": "Changes since last version"
+            "description": "List of changes introduced in this version relative to the previous version"
           },
           "url": {
             "type": "string",
             "format": "uri",
-            "description": "Link to ratified document"
+            "description": "URL to the ratified specification document (e.g., a PDF on the RISC-V website)"
           },
           "contributors": {
-            "description": "List of contributors to this version of the extension",
+            "description": "People who contributed to this version of the extension",
             "type": "array",
             "items": {
               "type": "object",
               "properties": {
                 "name": {
                   "type": "string",
-                  "description": "Contributor name, in 'GIVEN_NAME SURNAME' format"
+                  "description": "Contributor name in `GIVEN_NAME SURNAME` format"
                 },
                 "company": {
                   "type": "string",
-                  "description": "Company the contributor worked for, or 'Individual'"
+                  "description": "Company the contributor worked for at the time, or `Individual`"
                 },
                 "email": {
                   "type": "string",
                   "format": "email",
-                  "description": "E-mail address for the contributor"
+                  "description": "Contributor email address"
                 }
               }
             }
           },
           "requirements": {
-            "description": "Condition represeting requirements of this extension version _in addition to any specified for the extension overall_. If the condition is false, the extension version cannot be implemented",
+            "description": "Additional condition that must be true for this specific version to be implementable, beyond any requirements on the extension overall. If the condition is false, this version cannot be implemented.",
             "$ref": "schema_defs.json#/$defs/condition"
           }
         },
@@ -208,10 +267,7 @@
     },
     "$source": {
       "type": "string",
-      "description": "Source file where this extension was defined"
-    },
-    "cert_normative_rules": {
-      "$ref": "schema_defs.json#/$defs/cert_normative_rules"
+      "description": "Source file path when this extension was generated or copied from another file"
     }
   },
   "additionalProperties": false

data/.data/spec/schemas/inst_schema.json

@@ -386,9 +386,6 @@
     "operation_ast": {
       "type": "object"
     },
-    "cert_normative_rules": {
-      "$ref": "schema_defs.json#/$defs/cert_normative_rules"
-    },
     "assembly": {
       "type": "string",
       "description": "Assembly format of the instruction. Can use decode variables"

data/.data/spec/schemas/mmr_schema.json

@@ -35,11 +35,11 @@
       "description": "One line description for the MMR"
     },
     "description": {
-      "$ref": "schema_defs.json#/definitions/spec_text",
+      "$ref": "schema_defs.json#/$defs/spec_text",
       "description": "Function of the register"
     },
     "definedBy": {
-      "$ref": "schema_defs.json#/definitions/condition",
+      "$ref": "schema_defs.json#/$defs/condition",
       "description": "Extension(s) that define the MMR"
     },
     "physical_address": {
@@ -59,7 +59,7 @@
       "type": "object",
       "patternProperties": {
         "^[a-zA-Z].*$": {
-          "$ref": "csr_schema.json#/definitions/csr_field"
+          "$ref": "csr_schema.json#/$defs/csr_field"
         }
       },
       "description": "fields of this MMR",

data/.data/spec/schemas/profile_release_schema.json

@@ -14,7 +14,7 @@
       "type": "string",
       "description": "Name (database key) of this Profile Release"
     },
-    "long name": {
+    "long_name": {
       "type": "string",
       "description": "One line description of this Profile Release"
     }

data/.data/spec/schemas/profile_schema.json

@@ -32,9 +32,6 @@
       "type": "integer",
       "description": "32 for RV32I or 64 for RV64I"
     },
-    "cert_normative_rules": {
-      "$ref": "schema_defs.json#/$defs/cert_normative_rules"
-    },
     "requirements": {
       "$ref": "schema_defs.json#/$defs/condition"
     },

data/.data/spec/schemas/register_file_schema.json

@@ -27,6 +27,10 @@
         "when": {
           "$ref": "schema_defs.json#/$defs/requires_entry"
         },
+        "reset_value": {
+          "type": "string",
+          "description": "IDL literal expression for the reset value (e.g., '0'). Omit if reset state is unknown."
+        },
         "arch_read()": {
           "type": "string",
           "description": "Function describing the architecturally defined read behavior. Use this for architecturally mandated effects (e.g., x0 always reads as zero)."
@@ -74,7 +78,7 @@
         "name",
         "long_name",
         "description",
-        "register_length",
+        "register_length()",
         "registers"
       ],
       "additionalProperties": false,
@@ -103,8 +107,9 @@
           "type": "string",
           "enum": ["general_purpose", "floating_point", "vector"]
         },
-        "register_length": {
-          "$ref": "schema_defs.json#/$defs/bit_length_value"
+        "register_length()": {
+          "type": "string",
+          "description": "IDL function body returning the register width in bits. May reference params (MXLEN, VLEN) or implemented?(). Example: 'return MXLEN;'"
         },
         "registers": {
           "type": "array",

data/.data/spec/schemas/schema_defs.json

@@ -115,6 +115,7 @@
     },
     "spec_state": {
       "type": "string",
+      "description": "Ratification state of a specification or extension version: `development` (actively being worked on), `frozen` (feature-complete, under review), `public-review` (open for public comment), `ratification-ready` (approved by the task group, awaiting board vote), `ratified` (officially approved by RISC-V International), or `nonstandard-released` (released but not part of the RISC-V standard).",
       "enum": [
         "development",
         "frozen",
@@ -223,17 +224,25 @@
     },
     "extension_name": {
       "type": "string",
+      "description": "Extension name (e.g., `I`, `M`, `Zicsr`, `Smstateen`)",
       "pattern": "^(([A-WY])|([SXZ][a-z0-9]+))$"
     },
     "extension_version": {
-      "$ref": "#/$defs/rvi_version"
+      "$ref": "#/$defs/rvi_version",
+      "description": "Exact version in `MAJOR[.MINOR[.PATCH]]` format (e.g., `2.1.0`, `2.1`, `2`)"
+    },
+    "implemented_extension_version": {
+      "type": "string",
+      "description": "Exact implemented extension version, either bare or prefixed with `=` (e.g., `2.1.0`, `2.1`, `= 2.1`)",
+      "pattern": "^(=\\s*)?[0-9]+(\\.[0-9]+(\\.[0-9]+(-pre)?)?)?$"
     },
     "requirement_string": {
       "type": "string",
+      "description": "Version requirement string (e.g., `>= 2.0`, `~> 1.5`, `= 2.1`). The `~>` operator is a pessimistic version constraint: `~> X.Y` means `>= X.Y` and `< (X+1).0`; `~> X.Y.Z` means `>= X.Y.Z` and `< X.(Y+1).0`.",
       "pattern": "^((>=)|(>)|(~>)|(<)|(<=)|(=))?\\s*[0-9]+(\\.[0-9]+(\\.[0-9]+(-[a-fA-F0-9]+)?)?)?$"
     },
     "version_requirements": {
-      "description": "A (set of) version requirements",
+      "description": "Version requirement or list of requirements (e.g., `>= 2.0` or `['>= 2.0', '< 3.0']`)",
       "oneOf": [
         {
           "$ref": "#/$defs/requirement_string"
@@ -380,30 +389,6 @@
         }
       }
     },
-    "cert_normative_rules": {
-      "description": "Architecturally visible behaviors requiring validation by certification tests",
-      "type": "array",
-      "required": ["id", "name", "doc_links", "description"],
-      "properties": {
-        "id": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        },
-        "doc_links": {
-          "description": "Link to UDB documentation, ISA manual, Sail code, or IDL code",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "description": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": false
-    },
     "encoding_match": {
       "oneOf": [
         {
@@ -434,7 +419,7 @@
     "reference": {
       "type": "string",
       "pattern": "^.+\\.yaml#(/.*)?$",
-      "description": "refrence to another database object, as a JSON Reference"
+      "description": "reference to another database object, as a JSON Reference"
     },
     "integer": {
       "description": "An integer, either native to JSON or a number-like string",
@@ -808,6 +793,7 @@
       "additionalProperties": false
     },
     "condition": {
+      "description": "A condition (YAML structure or IDL function). See the conditions reference for details.",
       "oneOf": [
         {
           "$ref": "#/$defs/yaml_condition"

data/.data/spec/std/isa/csr/H/henvcfg.yaml

@@ -289,6 +289,27 @@ fields:
         return 0;
       }
       return csr_value.SSE;
+  LPE:
+    location: 2
+    description: |
+      *Landing Pad Enable*
+
+      When the LPE field is set to 1, the Zicfilp extension is enabled in
+      VS-mode. When the LPE field is 0, the Zicfilp extension is not enabled
+      in VS-mode and the following rules apply to VS-mode:
+
+        * The hart does not update the `ELP` state; it remains as `NO_LP_EXPECTED`.
+        * The `LPAD` instruction operates as a no-op.
+    definedBy:
+      extension:
+        name: Zicfilp
+    type: RW
+    reset_value: UNDEFINED_LEGAL
+    sw_write(csr_value): |
+      if (CSR[menvcfg].LPE == 0){
+        return 0;
+      }
+      return csr_value.LPE;
   FIOM:
     location: 0
     description: |
@@ -336,4 +357,8 @@ sw_read(): |
     # henvcfg.SSE must read-as-zero
     value = value & ~(1 `<< 3);
   }
+  if (implemented?(ExtensionName::Zicfilp) && CSR[menvcfg].LPE == 0) {
+    # henvcfg.LPE must read-as-zero
+    value = value & ~(1 `<< 2);
+  }
   return value;

data/.data/spec/std/isa/csr/I/pmpaddr0.yaml

@@ -30,17 +30,19 @@ fields:
       Bits PHYS_ADDR_WIDTH-1:2 of the address specifier for PMP entry 0
       (or, if `pmp1cfg.A` == TOR, for PMP entry 1).
     type(): |
-      if (NUM_PMP_ENTRIES > 0) {
+      if (NUM_USABLE_PMP_ENTRIES > 0) {
         return CsrFieldType::RW;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
-        return UNDEFINED_LEGAL_DETERMINISTIC;
-      } else if (NUM_PMP_ENTRIES <= 0) {
+      if (NUM_USABLE_PMP_ENTRIES <= 0) {
+        # entry is not usable (not implemented or read-only zero)
+        return 0;
+      } else if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
         return UNDEFINED_LEGAL_DETERMINISTIC;
       } else {
         return csr_value.ADDR;

data/.data/spec/std/isa/csr/I/pmpaddr1.yaml

@@ -30,17 +30,19 @@ fields:
       Bits PHYS_ADDR_WIDTH-1:2 of the address specifier for PMP entry 1
       (or, if `pmp2cfg.A` == TOR, for PMP entry 2).
     type(): |
-      if (NUM_PMP_ENTRIES > 1) {
+      if (NUM_USABLE_PMP_ENTRIES > 1) {
         return CsrFieldType::RW;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
-        return UNDEFINED_LEGAL_DETERMINISTIC;
-      } else if (NUM_PMP_ENTRIES <= 1) {
+      if (NUM_USABLE_PMP_ENTRIES <= 1) {
+        # entry is not usable (not implemented or read-only zero)
+        return 0;
+      } else if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
         return UNDEFINED_LEGAL_DETERMINISTIC;
       } else {
         return csr_value.ADDR;

data/.data/spec/std/isa/csr/I/pmpaddr10.yaml

@@ -30,17 +30,19 @@ fields:
       Bits PHYS_ADDR_WIDTH-1:2 of the address specifier for PMP entry 10
       (or, if `pmp11cfg.A` == TOR, for PMP entry 11).
     type(): |
-      if (NUM_PMP_ENTRIES > 10) {
+      if (NUM_USABLE_PMP_ENTRIES > 10) {
         return CsrFieldType::RW;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
-        return UNDEFINED_LEGAL_DETERMINISTIC;
-      } else if (NUM_PMP_ENTRIES <= 10) {
+      if (NUM_USABLE_PMP_ENTRIES <= 10) {
+        # entry is not usable (not implemented or read-only zero)
+        return 0;
+      } else if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
         return UNDEFINED_LEGAL_DETERMINISTIC;
       } else {
         return csr_value.ADDR;

data/.data/spec/std/isa/csr/I/pmpaddr11.yaml

@@ -30,17 +30,19 @@ fields:
       Bits PHYS_ADDR_WIDTH-1:2 of the address specifier for PMP entry 11
       (or, if `pmp12cfg.A` == TOR, for PMP entry 12).
     type(): |
-      if (NUM_PMP_ENTRIES > 11) {
+      if (NUM_USABLE_PMP_ENTRIES > 11) {
         return CsrFieldType::RW;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
-        return UNDEFINED_LEGAL_DETERMINISTIC;
-      } else if (NUM_PMP_ENTRIES <= 11) {
+      if (NUM_USABLE_PMP_ENTRIES <= 11) {
+        # entry is not usable (not implemented or read-only zero)
+        return 0;
+      } else if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
         return UNDEFINED_LEGAL_DETERMINISTIC;
       } else {
         return csr_value.ADDR;

data/.data/spec/std/isa/csr/I/pmpaddr12.yaml

@@ -30,17 +30,19 @@ fields:
       Bits PHYS_ADDR_WIDTH-1:2 of the address specifier for PMP entry 12
       (or, if `pmp13cfg.A` == TOR, for PMP entry 13).
     type(): |
-      if (NUM_PMP_ENTRIES > 12) {
+      if (NUM_USABLE_PMP_ENTRIES > 12) {
         return CsrFieldType::RW;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
-        return UNDEFINED_LEGAL_DETERMINISTIC;
-      } else if (NUM_PMP_ENTRIES <= 12) {
+      if (NUM_USABLE_PMP_ENTRIES <= 12) {
+        # entry is not usable (not implemented or read-only zero)
+        return 0;
+      } else if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
         return UNDEFINED_LEGAL_DETERMINISTIC;
       } else {
         return csr_value.ADDR;

data/.data/spec/std/isa/csr/I/pmpaddr13.yaml

@@ -30,17 +30,19 @@ fields:
       Bits PHYS_ADDR_WIDTH-1:2 of the address specifier for PMP entry 13
       (or, if `pmp14cfg.A` == TOR, for PMP entry 14).
     type(): |
-      if (NUM_PMP_ENTRIES > 13) {
+      if (NUM_USABLE_PMP_ENTRIES > 13) {
         return CsrFieldType::RW;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
-        return UNDEFINED_LEGAL_DETERMINISTIC;
-      } else if (NUM_PMP_ENTRIES <= 13) {
+      if (NUM_USABLE_PMP_ENTRIES <= 13) {
+        # entry is not usable (not implemented or read-only zero)
+        return 0;
+      } else if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
         return UNDEFINED_LEGAL_DETERMINISTIC;
       } else {
         return csr_value.ADDR;

data/.data/spec/std/isa/csr/I/pmpaddr14.yaml

@@ -30,17 +30,19 @@ fields:
       Bits PHYS_ADDR_WIDTH-1:2 of the address specifier for PMP entry 14
       (or, if `pmp15cfg.A` == TOR, for PMP entry 15).
     type(): |
-      if (NUM_PMP_ENTRIES > 14) {
+      if (NUM_USABLE_PMP_ENTRIES > 14) {
         return CsrFieldType::RW;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
-        return UNDEFINED_LEGAL_DETERMINISTIC;
-      } else if (NUM_PMP_ENTRIES <= 14) {
+      if (NUM_USABLE_PMP_ENTRIES <= 14) {
+        # entry is not usable (not implemented or read-only zero)
+        return 0;
+      } else if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
         return UNDEFINED_LEGAL_DETERMINISTIC;
       } else {
         return csr_value.ADDR;

data/.data/spec/std/isa/csr/I/pmpaddr15.yaml

@@ -30,17 +30,19 @@ fields:
       Bits PHYS_ADDR_WIDTH-1:2 of the address specifier for PMP entry 15
       (or, if `pmp16cfg.A` == TOR, for PMP entry 16).
     type(): |
-      if (NUM_PMP_ENTRIES > 15) {
+      if (NUM_USABLE_PMP_ENTRIES > 15) {
         return CsrFieldType::RW;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
-        return UNDEFINED_LEGAL_DETERMINISTIC;
-      } else if (NUM_PMP_ENTRIES <= 15) {
+      if (NUM_USABLE_PMP_ENTRIES <= 15) {
+        # entry is not usable (not implemented or read-only zero)
+        return 0;
+      } else if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
         return UNDEFINED_LEGAL_DETERMINISTIC;
       } else {
         return csr_value.ADDR;

data/.data/spec/std/isa/csr/I/pmpaddr16.yaml

@@ -30,17 +30,19 @@ fields:
       Bits PHYS_ADDR_WIDTH-1:2 of the address specifier for PMP entry 16
       (or, if `pmp17cfg.A` == TOR, for PMP entry 17).
     type(): |
-      if (NUM_PMP_ENTRIES > 16) {
+      if (NUM_USABLE_PMP_ENTRIES > 16) {
         return CsrFieldType::RW;
       } else {
+        # entry is either not implemented or implemented as read-only zero
         return CsrFieldType::RO;
       }
     reset_value(): |
       return 0;
     sw_write(csr_value): |
-      if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
-        return UNDEFINED_LEGAL_DETERMINISTIC;
-      } else if (NUM_PMP_ENTRIES <= 16) {
+      if (NUM_USABLE_PMP_ENTRIES <= 16) {
+        # entry is not usable (not implemented or read-only zero)
+        return 0;
+      } else if (csr_value.ADDR >= ((1 `<< (PHYS_ADDR_WIDTH - 2)) - 1)) {
         return UNDEFINED_LEGAL_DETERMINISTIC;
       } else {
         return csr_value.ADDR;