Merge branch 'main' into crd_arch_def

Author: dhower-qc

arch/ext/Sm.yaml

@@ -277,6 +277,7 @@ Sm:
         to process the load/store, which determines how/which exceptions will be reported
 
         Options:
+
          * by_byte: The load/store appears to be broken into byte-sized accesses that processed sequentially from smallest address to largest address
          * custom: Something else. Will result in a call to unpredictable() in the execution
       schema: 
@@ -291,9 +292,18 @@ Sm:
         type: boolean
     TRAP_ON_UNIMPLEMENTED_INSTRUCTION:
       description: |
-        When true, fetching an unimplemented instruction will cause an `IllegalInstruction` exception.
+        When true, fetching an unimplemented instruction from the custom encoding space will cause
+        an `IllegalInstruction` exception.
+
+        When false, fetching an unimplemented instruction is `UNPREDICTABLE`.
+      schema:
+        type: boolean
+    TRAP_ON_RESERVED_INSTRUCTION:
+      description: |
+        When true, fetching an unimplemented and/or undefined instruction from the standard/reserved
+        encoding space will cause an `IllegalInstruction` exception.
 
-        When false, fetching an unimplemented instruction is `unpredictable`.
+        When false, fetching such an instruction is `UNPREDICTABLE`.
       schema:
         type: boolean
     TRAP_ON_UNIMPLEMENTED_CSR:

backends/arch_gen/tasks.rake

@@ -125,19 +125,29 @@ file "#{$root}/.stamps/arch-gen.stamp" => (
   FileUtils.touch(t.name)
 end
 
+obj_model_files = Dir.glob($root / "lib" / "arch_obj_models" / "*.rb")
+obj_model_files << ($root / "lib" / "arch_def.rb")
+
+arch_files = Dir.glob($root / "arch" / "**" / "*.yaml")
+
 # stamp to indicate completion of Arch Gen for a given config
 rule %r{#{$root}/\.stamps/arch-gen-.*\.stamp} => proc { |tname|
   config_name = Pathname.new(tname).basename(".stamp").sub("arch-gen-", "")
-  arch_files = Dir.glob($root / "arch" / "**" / "*.yaml")
   config_files =
     Dir.glob($root / "cfgs" / config_name / "arch_overlay" / "**" / "*.yaml") +
     [($root / "cfgs" / config_name / "params.yaml").to_s]
   [
     "#{$root}/.stamps",
     "#{ARCH_GEN_DIR}/lib/arch_gen.rb",
     "#{$root}/lib/idl/ast.rb",
-    "#{ARCH_GEN_DIR}/tasks.rake"
-  ] + arch_files + config_files
+    "#{ARCH_GEN_DIR}/tasks.rake",
+    arch_files,
+    config_files,
+    
+    # the stamp file is not actually dependent on the Ruby object model,
+    # but in general we want to rebuild anything using this stamp when the object model changes
+    obj_model_files.map(&:to_s)
+  ].flatten
 } do |t|
   config_name = Pathname.new(t.name).basename(".stamp").sub("arch-gen-", "")
 

cfgs/generic_rv64/params.yaml

@@ -234,6 +234,7 @@ params:
   # when false, writing an illegal value to a WLRL CSR field is ignored
   TRAP_ON_ILLEGAL_WLRL: true
   TRAP_ON_UNIMPLEMENTED_INSTRUCTION: true
+  TRAP_ON_RESERVED_INSTRUCTION: true
   TRAP_ON_UNIMPLEMENTED_CSR: true
 
   # Whether or not a real hardware `time` CSR exists. Implementations can either provide a real

lib/idl/ast.rb

@@ -5682,6 +5682,7 @@ def freeze_tree(symtab)
         @value = nil
       end
       @type = calc_type(symtab)
+      @archdef = symtab.archdef # remember archdef, used in gen_adoc pass
       freeze
     end
 
@@ -5813,6 +5814,12 @@ def initialize(input, interval, idx)
       @idx = idx
     end
 
+    def freeze_tree(symtab)
+      @archdef = symtab.archdef # remember archdef, used by gen_adoc pass
+      @idx.freeze_tree(symtab)
+      freeze
+    end
+
     # @!macro type
     def type(symtab)
       archdef = symtab.archdef

lib/idl/passes/gen_adoc.rb

@@ -295,7 +295,11 @@ def gen_adoc(indent = 0, indent_spaces: 2)
       if idx_text =~ /[0-9]+/
         "#{' '*indent}#{csr_text}"
       else
-        "#{' '*indent}%%LINK%csr_field;#{idx_text}.#{@field_name};#{csr_text}%%"
+        if @archdef.csr(csr_text).nil? 
+        "#{' '*indent}#{csr_text}"
+        else
+          "#{' '*indent}%%LINK%csr_field;#{idx_text}.#{@field_name};#{csr_text}%%"
+        end
       end
     end
   end
@@ -314,7 +318,11 @@ def gen_adoc(indent = 0, indent_spaces: 2)
         # we don't have the symtab to map this to a csr name
         "#{' '*indent}#{csr_text}"
       else
-        "#{' '*indent}%%LINK%csr;#{idx_text};#{csr_text}%%"
+        if @archdef.csr(csr_text).nil?
+          "#{' '*indent}#{csr_text}"
+        else
+          "#{' '*indent}%%LINK%csr;#{idx_text};#{csr_text}%%"
+        end
       end
     end
   end