Merge pull request #129 from Abdulwadoodd/zc_dev

Add support for Code Size Reduction Extension
riscv-software-src · Aug 21, 2023 · e0bbdb6 · e0bbdb6
2 parents 098f042 + 719c228
commit e0bbdb6
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 2 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.13.1] - 2023-08-21
+  - Add support for Code Size Reduction (Zce) extension
+
 ## [3.13.0] - 2023-08-14
   - Fixed issue #110
   - Fixed issue #108

diff --git a/riscv_config/__init__.py b/riscv_config/__init__.py
@@ -1,3 +1,3 @@
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
-__version__ = '3.13.0'
+__version__ = '3.13.1'
diff --git a/riscv_config/constants.py b/riscv_config/constants.py
@@ -24,6 +24,7 @@
         "Zicbom", "Zicbop", "Zicboz", "Zicntr", "Zicsr", "Zicond", "Zifencei", "Zihintpause", "Zihpm",
         "Zmmul",
         "Zam", "Zacas",
+        "Zca", "Zcb", "Zcf", "Zcd" , "Zcmp", "Zcmt", 
         "Zfh", "Zfa",
         "Zfinx", "Zdinx", "Zhinx", "Zhinxmin",
         "Ztso",

diff --git a/riscv_config/schemas/schema_isa.yaml b/riscv_config/schemas/schema_isa.yaml
@@ -13537,3 +13537,100 @@ CSR and the value returned in VS-mode or VU-mode.}
                 - rv64_check
                 - smrnmi_check
           default: {accessible: false}
+    jvt:
+      type: dict
+      schema:
+        description: { type: string, default: Table jump base vector and control register }
+        address: {type: integer, default: 0x0017, allowed: [0x0017]}
+        priv_mode: {type: string, default: M, allowed: [M]}
+        reset-val: { type: integer, check_with: max_length , default: 0}
+        rv32:
+          type: dict
+          schema:
+            fields: {type: list, default: []}
+            mode:
+              type: dict
+              schema:
+                description: {type: string, default: Jump Table mode}
+                shadow: {type: string, default: , nullable: True}
+                shadow_type: {type: string, default: rw, nullable: True, allowed: ['rw','ro']}
+                msb: {type: integer, default: 5, allowed: [5]}
+                lsb: {type: integer, default: 0, allowed: [0]}
+                implemented: {type: boolean, default: true, allowed: [true]}
+                type: 
+                  type: dict
+                  oneof:
+                    - schema: {ro_constant: {type: integer, max:  64}}
+                    - schema: {ro_variable: {type: boolean}}
+                    - schema: { warl: *ref_warl }
+                  default:
+                    ro_constant: 0
+              default: {implemented: True}
+            base: 
+              type: dict
+              schema:
+                description: {type: string, default: Jump Table base address}
+                shadow: {type: string, default: , nullable: True}
+                shadow_type: {type: string, default: rw, nullable: True, allowed: ['rw','ro']}
+                msb: {type: integer, default: 31, allowed: [31]}
+                lsb: {type: integer, default: 6, allowed: [6]}
+                implemented: {type: boolean, default: true, allowed: [true]}
+                type:
+                  type: dict
+                  oneof:
+                  - schema: {ro_constant: {type: integer, max:  67108864}}
+                  - schema: {ro_variable: {type: boolean}}
+                  - schema: { warl: *ref_warl }
+                  default: 
+                     warl:
+                       dependency_fields: []
+                       legal:
+                         - "base[31:6] bitmask [0x3FFFFFF, 0x0000000]"
+                       wr_illegal:
+                         - "Unchanged"
+              default: {implemented: true}
+        rv64:
+          type: dict
+          schema:
+            fields: {type: list, default: []}
+            mode:
+              type: dict
+              schema:
+                description: {type: string, default: Jump Table mode}
+                shadow: {type: string, default: , nullable: True}
+                shadow_type: {type: string, default: rw, nullable: True, allowed: ['rw','ro']}
+                msb: {type: integer, default: 5, allowed: [5]}
+                lsb: {type: integer, default: 0, allowed: [0]}
+                implemented: {type: boolean, default: true, allowed: [true]}
+                type: 
+                  type: dict
+                  oneof:
+                    - schema: {ro_constant: {type: integer, max:  64}}
+                    - schema: {ro_variable: {type: boolean}}
+                    - schema: { warl: *ref_warl }
+                  default:
+                    ro_constant: 0
+              default: {implemented: True}
+            base: 
+              type: dict
+              schema:
+                description: {type: string, default: Jump Table base address}
+                shadow: {type: string, default: , nullable: True}
+                shadow_type: {type: string, default: rw, nullable: True, allowed: ['rw','ro']}
+                msb: {type: integer, default: 63, allowed: [63]}
+                lsb: {type: integer, default: 6, allowed: [6]}
+                implemented: {type: boolean, default: true, allowed: [true]}
+                type:
+                  type: dict
+                  oneof:
+                  - schema: {ro_constant: {type: integer, max:  288230376151711744}}
+                  - schema: {ro_variable: {type: boolean}}
+                  - schema: { warl: *ref_warl }
+                  default: 
+                     warl:
+                       dependency_fields: []
+                       legal:
+                         - "base[63:6] bitmask [0x3FFFFFFFFFFFFFF, 0x000000000000000]"
+                       wr_illegal:
+                         - "Unchanged"
+              default: {implemented: true}
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.13.0
+current_version = 3.13.1
 commit = True
 tag = True