HDLRuby 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce1d3b652bf8a3590f023acab0e74ec08d6062df5ccbc38fb1e1cbeb2cd41028
-  data.tar.gz: 52461928e01080214a4fb6ce0f1f852c6403d26bfd152579755e6b2990c396d2
+  metadata.gz: 7c97f2a40be4ad9b440b2a76fbb993c28c8a1ff3ca6d33b3fb6ea134361489ca
+  data.tar.gz: 5a7909585987b60e481ac58f14d631bf1bfe60c538233a1709751bd5cf23faa9
 SHA512:
-  metadata.gz: 193afd5d38ef5159a89630f9f44be2e43c95925f9d6f0d037616e26fb9dc5538fce721be53ebfc7c08ce303e6937f7eddf6bf6493cb741c485ec878c538c28a6
-  data.tar.gz: d666fca088c1c737f81cccbbc58982e194ee0cff2fcd801e2ac9f13d504de04f3be4f3dae66dd6408af1c9d079b3f9c7dad0334c08bd77ad20daaae513058f92
+  metadata.gz: '0958174494199a7c5b65e5ac5d6e2657969310615b4dd078ac31f52e144228d6450a9bcb437fa54d5c8403e34244a09fb8e4226ed3972b35df677f15748b3287'
+  data.tar.gz: 156e11a28ab129b92f27ce205fb5cde89109b70120233da58fb14753cc893af842729eb970713aa5131bb8935f157c37bc67b0ff6c1d3add7c4fd2a389a7f458

data/lib/HDLRuby/hruby_high.rb

@@ -2041,8 +2041,17 @@ module HDLRuby::High
         #
         # NOTE: the else part is defined through the helse method.
         def hif(condition)
+            # # Creates the if statement.
+            # return If.new(condition) { self }
+            # Remove self from the current block.
+            obj = self
+            High.cur_block.delete_statement!(obj)
             # Creates the if statement.
-            return If.new(condition) { self }
+            stmnt = If.new(condition) { add_statement(obj) }
+            # Add it to the current block.
+            High.cur_block.add_statement(stmnt)
+            # Returns the result.
+            return stmnt
         end
     end
 

data/lib/HDLRuby/hruby_low2vhd.rb

@@ -1108,7 +1108,7 @@ module HDLRuby::Low
                 return '"' + self.content.to_s.rjust(width,sign).upcase + '"'
             else
                 sign = self.type.signed? ? (self.content>=0 ? "0" : "1") : "0"
-                return '"' + self.content.to_s(2).rjust(width,sign).upcase + '"'
+                return '"' + self.content.abs.to_s(2).rjust(width,sign).upcase + '"'
             end
         end
     end

data/lib/HDLRuby/hruby_low_cleanup.rb

@@ -189,5 +189,16 @@ module HDLRuby::Low
         end
     end
 
+    ## Extends the TimeBlock class with functionality for breaking assingments
+    #  to concats.
+    class TimeBlock
+
+        # Removes the signals and corresponding assignments whose name is not
+        # in +keep+.
+        def delete_unless!(keep)
+            # Nothing to cleanup.
+        end
+    end
+
 
 end

data/lib/HDLRuby/std/channel.rb

@@ -86,13 +86,13 @@ module HDLRuby::High::Std
 
         # Creates a new channel reader running in +namespace+ and
         # reading using +reader_proc+ and reseting using +reseter_proc+.
-        def initialize(namespace,reader_proc,reseter_proc)
+        def initialize(namespace,reader_proc,reseter_proc = nil)
             unless namespace.is_a?(Namespace)
                 raise "Invalid class for a namespace: #{namespace.class}"
             end
             @namespace = namespace
             @reader_proc = reader_proc.to_proc
-            @rester_proc = reseter_proc.to_proc
+            @rester_proc = reseter_proc ? reseter_proc.to_proc : proc {}
         end
 
         ## Performs a read on the channel using +args+ and +ruby_block+
@@ -129,13 +129,13 @@ module HDLRuby::High::Std
 
         # Creates a new channel writer running in +namespace+ and
         # writing using +writer_proc+ and reseting using +reseter_proc+.
-        def initialize(namespace,writer_proc,reseter_proc)
+        def initialize(namespace,writer_proc,reseter_proc = nil)
             unless namespace.is_a?(Namespace)
                 raise "Invalid class for a namespace: #{namespace.class}"
             end
             @namespace = namespace
             @writer_proc = writer_proc.to_proc
-            @reseter_proc = reseter_proc.to_proc
+            @reseter_proc = reseter_proc ? reseter_proc.to_proc : proc {}
         end
 
         ## Performs a write on the channel using +args+ and +ruby_block+
@@ -174,14 +174,17 @@ module HDLRuby::High::Std
         # Creates a new channel accesser running in +namespace+
         # and reading using +reader_proc+, writing using +writer_proc+,
         # and reseting using +reseter_proc+.
-        def initialize(namespace,reader_proc,writer_proc,reseter_proc)
+        def initialize(namespace,reader_proc,writer_proc,reseter_proc = nil)
             unless namespace.is_a?(Namespace)
                 raise "Invalid class for a namespace: #{namespace.class}"
             end
             @namespace = namespace
