feat(idl): indirect csr support

.pre-commit-config.yaml

@@ -119,6 +119,7 @@ repos:
     rev: v5.0.2
     hooks:
       - id: reuse-lint-file
+        exclude: COMMIT_EDITMSG
 
   - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
     rev: v9.22.0

Rakefile

@@ -264,18 +264,15 @@ namespace :test do
     puts "All files validate against their schema"
   end
 
-  task idl: ["#{$root}/.stamps/resolve-rv32.stamp", "#{$root}/.stamps/resolve-rv64.stamp"]  do
-    print "Parsing IDL code for RV32..."
-    cfg_arch32 = cfg_arch_for("rv32")
-    puts "done"
-
-    cfg_arch32.type_check
+  task :idl do
+    cfg = ENV["CFG"]
+    raise "Missing CFG enviornment variable" if cfg.nil?
 
-    print "Parsing IDL code for RV64..."
-    cfg_arch64 = cfg_arch_for("rv64")
+    print "Parsing IDL code for #{cfg}..."
+    cfg_arch = cfg_arch_for(cfg)
     puts "done"
 
-    cfg_arch64.type_check
+    cfg_arch.type_check
 
     puts "All IDL passed type checking"
   end
@@ -442,8 +439,14 @@ namespace :test do
     Rake::Task["test:lib"].invoke
     $logger.info "Running test:schema"
     Rake::Task["test:schema"].invoke
-    $logger.info "Running test:idl"
+    $logger.info "UPDATE: Running test:idl for rv32"
+    ENV["CFG"] = "rv32"
+    Rake::Task["test:idl"].invoke
+    $logger.info "UPDATE: Running test:idl for rv64"
+    ENV["CFG"] = "rv64"
     Rake::Task["test:idl"].invoke
+    $logger.info "UPDATE: Running test:idl for qc_iu"
+    ENV["CFG"] = "qc_iu"
     $logger.info "Running test:inst_encodings"
     Rake::Task["test:inst_encodings"].invoke
     $logger.info "Running test:llvm"

arch/csr/F/fcsr.yaml

@@ -5,6 +5,7 @@ kind: csr
 name: fcsr
 long_name: Floating-point control and status register (`frm` + `fflags`)
 address: 0x003
+writeable: true
 description: |
   The floating-point control and status register, `fcsr`, is a RISC-V
   control and status register (CSR). It is a 32-bit read/write register

arch/csr/H/henvcfg.yaml

@@ -4,6 +4,7 @@ $schema: "csr_schema.json#"
 kind: csr
 name: henvcfg
 address: 0x60A
+writeable: true
 long_name: Hypervisor Environment Configuration
 description: |
   The henvcfg CSR is a 64-bit read/write register that controls certain characteristics of the

arch/csr/H/henvcfgh.yaml

@@ -4,6 +4,7 @@ $schema: "csr_schema.json#"
 kind: csr
 name: henvcfgh
 address: 0x61A
+writeable: true
 base: 32
 long_name: most-significant 32 bits of Hypervisor Environment Configuration
 description: |

arch/csr/H/hgatp.yaml

@@ -102,6 +102,7 @@ description: |
   HFENCE.GVMA instruction (see <<hfence.vma>>) before or
   after writing `hgatp`.
 address: 0x680
+writeable: true
 priv_mode: S
 definedBy: H
 length: SXLEN

arch/csr/H/htimedelta.yaml

@@ -15,6 +15,7 @@ description: |
   `htimedelta` may be used to represent negative time offsets.
 
 address: 0x605
+writeable: true
 priv_mode: S
 definedBy: H
 length: 64

arch/csr/H/htimedeltah.yaml

@@ -8,6 +8,7 @@ description: |
   Upper half of the `htimedelta` CSR.
 
 address: 0x615
+writeable: true
 priv_mode: S
 definedBy: H
 length: 32

arch/csr/H/htinst.yaml

@@ -4,6 +4,7 @@ $schema: "csr_schema.json#"
 kind: csr
 name: htinst
 address: 0x64a
+writeable: true
 long_name: Hypervisor Trap Instruction Register
 description: |
   When a trap is taken into HS-mode, mtinst is written with a value that, if nonzero,

arch/csr/H/htval.yaml

@@ -4,6 +4,7 @@ $schema: "csr_schema.json#"
 kind: csr
 name: htval
 address: 0x643
+writeable: true
 long_name: Hypervisor Trap Value Register
 description: |
   When a trap is taken into HS-mode, htval is written with additional exception-specific information, alongside stval, to assist software in handling the trap.

arch/csr/H/mtinst.yaml

@@ -4,6 +4,7 @@ $schema: "csr_schema.json#"
 kind: csr
 name: mtinst
 address: 0x34a
+writeable: true
 long_name: Machine Trap Instruction Register
 description: |
   When a trap is taken into M-mode, mtinst is written with a value that, if nonzero,

arch/csr/H/mtval2.yaml

@@ -4,6 +4,7 @@ $schema: "csr_schema.json#"
 kind: csr
 name: mtval2
 address: 0x34b
+writeable: true
 long_name: Machine Second Trap Value Register
 description: |
   When a trap is taken into M-mode from a virtual mode, mtval2 is written with additional exception-specific information,

arch/csr/H/vsatp.yaml

@@ -4,6 +4,7 @@ $schema: "csr_schema.json#"
 kind: csr
 name: vsatp
 address: 0x280
+writeable: true
 virtual_address: 0x180
 long_name: Virtual Supervisor Address Translation and Protection
 description: |

arch/csr/Smrnmi/mncause.yaml

@@ -5,6 +5,7 @@ kind: csr
 name: mncause
 long_name: Resumable NMI cause
 address: 0x742
+writeable: true
 priv_mode: M
 length: MXLEN
 definedBy: Smrnmi

arch/csr/Smrnmi/mnepc.yaml

@@ -5,6 +5,7 @@ kind: csr
 name: mnepc
 long_name: Machine Exception Program Counter
 address: 0x741
+writeable: true
 priv_mode: M
 length: MXLEN
 description: |

arch/csr/Smrnmi/mnscratch.yaml

@@ -5,9 +5,12 @@ kind: csr
 name: mnscratch
 long_name: Machine Scratch Register
 address: 0x740
+writeable: true
 priv_mode: M
 length: MXLEN
-description: Scratch register for software use in NMI / double trap. Bits are not interpreted by hardware.
+description:
+  Scratch register for software use in NMI / double trap. Bits are not
+  interpreted by hardware.
 definedBy: Smrnmi
 fields:
   SCRATCH:

arch/csr/Smrnmi/mnstatus.yaml

@@ -5,11 +5,14 @@ kind: csr
 name: mnstatus
 long_name: Machine NMI Status
 address: 0x744
+writeable: true
 priv_mode: M
 
 # length is MXLEN-bit
 length: MXLEN
-description: The mnstatus register tracks and controls the hart's current NMI operating state.
+description:
+  The mnstatus register tracks and controls the hart's current NMI operating
+  state.
 definedBy: Smrnmi
 fields:
   MNPP:

arch/csr/Zihpm/hpmcounter10h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter10h.COUNT
+    location: 31-0
+    alias: mhpmcounter10h.COUNT[63:32]
     description: Alias of `mhpmcounter10h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter11h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter11h.COUNT
+    location: 31-0
+    alias: mhpmcounter11h.COUNT[63:32]
     description: Alias of `mhpmcounter11h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter12h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter12h.COUNT
+    location: 31-0
+    alias: mhpmcounter12h.COUNT[63:32]
     description: Alias of `mhpmcounter12h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter13h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter13h.COUNT
+    location: 31-0
+    alias: mhpmcounter13h.COUNT[63:32]
     description: Alias of `mhpmcounter13h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter14h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter14h.COUNT
+    location: 31-0
+    alias: mhpmcounter14h.COUNT[63:32]
     description: Alias of `mhpmcounter14h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter15h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter15h.COUNT
+    location: 31-0
+    alias: mhpmcounter15h.COUNT[63:32]
     description: Alias of `mhpmcounter15h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter16h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter16h.COUNT
+    location: 31-0
+    alias: mhpmcounter16h.COUNT[63:32]
     description: Alias of `mhpmcounter16h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter17h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter17h.COUNT
+    location: 31-0
+    alias: mhpmcounter17h.COUNT[63:32]
     description: Alias of `mhpmcounter17h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter18h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter18h.COUNT
+    location: 31-0
+    alias: mhpmcounter18h.COUNT[63:32]
     description: Alias of `mhpmcounter18h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter19h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter19h.COUNT
+    location: 31-0
+    alias: mhpmcounter19h.COUNT[63:32]
     description: Alias of `mhpmcounter19h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter20h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter20h.COUNT
+    location: 31-0
+    alias: mhpmcounter20h.COUNT[63:32]
     description: Alias of `mhpmcounter20h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter21h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter21h.COUNT
+    location: 31-0
+    alias: mhpmcounter21h.COUNT[63:32]
     description: Alias of `mhpmcounter21h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL

arch/csr/Zihpm/hpmcounter22h.yaml

@@ -26,12 +26,12 @@ description: |
   ! 1 ! 1 ! 1 ! read-only ! read-only ! read-only ! read-only
   !===
 priv_mode: U
-length: 64
+length: 32
 definedBy: Sscofpmf
 fields:
   COUNT:
-    location: 63-0
-    alias: mhpmcounter22h.COUNT
+    location: 31-0
+    alias: mhpmcounter22h.COUNT[63:32]
     description: Alias of `mhpmcounter22h.COUNT`.
     type: RO-H
     reset_value: UNDEFINED_LEGAL