Merge branch 'main' into ext_table

.github/workflows/regress.yml

@@ -43,7 +43,6 @@ jobs:
         run: ./do test:smoke
   regress-gen-isa-manual:
     runs-on: ubuntu-latest
-    needs: regress-smoke
     env:
       MANUAL_NAME: isa
       VERSIONS: all
@@ -72,9 +71,36 @@ jobs:
         run: ./bin/build_container
       - name: Generate HTML ISA manual
         run: ./do gen:html_manual
+  regress-cfg-manual:
+    runs-on: ubuntu-latest
+    env:
+      SINGULARITY: 1
+    steps:
+      - name: Clone Github Repo Action
+        uses: actions/checkout@v4
+      - name: Setup apptainer
+        uses: eWaterCycle/[email protected]
+      - name: Get container from cache
+        id: cache-sif
+        uses: actions/cache@v4
+        with:
+          path: .singularity/image.sif
+          key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
+      - name: Get gems and node files from cache
+        id: cache-bundle-npm
+        uses: actions/cache@v4
+        with:
+          path: |
+            .home/.gems
+            node_modules
+          key: ${{ hashFiles('Gemfile.lock') }}-${{ hashFiles('package-lock.json') }}
+      - if: ${{ steps.cache-sif.outputs.cache-hit != 'true' }}
+        name: Build container
+        run: ./bin/build_container
+      - name: Generate HTML ISA manual
+        run: ./do gen:html[generic_rv64]
   regress-gen-ext-pdf:
     runs-on: ubuntu-latest
-    needs: regress-smoke
     env:
       EXT: B
       VERSION: latest
@@ -105,7 +131,6 @@ jobs:
         run: ./do gen:ext_pdf
   regress-gen-certificate:
     runs-on: ubuntu-latest
-    needs: regress-smoke
     env:
       SINGULARITY: 1
     steps:
@@ -134,7 +159,6 @@ jobs:
         run: ./do gen:cert_model_pdf[MockCertificateModel]
   regress-gen-profile:
     runs-on: ubuntu-latest
-    needs: regress-smoke
     env:
       SINGULARITY: 1
     steps:

Rakefile

@@ -33,6 +33,12 @@ def cfg_arch_for(config_name)
     )
 end
 
+file "#{$root}/.stamps/dev_gems" do |t|
+  sh "bundle exec yard config --gem-install-yri"
+  sh "bundle exec yard gem"
+  FileUtils.touch t.name
+end
+
 namespace :gen do
   desc "Generate documentation for the ruby tooling"
   task tool_doc: "#{$root}/.stamps/dev_gems" do

arch/inst/I/jalr.yaml

@@ -6,7 +6,9 @@ name: jalr
 long_name: Jump and link register
 description: |
   Jump to an address formed by adding rs1
-  to a signed offset, and store the return address in rd.
+  to a signed offset then clearing the least
+  significant bit, and store the return address
+  in rd.
 definedBy: I
 assembly: xd, imm(rs1)
 encoding:
@@ -27,7 +29,7 @@ operation(): |
   XReg returnaddr;
   returnaddr = $pc + 4;
 
-  jump(X[rs1] + imm);
+  jump((X[rs1] + imm) & ~XLEN'1);
   X[rd] = returnaddr;
 
 sail(): |

cfgs/qc_iu/arch_overlay/ext/Xqci.yaml

@@ -106,6 +106,8 @@ versions:
     - Added Xqciio sub-extension
     - Added Xqcisim sub-extension
     - Added Xqcisync sub-extension
+    - Rename instruction of qc.muladdi to qc.muliadd
+    - Rename instruction of qc.c.muladdi to qc.c.muliadd
     - Fix description of qc.shladd instruction
     - Fix description and functionality of qc.c.extu instruction
     - Fix description and functionality of qc.wrapi instruction

lib/cfg_arch.rb

@@ -621,6 +621,7 @@ def erb_env
 
     @env = Class.new
     @env.instance_variable_set(:@cfg, @cfg)
+    @env.instance_variable_set(:@cfg_arch, self)
     @env.instance_variable_set(:@params, @params)
 
     # add each parameter, either as a method (lowercase) or constant (uppercase)

schemas/csr_schema.json

@@ -226,8 +226,8 @@
         },
         "address": {
           "type": "integer",
-          "minValue": 0,
-          "maxValue": 4095,
+          "minimum": 0,
+          "maximum": 4095,
           "description": "Address of the CSR, as given to the CSR access instructions of the `Zicsr` extension"
         },
         "indirect_address": {