HDLRuby 2.3.7 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb0dfd0d3f5fd062cd7e31f46eab82f0090e58eb8690a50a74106cfa32b5b9c2
-  data.tar.gz: 46f437035c02b4c8de14fb5033361b2d65cb6a7916887ca16a1dea67adadc8b9
+  metadata.gz: 164191b6cbfda40e60bc6b253c95a0ff511164007c83adf53c7f86383b404464
+  data.tar.gz: 5344dd9f624089cab1488d9e10b67e542cb83639db81e397c0d2241c67a43527
 SHA512:
-  metadata.gz: f6db11e75542e9b1f3e9064c32b3d8979ff3815ff661bfe8defc80f9625b671851a341366ad021a120305071e5f2099f95193e8a2332366460b967c6755a041f
-  data.tar.gz: 44a91392735fa86edc102ae6d20aa54dd85628e2efac5f4112731d2733bf7b555e4dce9bc39a086efbb5c3a1f1f0d2a4bb0e420be1f6251d26a505599bff526d
+  metadata.gz: 5e9b00b3fad458789078bcaca6d8d45e7ac5877ff14a3971ce2ddac186ed15a1ad2aa440d3c5619c66f324e9f6dbeda5c8bcf2aa5de3389aa12d631abbd780a4
+  data.tar.gz: '08dc450e1e3807d85f8ffb22888c037b081bed44dab318fac5fb33611f706c58191a2b06379b0798b61bbf3578d0e058b144ee8995e4212250826366bd306e9e'

data/lib/HDLRuby/hdr_samples/with_fixpoint.rb

@@ -9,6 +9,8 @@ system :fix_test do
 
     # Declare three 4-bit integer part 4-bit fractional part
     bit[3..0,3..0].inner :x,:y,:z
+    # Declare three 8-bit integer part 8-bit fractional part
+    signed[3..0,3..0].inner :a,:b,:c,:d
 
     # Performs calculation between then
     timed do
@@ -22,5 +24,12 @@ system :fix_test do
         !10.ns
         z <= z / x
         !10.ns
+        a <= _00010000
+        b <= _00001111
+        !10.ns
+        c <= a * b
+        d <= 0
+        !10.ns
+        d <= d + c 
     end
 end

data/lib/HDLRuby/hruby_low.rb

@@ -2633,6 +2633,11 @@ module HDLRuby::Low
         def parent_system
             return self.top_scope.parent
         end
+
+        # Tell if the statement includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # By default, nothing to do.
+        end
     end
 
 
@@ -2747,6 +2752,11 @@ module HDLRuby::Low
             # A ruby block?
             # Nothing to do.
         end
+
+        # Tell if the statement includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            return @left.use_name?(*names) || @right.use_name?(*names)
+        end
     end
 
 
@@ -2925,6 +2935,12 @@ module HDLRuby::Low
             @no.each_block_deep(&ruby_block) if @no
         end
 
+        # Tell if the statement includes a signal whose name is one of +names+.
+        # NOTE: for the if check only the condition.
+        def use_name?(*names)
+            return @condition.use_name?(*name)
+        end
+
         # Clones the If (deeply)
         def clone
             # Duplicate the if.
@@ -3038,6 +3054,12 @@ module HDLRuby::Low
         def top_block
             return self.parent.is_a?(Behavior) ? self : self.parent.top_block
         end
+
+        # Tell if the statement includes a signal whose name is one of +names+.
+        # NOTE: for the when check only the match.
+        def use_name?(*names)
+            return @match.use_name?(*name)
+        end
     end
 
 
@@ -3186,6 +3208,12 @@ module HDLRuby::Low
             @default.each_statement_deep(&ruby_block) if @default
         end
 
+        # Tell if the statement includes a signal whose name is one of +names+.
+        # NOTE: for the case check only the value.
+        def use_name?(*names)
+            return @value.use_name?(*name)
+        end
+
         # Clones the Case (deeply)
         def clone
             # Clone the default if any.
@@ -3838,6 +3866,12 @@ module HDLRuby::Low
             end
         end
 
+        # Tell if the expression includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # By default nothing.
+            return false
+        end
+
         # Clones the expression (deeply)
         def clone
             raise AnyError,
@@ -3991,6 +4025,12 @@ module HDLRuby::Low
             @child.each_ref_deep(&ruby_block)
         end
 
+        # Tell if the expression includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # Recurse on the child.
+            return @child.use_name?(*names)
+        end
+
         # Clones the value (deeply)
         def clone
             return Cast.new(@type,@child.clone)
