HDLRuby 2.9.0 → 2.10.5

data/lib/HDLRuby/hruby_low.rb

@@ -184,20 +184,28 @@ module HDLRuby::Low
 
         # Adds input +signal+.
         def add_input(signal)
-            # print "add_input with signal: #{signal.name}\n"
+            # print "In #{self} add_input with signal: #{signal.name}\n"
             # Check and add the signal.
             unless signal.is_a?(SignalI)
                 raise AnyError,
                       "Invalid class for a signal instance: #{signal.class}"
             end
+            # if @inputs.include?(signal) then
+            #     raise AnyError, "SignalI #{signal.name} already present."
+            # end
             if @inputs.include?(signal) then
-                raise AnyError, "SignalI #{signal.name} already present."
+                signal.parent = self
+                # Replace the signal.
+                old_signal = @inputs[signal.name]
+                @inputs.add(signal)
+                @interface[@interface.index(old_signal)] = signal
+            else
+                # Set the parent of the signal.
+                signal.parent = self
+                # And add the signal.
+                @inputs.add(signal)
+                @interface << signal
             end
-            # Set the parent of the signal.
-            signal.parent = self
-            # And add the signal.
-            @inputs.add(signal)
-            @interface << signal
             return signal
         end
 
@@ -208,14 +216,22 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a signal instance: #{signal.class}"
             end
+            # if @outputs.include?(signal) then
+            #     raise AnyError, "SignalI #{signal.name} already present."
+            # end
             if @outputs.include?(signal) then
-                raise AnyError, "SignalI #{signal.name} already present."
+                signal.parent = self
+                # Replace the signal.
+                old_signal = @outputs[signal.name]
+                @outputs.add(signal)
+                @interface[@interface.index(old_signal)] = signal
+            else
+                # Set the parent of the signal.
+                signal.parent = self
+                # And add the signal.
+                @outputs.add(signal)
+                @interface << signal
             end
-            # Set the parent of the signal.
-            signal.parent = self
-            # And add the signal.
-            @outputs.add(signal)
-            @interface << signal
             return signal
         end
 
@@ -226,14 +242,22 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a signal instance: #{signal.class}"
             end
+            # if @inouts.include?(signal) then
+            #     raise AnyError, "SignalI #{signal.name} already present."
+            # end
             if @inouts.include?(signal) then
-                raise AnyError, "SignalI #{signal.name} already present."
+                signal.parent = self
+                # Replace the signal.
+                old_signal = @inouts[signal.name]
+                @inouts.add(signal)
+                @interface[@interface.index(old_signal)] = signal
+            else
+                # Set the parent of the signal.
+                signal.parent = self
+                # And add the signal.
+                @inouts.add(signal)
+                @interface << signal
             end
-            # Set the parent of the signal.
-            signal.parent = self
-            # And add the signal.
-            @inouts.add(signal)
-            @interface << signal
             return signal
         end
 
@@ -289,6 +313,8 @@ module HDLRuby::Low
             @inputs.each(&ruby_block)
             @outputs.each(&ruby_block)
             @inouts.each(&ruby_block)
+            # And each signal of the direct scope.
+            @scope.each_signal(&ruby_block)
         end
 
         # Iterates over all the signals of the system type and its scope.
@@ -297,7 +323,8 @@ module HDLRuby::Low
             return to_enum(:each_signal_deep) unless ruby_block
             # A ruby block?
             # First iterate over the current system type's signals.
-            self.each_signal_all(&ruby_block)
+            # self.each_signal_all(&ruby_block)
+            self.each_signal(&ruby_block)
             # Then apply on the behaviors (since in HDLRuby:High, blocks can
             # include signals).
             @scope.each_signal_deep(&ruby_block)
@@ -568,9 +595,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a system type: #{systemT.class}"
             end
-            if @systemTs.include?(systemT) then
-                raise AnyError, "SystemT #{systemT.name} already present."
-            end
+            # if @systemTs.include?(systemT) then
+            #     raise AnyError, "SystemT #{systemT.name} already present."
+            # end
             # Set the parent of the instance
             systemT.parent = self
             # puts "systemT = #{systemT}, parent=#{self}"
@@ -620,9 +647,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a type: #{type.class}"
             end
