Merge branch 'big-beautiful-refactoring' of https://github.com/riscv-software-src/riscv-unified-db into big-beautiful-refactoring

Author: james-ball-qualcomm

.vscode/launch.json

@@ -19,6 +19,15 @@
       "args": [],
       "askParameters": false
     },
+    {
+      "type": "rdbg",
+      "name": "portfolios",
+      "request": "launch",
+      "command": "bundle exec rake",
+      "script": "portfolios",
+      "args": [],
+      "askParameters": false
+    },
     {
       "type": "rdbg",
       "name": "RVA20",

lib/arch_obj_models/csr_field.rb

@@ -25,6 +25,7 @@ def initialize(parent_csr, field_name, field_data)
     super(field_data, parent_csr.data_path, parent_csr.arch)
     @name = field_name
     @parent = parent_csr
+    @type_cache = {}
   end
 
   # @param possible_xlens [Array<Integer>] List of xlens that be used in any implemented mode
@@ -159,13 +160,7 @@ def pruned_type_ast(symtab)
   def type(symtab)
     raise ArgumentError, "Argument 1 should be a symtab" unless symtab.is_a?(Idl::SymbolTable)
 
-    unless @type_cache.nil?
-      unless @type_cache.key?(symtab.design)
-        raise "Different design for type #{@type_cache.keys},  #{symtab.design}"
-      end
-
-      return @type_cache[symtab.design]
-    end
+    return @type_cache[symtab.design] if @type_cache.key?(symtab.design)
 
     type =
       if @data.key?("type")
@@ -210,7 +205,6 @@ def type(symtab)
         # end
       end
 
-    @type_cache ||= {}
     @type_cache[symtab.design] = type
   end