fix parse errors

riscv-software-src · Nov 24, 2023 · fc5461e · fc5461e
1 parent ea5c6ed
commit fc5461e
Showing 1 changed file with 11 additions and 49 deletions.
diff --git a/riscv_config/schemas/schema_isa.yaml b/riscv_config/schemas/schema_isa.yaml
@@ -1306,7 +1306,7 @@ hart_schema:
                          - unchanged
               default: {implemented: false}
               check_with: s_check
-           spelp:
+            spelp:
               type: dict
               schema:
                 description:
@@ -1410,7 +1410,7 @@ hart_schema:
                   default: {ro_constant: 0}
               default: {implemented: False} 
               check_with: h_check
-           mpelp:
+            mpelp:
               type: dict
               schema:
                 description:
@@ -6532,15 +6532,10 @@ hart_schema:
     ssp:
       type: dict
       schema:
-        description:
-          type: string
-          default: Shadow stack pointer.
-        address: {type: integer, default: 0x011, allowed: [0x011]}
+        description: {type: string, default: Shadow stack pointer.}
         priv_mode: {type: string, default: U, allowed: [U]}
-        reset-val:
-          type: integer
-          default: 0
-          check_with: max_length
+        address: {type: integer, default: 0x011, allowed: [0x011]}
+        reset-val: {type: integer, default: 0,  check_with: [max_length]}
         rv32:
           type: dict
           schema:
@@ -6549,26 +6544,9 @@ hart_schema:
             shadow_type: {type: string, default: rw, nullable: True, allowed: ['rw','ro']}
             msb: {type: integer, default: 31, allowed: [31]}
             lsb: {type: integer, default: 0, allowed: [0]}
-            type:
-              type: dict
-              oneof:
-              - schema: {ro_constant: {type: integer, max:  0xFFFFFFFF}}
-              - schema: {ro_variable: {type: boolean}}
-              - schema: { warl: *ref_warl }
-              default:
-                warl:
-                  dependency_fields: []
-                  legal:
-                  - ssp[31:0] in [0x00000000:0xFFFFFFFF]
-                  wr_illegal:
-                  - unchanged
-            accessible:
-              type: boolean
-              default: false
-              check_with: 
-                - rv32_check
-                - zicfiss_check
-          default: {accessible: false}
+            accessible: {type: boolean, default: true, check_with: [rv32_check, zicfiss_check]}
+          check_with: u_check
+          default: {accessible: False}
         rv64:
           type: dict
           schema:
@@ -6577,25 +6555,9 @@ hart_schema:
             shadow_type: {type: string, default: rw, nullable: True, allowed: ['rw','ro']}
             msb: {type: integer, default: 63, allowed: [63]}
             lsb: {type: integer, default: 0, allowed: [0]}
-            type:
-              type: dict
-              oneof:
-              - schema: {ro_constant: {type: integer, max:  0xFFFFFFFFFFFFFFFF}}
-              - schema: {ro_variable: {type: boolean}}
-              - schema: { warl: *ref_warl }
-              default:
-                warl:
-                  dependency_fields: []
-                  legal:
-                  - ssp[63:0] in [0x00000000:0xFFFFFFFFFFFFFFFF]
-                  wr_illegal:
-                  - unchanged
-            accessible:
-              default: false
-              check_with: 
-                - rv64_check
-                - zicfiss_check
-          default: {accessible: false}
+            accessible: {default: true, check_with: [rv64_check, zicfiss_check]}
+          check_with: u_check
+          default: {accessible: False}
     cycle:
       type: dict
       schema: