HDLRuby 3.7.5 → 3.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af734e680200b79bc927ebf845cf13e712f5614a6f2188f23385f53f059442d1
-  data.tar.gz: be3d20a777119fd87686749b798df6a9f27ac9a0e7101821b1ab5a64d186a3c4
+  metadata.gz: d8331701e40f0efc7e0481fdacf241194aa5aba8a707ee257a75a73f295ba677
+  data.tar.gz: 9d41bbff0f3ad714e012c65a7ff2b920551cc1db607a7c20f281dfc5b6dbde1c
 SHA512:
-  metadata.gz: 14dd0ec35076907dddb6448965c6ce6a9ffc5e00d229760a0f3d2a30d0c8f3cf60b27567cac50abfe6c321db6e86a86ef3961c166372283eef55e273c8c85279
-  data.tar.gz: c63ef648b2782b10b02afba2247ba782bc34e83617a5d5b1bb11524844f2036e6cf47f6c435159f505ce2ee99201bb7c2663d39a04c76dd654e411249593d485
+  metadata.gz: 83b7cf2d52d862a704166a50c6c9440bd1d3349a062a2e146cfbdf8c1314435b3237acc371a7f9377a7de70b2565f17f6829441a386fe369c975d8e67f7b45c7
+  data.tar.gz: c1ff187b98317042cc4ba243fa35d08e6771c73d2c8d77a66444bb13faa6c3fd2a37b7733087a2cbe2fe97dcb25928485a44af334b41751222040d41655d8d68

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
@@ -2151,7 +2165,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.
@@ -2962,6 +2977,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.each do |arg|
+        if arg.is_a?(Expression) then
+          arg.type.signed? ? "%lld" : "%llu"
+        else
+          "%s"
+        end
+      end.join
+      return "printf(\"#{format}\"," +
+        @arguments.each do |arg|
+          if arg.is_a?(::String) then
+            "\"#{arg}\""
+          else
+            arg.to_c
+          end
+        end.join(",")
+    end
+  end
+
 
   # Describes a SW implementation of an iterator statement.
   class Siter < Statement
@@ -3645,10 +3708,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.
@@ -3771,7 +3835,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")}
 

data/lib/HDLRuby/version.rb

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

metadata

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