Merge branch 'main' into pages_fix

Author: dhower-qc

Rakefile

@@ -338,45 +338,57 @@ namespace :test do
   end
 end
 
-namespace :gen do
-  desc <<~DESC
-    Generate all certificates and profile PDFs.
-  DESC
-  task :cert_profile_pdfs do
-    puts "==================================="
-    puts "cert_profile_pdfs: Generating MC100"
-    puts "                   1st target"
-    puts "==================================="
-    Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
-
-    puts "=================================================="
-    puts "cert_profile_pdfs: Generating MockCertificateModel"
-    puts "                   2nd target"
-    puts "=================================================="
-    Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
-
-    puts "==================================="
-    puts "cert_profile_pdfs: Generating RVA20"
-    puts "                   3rd target"
-    puts "==================================="
-    Rake::Task["#{$root}/gen/profile_doc/pdf/RVA20.pdf"].invoke
-
-    puts "==================================="
-    puts "cert_profile_pdfs: Generating RVA22"
-    puts "                   4th target"
-    puts "==================================="
-    Rake::Task["#{$root}/gen/profile_doc/pdf/RVA22.pdf"].invoke
-
-    puts "==================================="
-    puts "cert_profile_pdfs: Generating RVI20"
-    puts "                   5th target"
-    puts "==================================="
-    Rake::Task["#{$root}/gen/profile_doc/pdf/RVI20.pdf"].invoke
-
-    puts "==================================="
-    puts "cert_profile_pdfs: Generating MockProfileRelease"
-    puts "                   6th target"
-    puts "==================================="
-    Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
-  end
+desc <<~DESC
+  Generate all portfolio-based PDFs (certificates and profiles).
+DESC
+task :portfolio_pdfs do
+  puts ""
+  puts "==================================="
+  puts "Generating MC100"
+  puts "==================================="
+  puts ""
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
+
+  puts ""
+  puts "=================================================="
+  puts "Generating MockCertificateModel"
+  puts "=================================================="
+  puts ""
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
+
+  puts ""
+  puts "==================================="
+  puts "Generating RVA20"
+  puts "==================================="
+  puts ""
+  Rake::Task["#{$root}/gen/profile_doc/pdf/RVA20.pdf"].invoke
+
+  puts ""
+  puts "==================================="
+  puts "Generating RVA22"
+  puts "==================================="
+  puts ""
+  Rake::Task["#{$root}/gen/profile_doc/pdf/RVA22.pdf"].invoke
+
+  puts ""
+  puts "==================================="
+  puts "Generating RVI20"
+  puts "==================================="
+  puts ""
+  Rake::Task["#{$root}/gen/profile_doc/pdf/RVI20.pdf"].invoke
+
+  puts ""
+  puts "==================================="
+  puts "Generating MockProfileRelease"
+  puts "==================================="
+  puts ""
+  Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
 end
+
+# Shortcut targets for building profiles and certificates.
+task MC100: "#{$root}/gen/certificate_doc/pdf/MC100.pdf"
+task MockCertificateModel: "#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"
+task RVI20: "#{$root}/gen/profile_doc/pdf/RVI20.pdf"
+task RVA20: "#{$root}/gen/profile_doc/pdf/RVA20.pdf"
+task RVA22: "#{$root}/gen/profile_doc/pdf/RVA22.pdf"
+task MockProfileRelease: "#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"

arch/csr/menvcfg.yaml

@@ -6,7 +6,8 @@ name: menvcfg
 address: 0x30A
 long_name: Machine Environment Configuration
 description: |
-  Contains bits to enable/disable extensions
+  Contains fields that control certain characteristics of the execution environment
+  for modes less privileged than M-mode.
 
   The `menvcfg` CSR controls
   certain characteristics of the execution environment for modes less

arch/csr/senvcfg.yaml

@@ -5,14 +5,15 @@ kind: csr
 name: senvcfg
 address: 0x10A
 long_name: Supervisor Environment Configuration
-description: Contains bits to enable/disable extensions
+description: |
+  Contains fields that control certain characteristics of the U-mode execution environment.
 priv_mode: S
 length: 64
 definedBy:
   allOf:
-    - name: Sm
-      version: ">=1.12"
     - name: S
+      version: ">=1.12"
+    - name: U
 fields:
   CBZE:
     location: 7

arch/ext/S.yaml

@@ -6,12 +6,18 @@ name: S
 type: privileged
 long_name: Supervisor mode
 versions:
-  - version: "1.12.0"
-    state: ratified
-    ratification_date: 2021-12
-    requires:
-      name: U
-      version: "= 1.12.0"
+- version: "1.11.0"
+  state: ratified
+  ratification_date: 2019-06
+  requires:
+    name: U
+    version: "= 1.0.0"
+- version: "1.12.0"
+  state: ratified
+  ratification_date: 2021-12
+  requires:
+    name: U
+    version: "= 1.0.0"
 description: |
   This chapter describes the RISC-V supervisor-level architecture, which
   contains a common core that is used with various supervisor-level

arch/ext/Sm.yaml

@@ -460,6 +460,7 @@ params:
     schema:
       type: string
       enum: [little, big, dynamic]
+      # TODO: Only little available in Sm 1.11
   MISA_CSR_IMPLEMENTED:
     description: |
       Whether or not the `misa` CSR returns zero or a non-zero value.

arch/ext/Sstc.yaml

@@ -3,8 +3,8 @@
 $schema: "ext_schema.json#"
 kind: extension
 name: Sstc
-long_name: Superivisor mode timer interrupts
-description: Superivisor mode timer interrupts
+long_name: Supervisor-mode timer interrupts
+description: Supervisor-mode timer interrupts
 type: privileged
 versions:
   - version: "0.9.0"

arch/ext/Sv32.yaml

@@ -9,5 +9,5 @@ type: privileged
 versions:
   - version: "1.12.0"
     state: ratified
-    ratification_date: unknown
+    ratification_date: null
     url: https://github.com/riscv/riscv-isa-manual/releases/download/Priv-v1.12/riscv-privileged-20211203.pdf

arch/ext/Sv39.yaml

@@ -9,5 +9,5 @@ type: privileged
 versions:
   - version: "1.12.0"
     state: ratified
-    ratification_date: unknown
+    ratification_date: null
     url: https://github.com/riscv/riscv-isa-manual/releases/download/Priv-v1.12/riscv-privileged-20211203.pdf

arch/ext/Sv48.yaml

@@ -9,7 +9,7 @@ type: privileged
 versions:
   - version: "1.12.0"
     state: ratified
-    ratification_date: unknown
+    ratification_date: null
     url: https://github.com/riscv/riscv-isa-manual/releases/download/Priv-v1.12/riscv-privileged-20211203.pdf
     requires:
       name: Sv39

arch/ext/Sv57.yaml

@@ -9,7 +9,7 @@ type: privileged
 versions:
   - version: "1.12.0"
     state: ratified
-    ratification_date: unknown
+    ratification_date: null
     url: https://github.com/riscv/riscv-isa-manual/releases/download/Priv-v1.12/riscv-privileged-20211203.pdf
     requires:
       name: Sv48