Merge pull request #153 from ved-rivos/zicfiss_zicfilp

Add unratified Zicfilp and Zicfiss extensions
riscv-software-src · Dec 1, 2023 · 40feb91 · 40feb91
2 parents b082a8d + 266a727
commit 40feb91
Show file tree

Hide file tree

Showing 7 changed files with 509 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.14.1] - 2023-12-01
+  - Add support for Zicfilp and Zicfiss extensions
+
 ## [3.14.0] - 2023-11-30
   - Include Sdext in the list of S extensions
 

diff --git a/riscv_config/__init__.py b/riscv_config/__init__.py
@@ -1,3 +1,4 @@
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
-__version__ = '3.14.0'
+__version__ = '3.14.1'
+
diff --git a/riscv_config/constants.py b/riscv_config/constants.py
@@ -21,7 +21,7 @@
 ] + Zvef_extensions + Zved_extensions
 
 Z_extensions = [
-        "Zicbom", "Zicbop", "Zicboz", "Zicntr", "Zicsr", "Zicond", "Zifencei", "Zihintpause", "Zihpm",
+        "Zicbom", "Zicbop", "Zicboz", "Zicntr", "Zicsr", "Zicond", "Zicfilp", "Zicfiss", "Zifencei", "Zihintpause", "Zihpm",
         "Zmmul",
         "Zam", "Zabha", "Zacas",
         "Zca", "Zcb", "Zcf", "Zcd" , "Zcmp", "Zcmt", 

diff --git a/riscv_config/schemaValidator.py b/riscv_config/schemaValidator.py
@@ -40,6 +40,12 @@ def _check_with_smrnmi_check(self, field, value):
                   "Register cannot be implemented without Smrnmi extension in ISA."
               )
 
+    def _check_with_zicfiss_check(self, field, value):
+      global extension_list
+      if value and 'Zicfiss' not in extension_list:
+        self._error(field,
+                  "Register cannot be implemented without Zicfiss extension in ISA."
+              )
 
     def _check_with_satp_modes64(self, field, value):
         pass

diff --git a/riscv_config/schemas/schema_debug.yaml b/riscv_config/schemas/schema_debug.yaml
@@ -942,6 +942,27 @@ hart_schema:
                   - schema: { wlrl: *ref_wlrl }
                   default: {ro_constant: 0}
               default: {implemented: false}
+            pelp:
+              type: dict
+              schema:
+                description:
+                  type: string
+                  default: previous expected-landing-pad (ELP) state.
+                shadow: {type: string, default: , nullable: True}
+                shadow_type: {type: string, default: rw, nullable: True, allowed: ['rw','ro']}
+                msb: {type: integer, default: 18, allowed: [18]}
+                lsb: {type: integer, default: 18, allowed: [18]}
+                implemented: {type: boolean, default: true}
+                type:
+                  type: dict
+                  check_with:
+                    - s_debug_check
+                  oneof:
+                  - schema: {ro_constant: {type: integer, max: 1 , min : 0}}
+                  - schema: { warl: *ref_warl }
+                  - schema: { wlrl: *ref_wlrl }
+                  default: {ro_constant: 0}
+              default: {implemented: false}
             debugver:
               type: dict
               schema: