HDLRuby 2.11.11 → 2.11.12

data/lib/HDLRuby/std/fsm.rb

@@ -38,7 +38,8 @@ module HDLRuby::High::Std
             @name = name.to_sym
             # Check and set the type of fsm depending of the options.
             @dual = false
-            @type = :sync
+            @type = :sync      # By default, the FSM is synchronous.
+            @sequential = true # By default, the default next state is the next one in the list.
             options.each do |opt|
                 case opt
                 when :sync,:synchronous then
@@ -47,6 +48,8 @@ module HDLRuby::High::Std
                     @type = :async
                 when :dual then
                     @dual = true
+                when :static then
+                    @sequential = false
                 else
                     raise AnyError, "Invalid option for a fsm: :#{type}"
                 end
@@ -112,6 +115,7 @@ module HDLRuby::High::Std
             mk_rst = @mk_rst
             type = @type
             dual = @dual
+            sequential = @sequential
             extra_syncs   = @extra_syncs
             extra_asyncs  = @extra_asyncs
             default_codes = @default_codes
@@ -238,8 +242,10 @@ module HDLRuby::High::Std
                             else
                                 # No gotos, by default the next step is
                                 # current + 1
-                                # this.next_state_sig <= mux(mk_rst.call , 0, this.cur_state_sig + 1)
-                                this.next_state_sig <=  this.cur_state_sig + 1
+                                # this.next_state_sig <=  this.cur_state_sig + 1
+                                if sequential then
+                                    this.next_state_sig <= this.cur_state_sig + 1
+                                end
                             end
                         end
                     end
@@ -406,6 +412,17 @@ module HDLRuby::High::Std
             return result
         end
 
+        # Get a state by +name+.
+        def get_state(name)
+            name = name.to_sym
+            (@states.detect { |st| st.name == name }).value
+        end
+
+        # Sets the next state by +name+.
+        def next_state(name)
+            @next_state_sig <= get_state(name)
+        end
+
         # Sets the next state. Arguments can be:
         #
         # +name+: the name of the next state.

data/lib/HDLRuby/std/function_generator.rb

@@ -75,7 +75,7 @@ module HDLRuby::High::Std
         base <= lut[address]
 
         # Assign the next_data discrete value.
-        next_data <= lut[address+1]
+        next_data <= lut[address+_b1.as(address.type)]
     end
 
 
@@ -107,7 +107,7 @@ module HDLRuby::High::Std
         end
 
         # Make the interpolation.
-        par do
+        seq do
             diff <= (next_data-base).as(diff.type) * remaining
             if(otyp.signed?) then
                 interpolated_value <= base + 

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.11.11"
+  VERSION = "2.11.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.11.11
+  version: 2.11.12
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,13 +158,13 @@ files:
 - lib/HDLRuby/hdr_samples/seqpar_bench.rb
 - lib/HDLRuby/hdr_samples/simple_counter_bench.rb
 - lib/HDLRuby/hdr_samples/struct.rb
-- lib/HDLRuby/hdr_samples/sumprod.rb
 - lib/HDLRuby/hdr_samples/sw_encrypt_bench.rb
 - lib/HDLRuby/hdr_samples/sw_encrypt_cpu_bench.rb
 - lib/HDLRuby/hdr_samples/sw_encrypt_cpusim_bench.rb
 - lib/HDLRuby/hdr_samples/system_open.rb
 - lib/HDLRuby/hdr_samples/tuple.rb
 - lib/HDLRuby/hdr_samples/type_minmax_bench.rb
+- lib/HDLRuby/hdr_samples/with_bram.rb
 - lib/HDLRuby/hdr_samples/with_casts.rb
 - lib/HDLRuby/hdr_samples/with_channel.rb
 - lib/HDLRuby/hdr_samples/with_channel_other.rb
@@ -174,6 +174,7 @@ 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_define_operator.rb
 - lib/HDLRuby/hdr_samples/with_delay.rb
 - lib/HDLRuby/hdr_samples/with_fixpoint.rb
 - lib/HDLRuby/hdr_samples/with_fsm.rb
@@ -181,6 +182,7 @@ files:
 - 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_leftright.rb
 - lib/HDLRuby/hdr_samples/with_linear.rb
 - lib/HDLRuby/hdr_samples/with_loop.rb
 - lib/HDLRuby/hdr_samples/with_memory.rb
@@ -287,6 +289,7 @@ files:
 - lib/HDLRuby/hruby_low_without_outread.rb
 - lib/HDLRuby/hruby_low_without_parinseq.rb
 - lib/HDLRuby/hruby_low_without_select.rb
+- lib/HDLRuby/hruby_low_without_subsignals.rb
 - lib/HDLRuby/hruby_rcsim.rb
 - lib/HDLRuby/hruby_rsim.rb
 - lib/HDLRuby/hruby_rsim_mute.rb
@@ -339,6 +342,7 @@ files:
 - lib/HDLRuby/low_samples/with_seq.yaml
 - lib/HDLRuby/low_samples/yaml2hdr.rb
 - lib/HDLRuby/low_samples/yaml2vhd.rb
+- lib/HDLRuby/std/bram.rb
 - lib/HDLRuby/std/channel.rb
 - lib/HDLRuby/std/clocks.rb
 - lib/HDLRuby/std/connector.rb

data/lib/HDLRuby/hdr_samples/sumprod.rb

@@ -1,29 +0,0 @@
-system :sumprod do |typ,coefs|
-    typ[coefs.size].input :ins
-    typ.output :o
-
-    o <= coefs.each_with_index.reduce(_0) do |sum,(coef,i)|
-        sum + ins[i]*coef
-    end
-end
-
-
-typedef :sat do |width, max|
-    signed[width]
-end
-
-
-sat.define_operator(:+) do |width,max, x,y|
-    [width].inner :res
-    seq do
-        res <= x + y
-        ( res <= max ).hif(res > max)
-    end
-end
-
-
-
-system :sumprod_sat_16_1000, sumprod(sat(16,1000),
-                             [3,78,43,246, 3,67,1,8, 47,82,99,13, 5,77,2,4]) do
-end
-