-            @reader_proc  = reader_proc.to_proc
-            @writer_proc  = writer_proc.to_proc
-            @reseter_proc = reseter_proc.to_proc
+            unless reader_proc || writer_proc then
+                raise "An accesser must have at least a reading or a writing procedure."
+            end
+            @reader_proc  = reader_proc ? reader_proc.to_proc : proc { }
+            @writer_proc  = writer_proc ? writer_proc.to_proc : proc { }
+            @reseter_proc = reseter_proc ? reseter_proc.to_proc : proc {}
         end
 
         ## Performs a read on the channel using +args+ and +ruby_block+
@@ -276,10 +279,10 @@ module HDLRuby::High::Std
             # The accesser inout ports by name.
             @accesser_inouts = {}
 
-            # The default reset procedures (reseters), by default do nothing.
-            @input_reseter_proc  = proc {}
-            @output_reseter_proc = proc {}
-            @inout_reseter_proc  = proc {}
+            # # The default reset procedures (reseters), by default do nothing.
+            # @input_reseter_proc  = proc {}
+            # @output_reseter_proc = proc {}
+            # @inout_reseter_proc  = proc {}
 
             # The branch channels
             @branches = {}
@@ -748,17 +751,17 @@ module HDLRuby::High::Std
             end
 
             # Set ups the accesser's namespace
-            @accesser_inputs.each do |name,sig|
+            loc_inputs.each do |name,sig|
                 @accesser_namespace.add_method(sig.name) do
                     HDLRuby::High.top_user.send(name)
                 end
             end
-            @accesser_outputs.each do |name,sig|
+            loc_outputs.each do |name,sig|
                 @accesser_namespace.add_method(sig.name) do
                     HDLRuby::High.top_user.send(name)
                 end
             end
-            @accesser_inouts.each do |name,sig|
+            loc_inouts.each do |name,sig|
                 @accesser_namespace.add_method(sig.name) do
                     HDLRuby::High.top_user.send(name)
                 end

data/lib/HDLRuby/std/memory.rb

@@ -277,7 +277,7 @@ HDLRuby::High::Std.channel(:mem_dual) do |typ,size,clk,rst,br_rsts = {}|
                     hif(trig_r == 1) do
                         # The trigger was previously set, read ok.
                         target <= dbus_r
-                        blk.call
+                        blk.call if blk
                     end
                     # Prepare the read.
                     abus_r <= addr
@@ -311,7 +311,7 @@ HDLRuby::High::Std.channel(:mem_dual) do |typ,size,clk,rst,br_rsts = {}|
                     # No reset, so can perform the write.
                     hif(trig_w == 1) do
                         # The trigger was previously set, write ok.
-                        blk.call
+                        blk.call if blk
                     end
                     # Prepare the write.
                     abus_w <= addr
@@ -322,6 +322,84 @@ HDLRuby::High::Std.channel(:mem_dual) do |typ,size,clk,rst,br_rsts = {}|
         end
     end
 
+
+    # The increment branches.
+    # Read with increment
+    brancher(:rinc) do
+        reader_output :trig_r, :abus_r
+        reader_input :dbus_r
+        if br_rsts[:rinc] then
+            rst_name = br_rsts[:rinc].to_sym
+        else
+            rst_name = rst.name
+            reader_input rst_name
+        end
+
+        # Defines the read procedure at address +addr+
+        # using +target+ as target of access result.
+        reader do |blk,target|
+            # By default the read trigger is 0.
+            top_block.unshift { trig_r <= 0 }
+            # The read procedure.
+            rst  = send(rst_name)
+            par do
+                hif(rst == 0) do
+                    # No reset, so can perform the read.
+                    hif(trig_r == 1) do
+                        # The trigger was previously set, read ok.
+                        target <= dbus_r
+                        blk.call if blk
+                    end
+                    # Prepare the read.
+                    abus_r <= abus_r + 1
+                    trig_r <= 1
+                end
+                helse do
+                    # Initialize the address to -1
+                    abus_r <= -1
+                end
+            end
+        end
+    end
+
+    # Write with address
+    brancher(:winc) do
+        writer_output :trig_w, :abus_w, :dbus_w
+        if br_rsts[:winc] then
+            rst_name = br_rsts[:winc].to_sym
+        else
+            rst_name = rst.name
+            writer_input rst_name
+        end
+        # puts "br_rsts=#{br_rsts}"
+        # puts "rst_name=#{rst_name}"
+
+        # Defines the read procedure at address +addr+
+        # using +target+ as target of access result.
+        writer do |blk,target|
+            # By default the read trigger is 0.
+            top_block.unshift { trig_w <= 0 }
+            # The write procedure.
+            rst  = send(rst_name)
+            par do
+                hif(rst == 0) do
+                    # No reset, so can perform the write.
+                    hif(trig_w == 1) do
+                        # The trigger was previously set, write ok.
+                        blk.call if blk
+                    end
+                    # Prepare the write.
+                    abus_w <= abus_w + 1
+                    trig_w <= 1
+                    dbus_w <= target
+                end
+                helse do
+                    abus_w <= -1
+                end
+            end
+        end
+    end
+
 end
 
 

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

metadata

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