iss build clean

Author: Derek Hower

Rakefile

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+$jobs = ENV["JOBS"].nil? ? 1 : ENV["JOBS"].to_i
+Rake.application.options.thread_pool_size = $jobs
+puts "Running with #{Rake.application.options.thread_pool_size} job(s)"
+
 require "etc"
 
 $root = Pathname.new(__FILE__).dirname.realpath
@@ -20,17 +24,21 @@ end
 directory "#{$root}/.stamps"
 
 def cfg_arch_for(config_name)
-  Rake::Task["#{$root}/.stamps/resolve-#{config_name}.stamp"].invoke
+  $cfg_arch_for_mutex ||= Thread::Mutex.new
+
+  $cfg_arch_for_mutex.synchronize do
+    Rake::Task["#{$root}/.stamps/resolve-#{config_name}.stamp"].invoke
 
-  @cfg_archs ||= {}
-  return @cfg_archs[config_name] if @cfg_archs.key?(config_name)
+    $cfg_archs ||= {}
+    return $cfg_archs[config_name] if $cfg_archs.key?(config_name)
 
-  @cfg_archs[config_name] =
-    ConfiguredArchitecture.new(
-      config_name,
-      $root / "gen" / "resolved_arch" / config_name,
-      overlay_path: $root / "cfgs" / config_name / "arch_overlay"
-    )
+    $cfg_archs[config_name] =
+      ConfiguredArchitecture.new(
+        config_name,
+        $root / "gen" / "resolved_arch" / config_name,
+        overlay_path: $root / "cfgs" / config_name / "arch_overlay"
+      )
+  end
 end
 
 namespace :gen do

arch/csr/misa.yaml

@@ -118,7 +118,8 @@ fields:
     type(): |
       return (implemented?(ExtensionName::H) && MUTABLE_MISA_H) ? CsrFieldType::RW : CsrFieldType::RO;
     definedBy: H
-    reset_value: 1
+    reset_value(): |
+      return implemented?(ExtensionName::H) ? 1 : 0;
   I:
     location: 8
     description: |

arch/inst/C/c.fld.yaml

@@ -10,9 +10,11 @@ description: |
   to the base address in register rs1.
   It expands to `fld` `rd, offset(rs1)`.
 definedBy:
-  allOf:
-    - C
-    - D
+  anyOf:
+    - allOf:
+        - C
+        - D
+    - Zcd
 base: 32
 assembly: xd, imm(xs1)
 encoding:

arch/inst/C/c.fldsp.yaml

@@ -10,9 +10,11 @@ description: |
   to the stack pointer, x2.
   It expands to `fld` `rd, offset(x2)`.
 definedBy:
-  allOf:
-    - C
-    - D
+  anyOf:
+    - allOf:
+        - C
+        - D
+    - Zcd
 assembly: fd, imm(sp)
 encoding:
   match: 001-----------10

arch/inst/C/c.fsd.yaml

@@ -10,9 +10,11 @@ description: |
   to the base address in register rs1.
   It expands to `fsd` `rs2, offset(rs1)`.
 definedBy:
-  allOf:
-    - C
-    - D
+  anyOf:
+    - allOf:
+        - C
+        - D
+    - Zcd
 assembly: xs2, imm(xs1)
 encoding:
   match: 101-----------00

arch/inst/C/c.fsdsp.yaml

@@ -10,9 +10,11 @@ description: |
   to the stack pointer, x2.
   It expands to `fsd` `rs2, offset(x2)`.
 definedBy:
-  allOf:
-    - C
-    - D
+  anyOf:
+    - allOf:
+        - C
+        - D
+    - Zcd
 assembly: fs2, imm(sp)
 encoding:
   match: 101-----------10

arch/inst/C/c.slli.yaml

@@ -13,13 +13,22 @@ definedBy:
     - Zca
 assembly: xd, shamt
 encoding:
-  match: 000-----------10
-  variables:
-    - name: shamt
-      location: 12|6-2
-    - name: rd
-      location: 11-7
-      not: 0
+  RV32:
+    match: 0000----------10
+    variables:
+      - name: shamt
+        location: 6-2
+      - name: rd
+        location: 11-7
+        not: 0
+  RV64:
+    match: 000-----------10
+    variables:
+      - name: shamt
+        location: 12|6-2
+      - name: rd
+        location: 11-7
+        not: 0
 access:
   s: always
   u: always

arch/inst/C/c.srai.yaml

@@ -14,12 +14,20 @@ definedBy:
     - Zca
 assembly: xd, shamt
 encoding:
-  match: 100-01--------01
-  variables:
-    - name: shamt
-      location: 12|6-2
-    - name: rd
-      location: 9-7
+  RV32:
+    match: 100001--------01
+    variables:
+      - name: shamt
+        location: 6-2
+      - name: rd
+        location: 9-7
+  RV64:
+    match: 100-01--------01
+    variables:
+      - name: shamt
+        location: 12|6-2
+      - name: rd
+        location: 9-7
 access:
   s: always
   u: always

arch/inst/C/c.srli.yaml

@@ -14,12 +14,20 @@ definedBy:
     - Zca
 assembly: xd, shamt
 encoding:
-  match: 100-00--------01
-  variables:
-    - name: shamt
-      location: 12|6-2
-    - name: rd
-      location: 9-7
+  RV32:
+    match: 100000--------01
+    variables:
+      - name: shamt
+        location: 6-2
+      - name: rd
+        location: 9-7
+  RV64:
+    match: 100-00--------01
+    variables:
+      - name: shamt
+        location: 12|6-2
+      - name: rd
+        location: 9-7
 access:
   s: always
   u: always

arch/isa/globals.isa

@@ -1151,8 +1151,10 @@ function access_check {
     }
 
     # check PMP
-    if (!pmp_check<access_size>(paddr[PHYS_ADDR_WIDTH-1:0], type)) {
-      raise(fault_type, from_mode, vaddr);
+    if (implemented?(ExtensionName::Smpmp)) {
+      if (!pmp_check<access_size>(paddr[PHYS_ADDR_WIDTH-1:0], type)) {
+        raise(fault_type, from_mode, vaddr);
+      }
     }
   }
 }