Fixed definedBy should be using defined_by due to partial constraint changes (fix for issue 89)

Author: james-ball-qualcomm

arch/crd/MC-1.yaml

@@ -60,6 +60,10 @@ MC-1:
         MTVAL_WIDTH: {} # Unconstrained
         MTVEC_MODES: {} # Unconstrained
         PHYS_ADDR_WIDTH: {} # Unconstrained
+        CONFIG_PTR_ADDRESS:
+          schema:
+            const: 0xdeadbeef
+          note: "This parameter and its associated CSR shouldn't be here. See GitHub issue #53."
         PRECISE_SYNCHRONOUS_EXCEPTIONS:
           schema:
             const: true

arch/crd/MockCRD-1.yaml

@@ -118,7 +118,8 @@ MockCRD-1:
             const: 32
         CONFIG_PTR_ADDRESS:
           schema:
-            const: 0
+            const: 0xdeadbeef
+          note: "This parameter and its associated CSR shouldn't be here. See GitHub issue #53."
   - name: Zifencei
     presence: optional
     note: "Here's a note for Zifencei"

backends/crd_doc/templates/crd.adoc.erb

@@ -291,7 +291,8 @@ Requirement <%= req.name %> only apply when <%= req.when_pretty %>.
 --
 <%- end -%>
 
-<%- insts = crd.arch_def.instructions.select { |i| i.definedBy == ext_db.name || i.definedBy.include?(ext_db.name) } -%>
+// TODO: GitHub issue 92: Use version specified by each profile.
+<%- insts = crd.arch_def.instructions.select { |i| i.defined_by?(ext_db.name,ext_db.min_version) } -%>
 <%- unless insts.empty? -%>
 ==== Instructions
 

backends/profile_doc/templates/profile_pdf.adoc.erb

@@ -467,7 +467,8 @@ end.join(" | ") -%>
 
 :leveloffset: -3
 
-<%- insts = arch_def.instructions.select { |i| i.definedBy == ext.name || i.definedBy.include?(ext.name) } -%>
+// TODO: GitHub issue 92: Use version specified by each profile and add version info to inst table below.
+<%- insts = arch_def.instructions.select { |i| i.defined_by?(ext.name,ext.min_version) } -%>
 <%- unless insts.empty? -%>
 ==== Instructions
 

lib/arch_def.rb

@@ -313,7 +313,7 @@ def prohibited_extensions
         if e.is_a?(String)
           @prohibited_extensions << ExtensionRequirement.new(e, nil)
         else
-          @prohibited_extensions << ExtensionRequirement.new(e["name"], e["requirements"])
+          @prohibited_extensions << ExtensionRequirement.new(e["name"], e["requirements"], presence: "prohibited")
         end
       end
     end

lib/arch_obj_models/extension.rb

@@ -203,7 +203,7 @@ def conflicts
   def instructions
     return @instructions unless @instructions.nil?
 
-    @instructions = arch_def.instructions.select { |i| i.definedBy == name || (i.definedBy.is_a?(Array) && i.definedBy.include?(name)) }
+    @instructions = arch_def.instructions.select { |i| @data["versions"].any? { |version| i.defined_by?(name, version["version"]) }}
   end
 
   # @return [Array<Csr>] the list of CSRs implemented by this extension (may be empty)

lib/arch_obj_models/instruction.rb

@@ -9,7 +9,17 @@ def ==(other)
     if other.is_a?(Instruction)
       name == other.name
     else
-      raise ArgumentError, "Instruction is comparable to a #{other.class.name}"
+      raise ArgumentError, "Instruction is not comparable to a #{other.class.name}"
+    end
+  end
+
+  alias eql? ==
+
+  def <=>(other)
+    if other.is_a?(Instruction)
+      name <=> other.name
+    else
+      raise ArgumentError, "Instruction is not comparable to a #{other.class.name}"
     end
   end
 

lib/arch_obj_models/obj.rb

@@ -106,11 +106,13 @@ def defined_by?(*args)
       end
     elsif args.size == 2
       raise ArgumentError, "First parameter must be an extension name" unless args[0].respond_to?(:to_s)
-      raise ArgumentError, "Second parameter must be an extension version" unless args[0].respond_to?(:to_s)
+      version = args[1].is_a?(Gem::Version) ? args[1] : Gem::Version.new(args[1]) 
 
       defined_by.satisfied_by? do |r|
-        r.name == args[0] && r.version_requirement.satisfied_by?(args[1].to_s)
+        r.name == args[0] && r.version_requirement.satisfied_by?(version)
       end
+    else
+      raise ArgumentError, "Unsupported number of arguments of " + args.size
     end
   end
 

lib/arch_obj_models/profile.rb

@@ -14,15 +14,15 @@ def initialize(data, arch_def)
 
   def family = arch_def.profile_family(@data["family"])
 
-  # @return [Profile] Profile that this profile inherits from (the "hier")
+  # @return [Profile] Profile that this profile inherits from
   # @return [nil] if this profile has no parent
   def inherits_from = arch_def.profile(@data["inherits"])
 
   # @return ["M", "S", "U", "VS", "VU"] Privilege mode for the profile
   def mode
     if @data["mode"].nil?
-      raise "No mode specified and no inheritance for profile '#{name}'" if inherits_from.empty?
-      inherits_from.last.mode
+      raise "No mode specified and no inheritance for profile '#{name}'" if inherits_from.nil?
+      inherits_from.mode
     else
       @data["mode"]
     end
@@ -31,9 +31,9 @@ def mode
   # @return [32, 64] The base XLEN for the profile
   def base
     if @data["base"].nil?
-      raise "No base specified and no inheritance for profile '#{name}'" if inherits_from.empty?
+      raise "No base specified and no inheritance for profile '#{name}'" if inherits_from.nil?
 
-      inherits_from.last.base
+      inherits_from.base
     else
       @data["base"]
     end
@@ -98,9 +98,9 @@ def mandatory_extension_requirements
         @data["extensions"]&.any? { |opt| opt["name"] == ext_req.name }
       }
 
-      @data["extensions"]&.each do |ext_ver|
-        if ext_ver["presence"] == "mandatory"
-          @mandatory_ext_reqs << ExtensionRequirement.new(ext_ver["name"], ext_ver["version"], presence: "mandatory")
+      @data["extensions"]&.each do |ext_req|
+        if ext_req["presence"] == "mandatory"
+          @mandatory_ext_reqs << ExtensionRequirement.new(ext_req["name"], ext_req["version"], presence: "mandatory")
         end
       end
     end