HDLRuby 2.4.28 → 2.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad6c03f726ed838a4d5456f41c4b0f295e4ca7d10ca8585ee8f8c011f7f2fd23
-  data.tar.gz: a59727e177be4d5ff3eb740d210fad37bd4ba9ea6296a8cfed84495a7122411d
+  metadata.gz: a583dff628b7090369ac26e9136e3c911204ea3078135fecfd249e1cd4521d2b
+  data.tar.gz: 1ac0f7881ab17a0ac1bf69cccc2028ae129eb5ac99640440ddb05fdb18605fe1
 SHA512:
-  metadata.gz: dc19bcb5b44267c6506a9a1b3547d516b565a2a3ea997bf2ab5cada119caafb0fee09220c7da2e92321562ed2588dc5b6c58c6c697d3230daa8942c00fb731f6
-  data.tar.gz: c6849492302732600fe232d73f6984c4fe1a94e4d818349d5400fb15979eecc6b2b32d71a81b50f09713c5143236e13f330f763ea98beeda4a939d77b8d2fba9
+  metadata.gz: c6883993bfcd2f3956710c1a88550faa6bc892b579a1741c85f43c19a44baafa3429d0735cbbdc7cacba7f51cbf40d92bfa3b0b74ba5c6fe014779935b82f6b5
+  data.tar.gz: e94a1ea16d576f5b1424ac2a3274ff43d5ed8a95471ad6ee4c86d45ec7d956c375f64c8011f8bdf7c7c85d2f02c882f869ca3d4e81f986831263a633f60e14e8

data/lib/HDLRuby/hdrcc.rb

@@ -461,6 +461,9 @@ elsif $options[:clang] then
     # top_system = $top_system
     # Preprocess the HW description for valid C generation.
     $top_system.each_systemT_deep do |systemT|
+        # Coverts the par blocks in seq blocks to seq blocks to match
+        # the simulation engine.
+        systemT.par_in_seq2seq!
         # Converts the connections to behaviors.
         systemT.connections_to_behaviors!
         # Break the RefConcat.

data/lib/HDLRuby/hruby_low2c.rb

@@ -178,6 +178,7 @@ module HDLRuby::Low
                 end
             end
             self.scope.each_block_deep do |block|
+            # puts "treating for block=#{Low2C.obj_name(block)} with=#{block.each_inner.count} inners"
                 block.each_inner do |signal|
                     # res << signal.value.to_c_make(level) if signal.value
                     signal.value.each_node_deep do |node|
@@ -837,6 +838,7 @@ module HDLRuby::Low
         ## Generates the content of the h file.
         def to_ch
             res = ""
+            # puts "to_ch for SignalI: #{self.to_c_signal()}"
             # Declare the global variable holding the signal.
             res << "extern SignalI #{self.to_c_signal()};\n\n"
 
@@ -1050,6 +1052,12 @@ module HDLRuby::Low
             raise AnyError, "Internal error: to_c should be implemented in class :#{self.class}"
         end
 
+        ## Generates the content of the h file.
+        def to_ch
+            # By default nothing to generate.
+            return ""
+        end
+
         # Adds the c code of the blocks to +res+ at +level+
         def add_blocks_code(res,level)
             if self.respond_to?(:each_node) then
@@ -1060,6 +1068,17 @@ module HDLRuby::Low
                 end
             end
         end
+        
+        # Adds the creation of the blocks to +res+ at +level+.
+        def add_make_block(res,level)
+            if self.respond_to?(:each_node) then
+                self.each_node do |node|
+                    if node.respond_to?(:add_blocks_code) then
+                        node.add_make_block(res,level)
+                    end
+                end
+            end
+        end
     end
 
     ## Extends the Transmit class with generation of HDLRuby::High text.
@@ -1143,6 +1162,18 @@ module HDLRuby::Low
             # Return the result.
             return res
         end
+
+        ## Generates the content of the h file.
+        def to_ch
+            res = ""
+            # Recurse on the sub statements.
+            res << self.yes.to_ch
+            self.each_noif do |cond,stmnt|
+                res << stmnt.to_ch
+            end
+            res << self.no.to_ch if self.no
+            return res
+        end
     end
 
     ## Extends the When class with generation of HDLRuby::High text.
@@ -1164,10 +1195,20 @@ module HDLRuby::Low
             return res
         end
 
+        ## Generates the content of the h file.
+        def to_ch
+            return self.statement.to_ch
+        end
+
         # Adds the c code of the blocks to +res+ at +level+
         def add_blocks_code(res,level)
             self.statement.add_blocks_code(res,level)
         end
+
+        # Adds the creation of the blocks to +res+ at +level+.
+        def add_make_block(res,level)
+            self.statement.add_make_block(res,level)
+        end
     end
 
     ## Extends the Case class with generation of HDLRuby::High text.
@@ -1215,6 +1256,16 @@ module HDLRuby::Low
             # Return the resulting string.
             return res
         end
+
+        ## Generates the content of the h file.
+        def to_ch
+            res = ""
+            # Recurse on the whens.
+            self.each_when {|w| res << w.to_ch }
+            # Recurse on the default statement.
+            res << self.default.to_ch if self.default
+            return res
+        end
     end
 
 
@@ -1272,6 +1323,12 @@ module HDLRuby::Low
             res << self.to_c_code(level)
         end
 
+        # Adds the creation of the blocks to +res+ at +level+.
+        def add_make_block(res,level)
+            res << " " * level*3
+            res << "#{Low2C.make_name(self)}();\n"
+        end
+
         # Generates the C text of the equivalent HDLRuby::High code.
         # +level+ is the hierachical level of the object.
         def to_c_code(level = 0)
@@ -1351,6 +1408,11 @@ module HDLRuby::Low
             res << " " * (level+1)*3
             res << "block->function = &#{Low2C.code_name(self)};\n"
 
+            # Generate creation of the sub blocks.
+            self.each_statement do |stmnt|
+                stmnt.add_make_block(res,level+1)
+            end
+
             # Generate the Returns of the result.
             res << "\n"
             res << " " * (level+1)*3
@@ -1373,6 +1435,7 @@ module HDLRuby::Low
 
         ## Generates the content of the h file.
         def to_ch
+            # puts "to_ch for block=#{Low2C.obj_name(self)} with=#{self.each_inner.count} inners"
             res = ""
             # Declare the global variable holding the block.
             res << "extern Block #{Low2C.obj_name(self)};\n\n"
@@ -1383,6 +1446,10 @@ module HDLRuby::Low
             # Generate the accesses to the ports.
             self.each_inner  { |inner|  res << inner.to_ch }
 
+            # Recurse on the statements.
+            self.each_statement { |stmnt| res << stmnt.to_ch }
+
+
             return res
         end
     end

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.4.28"
+  VERSION = "2.4.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.4.28
+  version: 2.4.29
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler