Complete conversion of ExtensionVersion

Author: Derek Hower

Rakefile

@@ -287,6 +287,9 @@ task :regress do
   ENV["VERSIONS"] = "all"
   Rake::Task["gen:html_manual"].invoke
   Rake::Task["gen:html"].invoke("generic_rv64")
+  ENV["EXT"] = "B"
+  ENV["VERSION"] = "latest"
+  Rake::Task["gen:ext_pdf"].invoke
   Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
   Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
   Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke

arch/ext/Zca.yaml

@@ -297,7 +297,7 @@ Requirement <%= req.name %> only apply when <%= req.when_pretty %>.
 
 *Version Requirement*: <%= ext_req.version_requirement %> +
 
-<% ext_db.versions.each do |v| -%>
+<% ext.versions.each do |v| -%>
 <%= v.version %>::
   State:::
     <%= v.state %>
@@ -341,7 +341,7 @@ Requirement <%= req.name %> only apply when <%= req.when_pretty %>.
 <% end -%>
 
 // TODO: GitHub issue 92: Use version specified by each profile.
-<% insts = arch_def.instructions.select { |i| i.defined_by?(ext_db.min_version) } -%>
+<% insts = arch_def.instructions.select { |i| i.defined_by?(ext.min_version) } -%>
 <% unless insts.empty? -%>
 ==== Instructions
 

backends/certificate_doc/templates/certificate.adoc.erb

@@ -92,7 +92,7 @@ require "ruby-prof"
     when "ext"
       puts "Generting full extension list"
       arch_def.implemented_extensions.each do |ext_version|
-        lines << " * `#{ext_version.name}` #{ext_version.ext(arch_def).long_name}"
+        lines << " * `#{ext_version.name}` #{ext_version.ext.long_name}"
       end
     when "inst"
       puts "Generting full instruction list"

backends/cfg_html_doc/adoc_gen.rake

@@ -588,9 +588,7 @@ def satisfying_versions(archdef)
     ext = archdef.extension(@name)
     return [] if ext.nil?
 
-    ext.versions.select { |v| @requirement.satisfied_by?(Gem::Version.new(v["version"])) }.map do |v|
-      ExtensionVersion.new(@name, v["version"], archdef)
-    end
+    ext.versions.select { |v| @requirement.satisfied_by?(v.version) }
   end
 
   # @overload

lib/arch_obj_models/extension.rb

@@ -97,7 +97,7 @@ def extensions
         next
       end
 
-      unless ext_obj.versions.any? { |v| v["version"] == ext[1] }
+      unless ext_obj.versions.any? { |v| v.version == ext[1] }
         warn "Extension '#{ext[0]}', version '#{ext[1]}' is not defined in the database"
         next
       end

lib/arch_obj_models/manual.rb

@@ -126,11 +126,12 @@ def in_scope_ext_reqs(desired_presence = nil)
       # Convert String or Hash to object.
       actual_presence_obj = ExtensionPresence.new(actual_presence)
 
-      match = if desired_presence.nil?
-        true  # Always match
-      else
-        (actual_presence_obj == desired_presence_converted)
-      end
+      match =
+        if desired_presence.nil?
+          true # Always match
+        else
+          actual_presence_obj == desired_presence_converted
+        end
 
       if match
         in_scope_ext_reqs << 
@@ -280,10 +281,10 @@ def all_in_scope_ext_params
         param = ext.params.find { |p| p.name == param_name }
         raise "There is no param '#{param_name}' in extension '#{ext_name}" if param.nil?
 
-        next unless ext.versions.any? do |ver_hash|
-          Gem::Requirement.new(ext_data["version"]).satisfied_by?(Gem::Version.new(ver_hash["version"])) &&
-            param.defined_in_extension_version?(ver_hash["version"])
-        end
+        next unless ext.versions.any? do |ext_ver|
+                      Gem::Requirement.new(ext_data["version"]).satisfied_by?(ext_ver.version) &&
+                      param.defined_in_extension_version?(ext_ver.version)
+                    end
 
         @all_in_scope_ext_params << 
           InScopeExtensionParameter.new(param, param_data["schema"], param_data["note"])
@@ -314,10 +315,10 @@ def in_scope_ext_params(ext_req)
         ext_param = ext.params.find { |p| p.name == param_name }
         raise "There is no param '#{param_name}' in extension '#{ext_req.name}" if ext_param.nil?
 
-        next unless ext.versions.any? do |ver_hash|
-          Gem::Requirement.new(ext_data["version"]).satisfied_by?(Gem::Version.new(ver_hash["version"])) &&
-            ext_param.defined_in_extension_version?(ver_hash["version"])
-        end
+        next unless ext.versions.any? do |ext_ver|
+                      Gem::Requirement.new(ext_data["version"]).satisfied_by?(ext_ver.version) &&
+                      ext_param.defined_in_extension_version?(ext_ver.version)
+                    end
 
         ext_params <<
           InScopeExtensionParameter.new(ext_param, param_data["schema"], param_data["note"])
@@ -336,10 +337,10 @@ def all_out_of_scope_params
       ext.params.each do |param|
         next if all_in_scope_ext_params.any? { |c| c.param.name == param.name }
 
-        next unless ext.versions.any? do |ver_hash|
-          Gem::Requirement.new(ext_req.version_requirement).satisfied_by?(Gem::Version.new(ver_hash["version"])) &&
-            param.defined_in_extension_version?(ver_hash["version"])
-        end
+        next unless ext.versions.any? do |ext_ver|
+                      Gem::Requirement.new(ext_req.version_requirement).satisfied_by?(ext_ver.version) &&
+                      param.defined_in_extension_version?(ext_ver.version)
+                    end
 
         @all_out_of_scope_params << param
       end