-            if @types.include?(type) then
-                raise AnyError, "Type #{type.name} already present."
-            end
+            # if @types.include?(type) then
+            #     raise AnyError, "Type #{type.name} already present."
+            # end
             # Set the parent of the instance
             type.parent = self
             # puts "type = #{type}, parent=#{self}"
@@ -673,12 +700,14 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a system instance: #{scope.class}"
             end
-            if @scopes.include?(scope) then
-                raise AnyError, "Scope #{scope} already present."
-            end
+            # if @scopes.include?(scope) then
+            #     raise AnyError, "Scope #{scope} already present."
+            # end
             # Set the parent of the scope
             scope.parent = self
-            # Add the instance
+            # Remove a former scope with same name if present (override)
+            @scopes.delete_if { |sc| sc.name && sc.name == scope.name }
+            # Add the scope
             @scopes << scope
         end
 
@@ -729,9 +758,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a system instance: #{systemI.class}"
             end
-            if @systemIs.include?(systemI) then
-                raise AnyError, "SystemI #{systemI.name} already present."
-            end
+            # if @systemIs.include?(systemI) then
+            #     raise AnyError, "SystemI #{systemI.name} already present."
+            # end
             # Set the parent of the instance
             systemI.parent = self
             # puts "systemI = #{systemI}, parent=#{self}"
@@ -780,9 +809,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a non-hDLRuby code chunk: #{code.class}"
             end
-            if @codes.include?(code) then
-                raise AnyError, "Code #{code.name} already present."
-            end
+            # if @codes.include?(code) then
+            #     raise AnyError, "Code #{code.name} already present."
+            # end
             # Set the parent of the code chunk.
             code.parent = self
             # puts "code = #{code}, parent=#{self}"
@@ -821,11 +850,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a signal instance: #{signal.class}"
             end
-            # if @inners.has_key?(signal.name) then
-            if @inners.include?(signal) then
-                raise AnyError, "SignalI #{signal.name} already present."
-            end
-            # @inners[signal.name] = signal
+            # if @inners.include?(signal) then
+            #     raise AnyError, "SignalI #{signal.name} already present."
+            # end
             # Set the parent of the signal.
             signal.parent = self
             # And add the signal.
@@ -2758,10 +2785,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a code chunk: #{chunk.class}"
             end
-            # if @chunks.has_key?(chunk.name) then
-            if @chunks.include?(chunk) then
-                raise AnyError, "Code chunk #{chunk.name} already present."
-            end
+            # if @chunks.include?(chunk) then
+            #     raise AnyError, "Code chunk #{chunk.name} already present."
+            # end
             # Set its parent.
             chunk.parent = self
             # And add it
@@ -4266,11 +4292,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a signal instance: #{signal.class}"
             end
-            # if @inners.has_key?(signal.name) then
-            if @inners.include?(signal) then
-                raise AnyError, "SignalI #{signal.name} already present."
-            end
-            # @inners[signal.name] = signal
+            # if @inners.include?(signal) then
+            #     raise AnyError, "SignalI #{signal.name} already present."
+            # end
             # Set its parent.
             signal.parent = self
             # And add it

data/lib/HDLRuby/hruby_low2c.rb

@@ -2082,11 +2082,11 @@ module HDLRuby::Low
             if str =~ /^[01]+$/ && str.length <= 64 then
                 # Yes, generate a numeral value.
                 res << " " * (level+1)*3