@@ -4101,6 +4141,12 @@ module HDLRuby::Low
             @child.each_ref_deep(&ruby_block)
         end
 
+        # Tell if the expression includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # Recurse on the child.
+            return @child.use_name?(*names)
+        end
+
         # Clones the unary operator (deeply)
         def clone
             return Unary.new(@type,self.operator,@child.clone)
@@ -4187,6 +4233,12 @@ module HDLRuby::Low
             @right.each_ref_deep(&ruby_block)
         end
 
+        # Tell if the expression includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # Recurse on the left and the right.
+            return @left.use_name?(*names) || @right.use_name?(*names)
+        end
+
         # Clones the binary operator (deeply)
         def clone
             return Binary.new(@type, self.operator,
@@ -4311,6 +4363,14 @@ module HDLRuby::Low
             end
         end
 
+        # Tell if the expression includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # Recurse on the select.
+            return true if @select.use_name?(*names)
+            # Recurse on the choices.
+            return @choices.include? { |choice| choice.use_name?(*names) }
+        end
+
         # Clones the select (deeply)
         def clone
             return Select.new(@type, self.operator, @select.clone,
@@ -4390,6 +4450,12 @@ module HDLRuby::Low
             end
         end
 
+        # Tell if the expression includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # Recurse on the expressions.
+            return @expressions.include? { |expr| expr.use_name?(*names) }
+        end
+
         # Clones the concatenated expression (deeply)
         def clone
             return Concat.new(@type,
@@ -4532,6 +4598,12 @@ module HDLRuby::Low
             end
         end
 
+        # Tell if the expression includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # Recurse on the references.
+            return @refs.include? { |expr| expr.use_name?(*names) }
+        end
+
         # Clones the concatenated references (deeply)
         def clone
             return RefConcat.new(@type, @refs.map { |ref| ref.clone } )
@@ -4615,6 +4687,12 @@ module HDLRuby::Low
             @ref.each_node_deep(&ruby_block)
         end
 
+        # Tell if the expression includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # Recurse on the index and the reference.
+            return @index.use_name?(names) || @ref.use_name?(*names)
+        end
+
         # Clones the indexed references (deeply)
         def clone
             return RefIndex.new(@type, @ref.clone, @index.clone)
@@ -4710,6 +4788,13 @@ module HDLRuby::Low
             @ref.each_node_deep(&ruby_block)
         end
 
+        # Tell if the expression includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # Recurse on the range and the reference.
+            return @range.first.use_name?(names) ||
+                   @range.last.use_name?(names)  || @ref.use_name?(*names)
+        end
+
         # Clones the range references (deeply)
         def clone
             return RefRange.new(@type, @ref.clone,
@@ -4797,6 +4882,14 @@ module HDLRuby::Low
             @ref.each_node_deep(&ruby_block)
         end
 
+        # Tell if the expression includes a signal whose name is one of +names+.
+        def use_name?(*names)
+            # Is the named used here?
+            return true if names.include?(@name)
+            # No, recurse the reference.
+            return @ref.use_name?(*names)
+        end
+
         # Clones the name references (deeply)
         def clone
             return RefName.new(@type, @ref.clone, @name)

data/lib/HDLRuby/hruby_low_mutable.rb

@@ -156,7 +156,7 @@ module HDLRuby::Low
             end
         end
 
-        # Deletes an type.
+        # Deletes a type.
         def delete_type!(type)
             if @types.key?(type.name) then
                 # The type is present, delete it. 
@@ -167,7 +167,7 @@ module HDLRuby::Low
             type
         end
 
-        # Deletes an systemT.
+        # Deletes a systemT.
         def delete_systemT!(systemT)
             if @systemTs.key?(systemT.name) then
                 # The systemT is present, delete it. 
@@ -230,6 +230,33 @@ module HDLRuby::Low
                 behavior.parent = nil
             end
         end
+
+        # Deletes the elements related to one of +names+: either they have
+        # one of the names or they use an element with these names.
+        # NOTE: only delete actual instantiated elements, types or
+        # systemTs are left as is.
+        def delete_related!(*names)
+            # Delete the sub scopes whose name are in names.
+            @scopes.delete_if { |scope| names.include?(scope.name) }
+            # Delete the inner signals whose name are in names.
+            @inners.delete_if { |sig| names.include?(sig.name) }
+            # Delete the connections that contain signals whose name are
+            # in names.
+            @connections.delete_if { |connection| connection.use_name?(*names) }
+            # Delete the behaviors whose block name or events' name are in
+            # names.
+            @behaviors.delete_if do |behavior|
+                names.include?(behavior.block.name) or
+                behavior.each_event.include? do |event|
+                    event.ref.use_name?(*names)
+                end
+            end
+            
+            # Recurse on the sub scopes.
+            @scopes.each { |scope| scope.delete_related!(names) }
+            # Recurse on the behaviors.
+            @behaviors.each { |behavior| behavior.block.delete_related!(names) }
+        end
     end
 
     
@@ -514,6 +541,14 @@ module HDLRuby::Low
             # By default: nothing to do.
             return {}
         end
+
+        # Deletes the elements related to one of +names+: either they have
+        # one of the names or they use an element with these names.
+        # NOTE: only delete actual instantiated elements, types or
+        # systemTs are left as is.
+        def delete_related!(*names)
+            # Nothing to do by default.
+        end
     end
 
 
@@ -694,6 +729,21 @@ module HDLRuby::Low
 
             return res
         end
+
+        # Deletes the elements related to one of +names+: either they have
+        # one of the names or they use an element with these names.
+        # NOTE: only delete actual instantiated elements, types or
+        # systemTs are left as is.
+        def delete_related!(*names)
+            # Delete the noifs if their condition uses one of names.
+            @noifs.delete_if { |noif| noif[0].use_names?(names) }
+            # Recurse on the yes.
+            @yes.delete_related!(*names)
+            # Recurse on the no.
+            @no.delete_related!(*names)
+            # Recruse one the no ifs statements.
+            @noifs.each { |noif| noif[1].delete_related!(*names) }
+        end
     end
 
     ##
@@ -758,6 +808,15 @@ module HDLRuby::Low
 
             return res
         end
+
+        # Deletes the elements related to one of +names+: either they have
+        # one of the names or they use an element with these names.
+        # NOTE: only delete actual instantiated elements, types or
+        # systemTs are left as is.
+        def delete_related!(*names)
+            # Recurse on the statement.
+            @statement.delete_related!(*names)
+        end
     end
 
 
@@ -833,6 +892,18 @@ module HDLRuby::Low
 
             return res
         end
+
+        # Deletes the elements related to one of +names+: either they have
+        # one of the names or they use an element with these names.
+        # NOTE: only delete actual instantiated elements, types or
+        # systemTs are left as is.
+        def delete_related!(*names)
+            # Delete the whens whose match contains a signal whoses name is
+            # in names.
+            @whens.delete_if { |w| w.match.use_name?(*names) }
+            # Recurse on the whens.
+            @whens.each { |w| w.delete_related!(*names) }
+        end
     end
 
 
@@ -1091,8 +1162,25 @@ module HDLRuby::Low
                 end
             end
         end
+
+        # Deletes the elements related to one of +names+: either they have
+        # one of the names or they use an element with these names.
+        # NOTE: only delete actual instantiated elements, types or
+        # systemTs are left as is.
+        def delete_related!(*names)
+            # Delete the inner signals whose name are in names.
+            @inners.delete_if { |sig| names.include?(sig.name) }
+            # Recurse on the statements.
+            @statements.each do |statement|
+                statement.delete_related!(*names)
+            end
+            # Delete the statements that contain signals whose name are
+            # in names.
+            @statements.delete_if { |statement| statement.use_name?(*names) }
+        end
     end
 
+
     # Describes a timed block.
     #
     # NOTE: 

data/lib/HDLRuby/std/linear.rb

@@ -214,6 +214,14 @@ module HDLRuby::High::Std
         par(ev) do
             ack <= 0
             run <= 0
+            hif(~run) do
+                rvok <= 0
+                lefts.each_with_index do |left,i|
+                    lvoks[i] <= 0
+                    # accs[i].write(0)
+                    avs[i] <= 0
+                end
+            end
             hif(req | run) do
                 run <= 1
                 # Computation request.
@@ -232,14 +240,14 @@ module HDLRuby::High::Std
                     end
                 end
             end
-            helse do
-                rvok <= 0
-                lefts.each_with_index do |left,i|
-                    lvoks[i] <= 0
-                    # accs[i].write(0)
-                    avs[i] <= 0
-                end
-            end
+            # helse do
+            #     rvok <= 0
+            #     lefts.each_with_index do |left,i|
+            #         lvoks[i] <= 0
+            #         # accs[i].write(0)
+            #         avs[i] <= 0
+            #     end
+            # end
         end
     end
 

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.3.7"
+  VERSION = "2.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler