HDLRuby 3.7.5 → 3.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af734e680200b79bc927ebf845cf13e712f5614a6f2188f23385f53f059442d1
-  data.tar.gz: be3d20a777119fd87686749b798df6a9f27ac9a0e7101821b1ab5a64d186a3c4
+  metadata.gz: 15e4da96afaa32db3686dcbad0ea327db644719dadfdba4ed6dcef1464f1e391
+  data.tar.gz: 1d08ab446037ab8ae6b86e6394a209a03ef06e8bcf233d10d9af25d059873f47
 SHA512:
-  metadata.gz: 14dd0ec35076907dddb6448965c6ce6a9ffc5e00d229760a0f3d2a30d0c8f3cf60b27567cac50abfe6c321db6e86a86ef3961c166372283eef55e273c8c85279
-  data.tar.gz: c63ef648b2782b10b02afba2247ba782bc34e83617a5d5b1bb11524844f2036e6cf47f6c435159f505ce2ee99201bb7c2663d39a04c76dd654e411249593d485
+  metadata.gz: 444499b3dc4f0577f113630a521bf7de67186f8dc2936c8626b91fd1dc556fac9b5f361f7265dbe81123c6a8391054eca2d57076e3067653b41c9566125d5b65
+  data.tar.gz: 9284989cce6b6006c3551e6d5f8e40a29a8c16726d168cab4347f27b596eac1962f045cd260c072ad0be31665e69f2f84ce6406e28b65d378262bc7586c39fbb

data/README.md

@@ -15,9 +15,15 @@ And if you want an html version the following command with create a `tuto` folde
 hdrcc --get-tuto
 ```
 
-__What's new__
+__What's new_
 
-For HDLRuby version 3.7.4/3.7.5:
+For HDLRuby version 3.7.6:
+
+* Added initial value to signals for the software sequencers.
+
+* Fixed hprint in software sequencer.
+
+For HDLRuby versions 3.7.4/3.7.5:
 
 * Various bug fixes.
 

data/lib/HDLRuby/hdr_samples/with_sequencer_leak_check.rb

@@ -8,11 +8,11 @@ system :my_seqencer do
     inner :clk,:rst
     [65536].inner :count
 
-    # sequencer(clk.posedge,rst) do
-    #   sloop do
-    #     # count <= count + 1
-    #   end
-    # end
+    sequencer(clk.posedge,rst) do
+      sloop do
+        count <= count + 1
+      end
+    end
 
 
 

data/lib/HDLRuby/std/sequencer_sw.rb

@@ -96,6 +96,12 @@ module RubyHDL::High
       type = type.to_type
       last_sig = nil
       names.each do |name|
+        init = nil
+        if name.is_a?(Hash) then
+          init = name.values[0]
+          name = name.keys[0]
+          # puts "init=#{init}"
+        end
         name = name.to_sym
         # Create and add the signal.
         sig = SignalI.new(name,type,:inner)
@@ -104,6 +110,9 @@ module RubyHDL::High
         # self.register(name) { puts("sig=",sig.inspect); sig }
         self.register(name) { sig }
         last_sig = sig
+
+        # Sets the initial value if any.
+        sig.value = init if init
       end
       return last_sig
     end
@@ -587,6 +596,11 @@ module RubyHDL::High
     end
     alias_method :to_expr, :to_value
 
+    def as(type)
+      # For now, cast is ignored.
+      return self
+    end
+
     def to_ruby
       return self
     end
@@ -1311,10 +1325,10 @@ module RubyHDL::High
         return @base.to_c + "[#{self.size.to_i}]"
       else
         # Simple vector type case.
-        if float? then
+        if @base.float? then
           return @base.to_c
         else
-          return @base + " long long"
+          return @base.to_c + " long long"
         end
       end
     end
@@ -1324,7 +1338,7 @@ module RubyHDL::High
       if @base.is_a?(TypeVector) then
         # Array type case.
         base_init = @base.to_c_init
-        return "[" + ([base_init] * self.size.to_i).join(",") + "]"
+        return "{" + ([base_init] * self.size.to_i).join(",") + "}"
       else
         return "0"
       end
@@ -1905,7 +1919,13 @@ module RubyHDL::High
     end
 
     # Convert to C code.
-    alias_method :to_c, :to_ruby
+    def to_c
+      if @content.is_a?(::Array) then
+        return "{" + @content.to_s[1..-2] + "}"
+      else
+        return @content.to_s
+      end
+    end
   end
 
   
@@ -1986,10 +2006,11 @@ module RubyHDL::High
 
     # Convert to C code.
     def to_c
-      return "switch(#{@sel.to_c}) {\n" +
-        @choices.map.with_index do |choice,i|
-          "case #{i}:\n#{choice.to_c}\nbreak;"
-        end.join("\n") + "\n}"
+      # return "switch(#{@sel.to_c}) {\n" +
+      #   @choices.map.with_index do |choice,i|
+      #     "case #{i}:\n#{choice.to_c}\nbreak;"
+      #   end.join("\n") + "\n}"
+      return "#{@sel.to_c} ? #{@choices[1].to_c} : #{@choices[0].to_c}"
     end
   end
 
@@ -2098,6 +2119,7 @@ module RubyHDL::High
 
   # Describes a SW implementation of an range reference.
   class RefRange < Ref
+    using RubyHDL::High
     attr_reader :base
 
     # Create a new index reference with +type+ data type +base+ base
@@ -2151,7 +2173,8 @@ module RubyHDL::High
 
     # Convert to Ruby code.
     def to_ruby
-      return "#{@base.to_ruby}[#{@rng.first.to_ruby}..#{@rng.last.to_ruby}]"
+      # return "#{@base.to_ruby}[#{@rng.first.to_ruby}..#{@rng.last.to_ruby}]"
+      return "#{@base.to_ruby}[#{@rng.last.to_ruby}..#{@rng.first.to_ruby}]"
     end
 
     # Convert to C code.
@@ -2163,7 +2186,11 @@ module RubyHDL::High
         smask = (1.to_value<<(@rng.first+1-@rng.last))-1
         cmask = ~(smask << @rng.last)
         # Get the final base.
-        base = @base.final_base.to_c
+        if @base.is_a?(Ref) then
+          base = @base.final_base.to_c
+        else
+          base = @base.to_c
+        end
         # Generate the ruby code.
         return "(#{base} & #{cmask.to_c}) >> (#{@rng.last.to_c})"
       end
@@ -2241,7 +2268,7 @@ module RubyHDL::High
     def to_c
       if (@left.is_a?(RefIndex) or @left.is_a?(RefRange)) then
         if @left.base.type.base.is_a?(TypeVector) then
-          return "#{@left.to_c} = #{@right.to_c}"
+          return "#{@left.to_c} = #{@right.to_c};"
         else
           # Get the access range.
           rng = @left.range
@@ -2260,7 +2287,7 @@ module RubyHDL::High
     end  
   end
 
-  # Describes a SW implementation of a if statement.
+  # Describes a SW implementation of a sif statement.
   class Sif < Statement
     # Create a new if statement in sequencer +sequencer+ 
     # with +cond+ condition and +ruby_block+
@@ -2321,7 +2348,7 @@ module RubyHDL::High
 
     # Convert to C code.
     def to_c
-      res = @sequencer.clk_up + "\nif(#{@condition.to_c}) {\n#{@yes_blk.to_c}\n}"
+      res = @sequencer.clk_up_c + "\nif(#{@condition.to_c}) {\n#{@yes_blk.to_c}\n}"
       @elsifs.each do |(cond,blk)|
         res << "\nelse if(#{cond.to_c}) {\n#{blk.to_c}\n}"
       end
@@ -2332,6 +2359,33 @@ module RubyHDL::High
     end
   end
 
+  # Describes a SW implementation of a hif statement.
+  class Hif < Sif
+    # Convert to Ruby code.
+    def to_ruby
+      res = "\nif((#{@condition.to_ruby}) != 0)\n#{@yes_blk.to_ruby}\n"
+      @elsifs.each do |(cond,blk)|
+        res << "elsif((#{cond.to_ruby}) != 0)\n#{blk.to_ruby}\n"
+      end
+      if @else_blk then
+        res << "else\n#{@else_blk.to_ruby}\n"
+      end
+      return res + "end\n"
+    end
+
+    # Convert to C code.
+    def to_c
+      res = "\nif(#{@condition.to_c}) {\n#{@yes_blk.to_c}\n}"
+      @elsifs.each do |(cond,blk)|
+        res << "\nelse if(#{cond.to_c}) {\n#{blk.to_c}\n}"
+      end
+      if @else_blk then
+        res << "\nelse {\n#{@else_blk.to_c}\n}"
+      end
+      return res
+    end
+  end
+
   # Describes a SW implementation of a loop statement.
   class Sloop < Statement
     # Create a new infinite loop statement in sequencer +sequencer+ 
@@ -2479,7 +2533,7 @@ module RubyHDL::High
 
     # Convert to Ruby code.
     def to_c
-      return @sequencer.clk_up_c + "\nreturn #{val.to_c};"
+      return @sequencer.clk_up_c + "\nreturn #{@value.to_c};"
     end
   end
 
@@ -2627,7 +2681,7 @@ module RubyHDL::High
 
     # Convert to C code.
     def to_c
-      return "\n__#{name}(" + @args.map {|arg| arg.to_ruby}.join(",") + ");"
+      return "\n__#{@name}(" + @args.map {|arg| arg.to_ruby}.join(",") + ");"
     end
 
     # Create an iterator for a given method +meth+.
@@ -2962,6 +3016,54 @@ module RubyHDL::High
     end
   end
 
+  # Describes a SW implementation of a hardware print statement.
+  class Print < Statement
+    using RubyHDL::High
+
+    # Create a new hprint statement in sequencer +sequencer+
+    # for displaying +args+.
+    def initialize(sequencer,*args)
+      @sequencer = sequencer
+      @arguments = args
+    end
+
+    # Convert to Ruby code.
+    def to_ruby
+      return "" if @arguments.empty?
+      res = "print("
+      @arguments.each do |arg|
+          if arg.is_a?(::String) then
+            res << "\"#{arg}\""
+          else
+            res << arg.to_ruby
+          end
+        end
+        res << ")\n"
+        return res
+    end
+
+    # Convert to C code.
+    def to_c
+      return "" if @arguments.empty?
+      # Create the format.
+      format = @arguments.map do |arg|
+        if arg.is_a?(Expression) then
+          arg.type.signed? ? "%lld" : "%llu"
+        else
+          "%s"
+        end
+      end.join
+      return "printf(\"#{format}\"," +
+        @arguments.map do |arg|
+          if arg.is_a?(::String) then
+            "\"#{arg.gsub(/\n/,"\\n")}\""
+          else
+            arg.to_c
+          end
+        end.join(",") + ");"
+    end
+  end
+
 
   # Describes a SW implementation of an iterator statement.
   class Siter < Statement
@@ -3396,7 +3498,9 @@ module RubyHDL::High
     end
 
     # Convert to C code.
-    alias_method :to_c, :to_ruby
+    def to_c
+      return "__" + self.name.to_s
+    end
 
     # Check if a value is defined for the signal.
     def value?
@@ -3553,14 +3657,14 @@ module RubyHDL::High
     # Convert to C code.
     def to_c
       res = ""
-      # Generate the arguments if any.
-      if @args.any? then
-        res = "(#{@args.map(&:to_c).join(",")})\n"
-      end
+      # # Generate the arguments if any.
+      # if @args.any? then
+      #   res = "(#{@args.map(&:to_c).join(",")})\n"
+      # end
       # Generate the statements.
-      res += "{" + @statements.map do |stmnt|
-        stmnt.to_ruby + "\n"
-      end.join + "}"
+      res += "{\n" + @statements.map do |stmnt|
+        stmnt.to_c + "\n"
+      end.join + "\n}"
       return res
     end
 
@@ -3600,7 +3704,11 @@ module RubyHDL::High
     def sif(cond, &ruby_block)
       self << RubyHDL::High::Sif.new(@sequencer,cond,&ruby_block)
     end
-    alias_method :hif, :sif
+
+    # Create a sequential if statement on +cond+.
+    def hif(cond, &ruby_block)
+      self << RubyHDL::High::Hif.new(@sequencer,cond,&ruby_block)
+    end
 
     # Create a sequential elsif statement on +cond+.
     def selsif(cond, &ruby_block)
@@ -3645,10 +3753,11 @@ module RubyHDL::High
 
     # Displays a string for debugging purpose.
     def hprint(*args)
-      args.each do |arg|
-        arg = arg.to_value if arg.is_a?(RubyHDL::High::Expression)
-        print arg
-      end
+      # args.each do |arg|
+      #   arg = arg.to_value if arg.is_a?(RubyHDL::High::Expression)
+      #   print arg
+      # end
+      self << RubyHDL::High::Print.new(@sequencer,*args)
     end
 
     # The SW-specific statements and expressions.
@@ -3705,7 +3814,7 @@ module RubyHDL::High
 
     # Convert to C code.
     def to_c
-      return "unsigned long long __#{name}(#{@args.map {|arg| "unsigned long long " + arg.to_c}.join(",")} {\n#{@blk.sequencer.clk_up_c}\n#{@blk.to_c}\n}\n"
+      return "unsigned long long __#{name}(#{@args.map {|arg| "unsigned long long __" + arg.to_c}.join(",")}) {\n#{@blk.sequencer.clk_up_c}\n#{@blk.to_c}\n}\n"
     end
   end
 
@@ -3771,7 +3880,7 @@ module RubyHDL::High
         signal.to_ruby + " = RubyHDL.#{signal.name}"
       else
         signal.to_ruby + " ||= " + 
-        (signal.array? ? "[]" : signal.value? ? signal.value.inspect : "0")
+          (signal.array? ? "[*#{signal.value? ? signal.value : "nil"}]" : signal.value? ? signal.value.inspect : "0")
       end
 end.join("\n")}
 
@@ -3794,11 +3903,29 @@ BUILD
     def to_c
       typ = nil
       res = <<-BUILDC
+#include <stdio.h>
+
 #{RubyHDL::High.global_sblock.each_signal.map do |signal|
       typ = signal.type
-      typ.to_c + " " + signal.to_c + "=" + typ.to_c_init + ";"
+      if signal.value? then
+        if signal.array? then
+          typ.base.to_c + " " + signal.to_c + "[#{typ.size}]" " = {" + 
+            signal.value.inspect[1..-2] + "};"
+        else
+          typ.to_c + " " + signal.to_c + "=" + signal.value.inspect + ";"
+        end
+      else
+        if signal.array? then
+          typ.base.to_c + " " + signal.to_c + "[#{typ.size}]" + " =" + typ.to_c_init + ";"
+        else
+          typ.to_c + " " + signal.to_c + "=" + typ.to_c_init + ";"
+        end
+      end
 end.join("\n")}
-#{sblock.to_c}
+
+#{@sfunctions.map {|n,f| f.to_c }.join("\n\n")}
+
+void sequencer() #{@blk.to_c}
 BUILDC
       return res
     end

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "3.7.5"
+  VERSION = "3.7.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 3.7.5
+  version: 3.7.7
 platform: ruby
 authors:
 - Lovic Gauthier