-                # res << "static unsigned long long data[] = { "
                 res << "static unsigned int data[] = { "
                 res << str.scan(/.{1,#{Low2C.int_width}}/m).reverse.map do |sub|
                     sub.to_i(2).to_s # + "ULL"
                 end.join(",")
+                res << ", 0" if (str.length <= 32)
                 res << " };\n"
                 # Create the value.
                 res << " " * (level+1)*3

data/lib/HDLRuby/hruby_low_mutable.rb

@@ -222,7 +222,7 @@ module HDLRuby::Low
         end
 
         # Deletes all the connections.
-        def delete_all_conncetions!
+        def delete_all_connections!
             @connections.each { |cnx| cnx.parent = nil }
             @connections = []
         end

data/lib/HDLRuby/hruby_low_without_connection.rb

@@ -92,6 +92,7 @@ module HDLRuby::Low
                             inputs_blk.add_statement(
                                 Transmit.new(right.clone,left.clone))
                         elsif (left_is_o) then
+                            # puts "left=#{left} right=#{right}"
                             outputs_blk.add_statement(
                                 Transmit.new(right.clone,left.clone))
                         elsif (right_is_o) then

data/lib/HDLRuby/hruby_low_without_namespace.rb

@@ -147,7 +147,8 @@ module HDLRuby::Low
             cnxs = self.each_connection.to_a
             # Remove them from the scope.
             # cnxs.each { |cnx| self.delete_connection!(cnx) }
-            cnxs.delete_all_connections!
+            # cnxs.delete_all_connections!
+            self.delete_all_connections!
             # Return the connections.
             return cnxs
         end

data/lib/HDLRuby/sim/hruby_sim_calc.c

@@ -1871,10 +1871,11 @@ static Value equal_value_numeric(Value src0, Value src1, Value dst) {
     dst->type = src0->type;
     dst->numeric = 1;
 
-    // /* Perform the !XOR. */
-    // dst->data_int = ~(src0->data_int ^ src1->data_int);
     /* Perform the comparison. */
     dst->data_int = (src0->data_int == src1->data_int) ? 1 : 0;
+    printf("scr0->data_int=%lld\n",src0->data_int);
+    printf("scr1->data_int=%lld\n",src1->data_int);
+    printf("dst->data_int=%lld\n",dst->data_int);
     return dst;
 }
 

data/lib/HDLRuby/std/delays.rb

@@ -0,0 +1,92 @@
+module HDLRuby::High::Std
+
+##
+# Standard HDLRuby::High library: delays
+#
+########################################################################
+
+
+    ## Module describing a simple delay using handshake for working.
+    #  @param num the number of clock cycles to delay.
+    system :delay do |num|
+        # Checks and process the number of clock to wait.
+        num = num.to_i
+        raise "The delay generic argument must be positive: #{num}" if (num < 0)
+
+        input  :clk     # The clock to make the delay on.
+        input  :req     # The handshake request.
+        output :ack     # The handshake acknoledgment.
+
+        # The process of the delay.
+        if (num == 0) then
+            # No delay case.
+            ack <= req
+        else
+            # The is a delay.
+            inner run: 0               # Tell if the deayl is running.
+            [num.width+1].inner :count # The counter for computing the delay.
+            par(clk.posedge) do
+                # Is there a request to treat?
+                hif(req & ~run) do
+                    # Yes, intialize the delay.
+                    run <= 1
+                    count <= 0
+                    ack <= 0
+                end
+                # No, maybe there is a request in processing.
+                helsif(run) do
+                    # Yes, increase the counter.
+                    count <= count + 1
+                    # Check if the delay is reached.
+                    hif(count == num-1) do
+                        # Yes, tells it and stop the count.
+                        ack <= 1
+                        run <= 0
+                    end
+                end
+            end
+        end
+    end
+
+
+
+    ## Module describing a pipeline delay (supporting multiple successive delays)
+    #  using handshake for working.
+    #  @param num the number of clock cycles to delay.
+    system :delayp do |num|
+        # Checks and process the number of clock to wait.
+        num = num.to_i
+        raise "The delay generic argument must be positive: #{num}" if (num < 0)
+
+        input  :clk          # The clock to make the delay on.
+        input  :req          # The handshake request.
+        output :ack          # The handshake acknoledgment.
+
+        if (num==0) then
+            # No delay.
+            ack <= req
+        else
+            # There is a delay.
+
+            [num].inner state: 0 # The shift register containing the progression
+                                 # of each requested delay.
+
+            # The acknoledgment is directly the last bit of the state register.
+            ack <= state[-1]
+
+
+            # The process controlling the delay.
+            seq(clk.posedge) do
+                # Update the state.
+                if (num > 1) then
+                    state <= state << 1
+                else
+                    state <= 0
+                end
+                # Handle the input.
+                ( state[0] <= 1 ).hif(req)
+            end
+        end
+    end
+
+end

data/lib/HDLRuby/std/handshakes.rb

@@ -0,0 +1,60 @@
+module HDLRuby::High::Std
+
+##
+# Standard HDLRuby::High library: handshake protocols.
+#
+########################################################################
+
+
+    ## Module describing a simple client handshake for working.
+    #  @param event the event to synchronize the handshake.
+    #  @param req   the signal telling a request is there.
+    #  @param cond  the condition allowing the protocol.
+    system :hs_client do |event, req, cond=_1|
+        input :reqI
+        output ackI: 0
+
+        # A each synchronization event.
+        par(event) do
+            # Is the protocol is allowed and a request is present.
+            hif(cond & reqI) do
+                # Yes perform the action and tell the request has been treated.
+                req  <= 1 if req
+                ackI <= 1
+            end
+            helse do
+                # No, do not perform the action, and do not acknowledge.
+                req  <= 0 if req
+                ackI <= 0
+            end
+        end
+    end
+
+
+    ## Module describing a simple server handshake for working.
+    #  @param event the event to synchronize the handshake.
+    #  @param req   the signal for asking a new request.
+    system :hs_server do |event, req|
+        output reqO: 0
+        input  :ackO
+
+        # A each synchronization event.
+        par(event) do
+            # Shall we start the output?
+            hif(ackO)  { reqO <= 0 }
+            hif(req)   { reqO <= 1 }
+        end
+    end
+
+
+    ## Module describing a pipe with handshakes.
+    #  @param event the event to synchronize the handshakes.
+    #  @param read  the signal telling there is a request from the client side
+    #  @param write the signal used for asking the server to issue a request
+    system :hs_pipe do |event,read,write|
+        inner :cond
+        include(hs_client(event,read,cond))
+        include(hs_server(event,write))
+        cond <= ~reqO
+    end
+end

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.9.0"
+  VERSION = "2.10.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.5
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - lib/HDLRuby/hdr_samples/dff.rb
 - lib/HDLRuby/hdr_samples/dff_bench.rb
 - lib/HDLRuby/hdr_samples/dff_counter.rb
+- lib/HDLRuby/hdr_samples/dff_override.rb
 - lib/HDLRuby/hdr_samples/dff_properties.rb
 - lib/HDLRuby/hdr_samples/dff_unit.rb
 - lib/HDLRuby/hdr_samples/huge_rom.rb
@@ -152,9 +153,11 @@ files:
 - lib/HDLRuby/hdr_samples/with_connector_memory.rb
 - lib/HDLRuby/hdr_samples/with_decoder.rb
 - lib/HDLRuby/hdr_samples/with_def.rb
+- lib/HDLRuby/hdr_samples/with_delay.rb
 - lib/HDLRuby/hdr_samples/with_fixpoint.rb
 - lib/HDLRuby/hdr_samples/with_fsm.rb
 - lib/HDLRuby/hdr_samples/with_function_generator.rb
+- lib/HDLRuby/hdr_samples/with_handshake.rb
 - lib/HDLRuby/hdr_samples/with_init.rb
 - lib/HDLRuby/hdr_samples/with_instance.rb
 - lib/HDLRuby/hdr_samples/with_linear.rb
@@ -173,6 +176,7 @@ files:
 - lib/HDLRuby/hdr_samples/with_to_array.rb
 - lib/HDLRuby/hdr_samples/with_values.rb
 - lib/HDLRuby/hdrcc.rb
+- lib/HDLRuby/hdrlib.rb
 - lib/HDLRuby/high_samples/_adder_fault.rb
 - lib/HDLRuby/high_samples/_generic_transmission2.rb
 - lib/HDLRuby/high_samples/adder.rb
@@ -324,9 +328,11 @@ files:
 - lib/HDLRuby/std/connector.rb
 - lib/HDLRuby/std/counters.rb
 - lib/HDLRuby/std/decoder.rb
+- lib/HDLRuby/std/delays.rb
 - lib/HDLRuby/std/fixpoint.rb
 - lib/HDLRuby/std/fsm.rb
 - lib/HDLRuby/std/function_generator.rb
+- lib/HDLRuby/std/handshakes.rb
 - lib/HDLRuby/std/hruby_unit.rb
 - lib/HDLRuby/std/linear.rb
 - lib/HDLRuby/std/loop.rb