origen_verilog 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d30d23d7168c2c6a0ad632aad14aff518b47ceb1437758e19b9a9917ece3808
-  data.tar.gz: 1a284e6cd41b0426137c0094565d1489d02d54d1febd9e0916cd6c36d95cacf7
+  metadata.gz: a9fdce456928015804fdbe1484435502d8b800e2ecd5c7ddf78754046920edda
+  data.tar.gz: 5b979ee15cd8043d882ef4ad70c083c6fca4b309bb2e57e2982ea657d95405a6
 SHA512:
-  metadata.gz: b36b4930d1eff4a8e297ee56a57e4ee3c160b1b61d847e46bcf12d9fc9d3ec431898d48b2d9ccff49bb1d28d8d5027532d1fdc9f53f1b8aa459dc17e07f4e3e3
-  data.tar.gz: 408d8389b755b0b695afd726fb5e29339ff067efc214703f8aa26484cc9d50adc31e8f74e726dafbe1d1be98caacd29566ab842a68587afb770a66c7da008537
+  metadata.gz: daaed8357b6a78f47b58aac1291e554674b3d670657eb98d16bbc9241e797e422baaf5f8e5dc5a5766b1c5d7c2c0da6aa7190bc5f293e9f124bb392e9fa9e58d
+  data.tar.gz: 3cea195cee036fd928857134ffe12b8c8771f2267a59b2b643ace3f65eca3f5cca819ace960b76b117e30c0f102d8c07e3236c2aefd7573610a37fd43cec784d

data/config/version.rb

@@ -1,7 +1,7 @@
 module OrigenVerilog
   MAJOR = 0
   MINOR = 6
-  BUGFIX = 2
+  BUGFIX = 3
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen_verilog/top_level.rb

@@ -3,16 +3,46 @@ module OrigenVerilog
     include Origen::TopLevel
 
     attr_reader :name
+    attr_reader :options
 
     def initialize(options = {})
       @name = options[:ast].to_a[0]
+      @options = options
 
-      options[:ast].pins(digital: true).each { |n| _add_pin_(n, :digital) }
-      options[:ast].pins(analog: true).each { |n| _add_pin_(n, :analog) }
+      pins = options[:ast].pins(digital: true).map { |p| [p, :digital] }.to_h
+      pins.merge!(options[:ast].pins(analog: true).map { |p| [p, :analog] }.to_h)
+
+      # Override any pin types from the user
+      if options[:forced_pin_types]
+        pins = pins.map do |pin, type|
+          matched = options[:forced_pin_types].any? do |matcher, forced_type|
+            if matcher.is_a?(Regexp) && pin.value =~ matcher
+              type = forced_type
+              true
+            elsif pin.value == matcher
+              type = forced_type
+              true
+            end
+          end
+          matched ? [pin, type] : [pin, type]
+        end.to_h
+      end
+      pins.each { |n, type| _add_pin_(n, type) }
     end
 
     private
 
+    def pin_role?(role, pin)
+      (options[role] || []).each do |matcher|
+        if matcher.is_a?(Regexp)
+          return true if pin.to_s =~ matcher
+        else
+          return true if pin.to_s == matcher
+        end
+      end
+      false
+    end
+
     def _add_pin_(node, type)
       node = node.evaluate  # Resolve any functions in the ranges
       if node.type == :input_declaration
@@ -31,7 +61,18 @@ module OrigenVerilog
       end
       n = node.to_a.dup
       while n.last.is_a?(String)
-        add_pin n.pop.to_sym, direction: direction, size: size, offset: offset, type: type
+        pin = n.pop
+        if pin_role?(:ground_pins, pin)
+          add_ground_pin pin.to_sym, direction: direction, size: size, offset: offset, type: type
+        elsif pin_role?(:power_pins, pin)
+          add_power_pin pin.to_sym, direction: direction, size: size, offset: offset, type: type
+        elsif pin_role?(:virtual_pins, pin)
+          add_virtual_pin pin.to_sym, direction: direction, size: size, offset: offset, type: type
+        elsif pin_role?(:other_pins, pin)
+          add_other_pin pin.to_sym, direction: direction, size: size, offset: offset, type: type
+        else
+          add_pin pin.to_sym, direction: direction, size: size, offset: offset, type: type
+        end
       end
     end
   end

data/lib/origen_verilog/verilog/node.rb

@@ -94,11 +94,12 @@ module OrigenVerilog
       #
       # This will re-load the Origen target with the resultant model instantiated
       # as the global dut object.
-      def to_top_level
+      def to_top_level(options = {})
         unless type == :module_declaration
           fail 'Currently only modules support the to_model method'
         end
-        Origen.target.temporary = -> { TopLevel.new(ast: self) }
+        options[:ast] = self
+        Origen.target.temporary = -> { TopLevel.new(options) }
         Origen.load_target
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_verilog
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen