HDLRuby 2.11.11 → 3.0.0

data/lib/HDLRuby/hruby_low2c.rb

@@ -165,8 +165,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the SystemT class with generation of C text.
     class SystemT
+        ## Extends the SystemT class with generation of C text.
 
         # Generates the text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object and +hnames+
@@ -402,8 +402,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Scope class with generation of C text.
     class Scope
+        ## Extends the Scope class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -567,8 +567,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Type class with generation of C text.
     class Type
+        ## Extends the Type class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -587,8 +587,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the TypeDef class with generation of C text.
+
     class TypeDef
+        ## Extends the TypeDef class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -601,8 +602,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the TypeVector class with generation of C text.
+
     class TypeVector
+        ## Extends the TypeVector class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -618,8 +620,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the TypeTuple class with generation of C text.
+
     class TypeTuple
+        ## Extends the TypeTuple class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -634,26 +637,24 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the TypeStruct class with generation of C text.
     class TypeStruct
+        ## Extends the TypeStruct class with generation of C text.
 
         # Generates the text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
         # def to_c(level = 0)
         def to_c(res,level = 0)
-            # return "get_type_struct(#{self.each.join(",") do |key,type|
-            #     "\"#{key.to_s}\",#{type.to_c(level+1)}"
-            # end})"
-            res << "get_type_struct(#{self.each.join(",") do |key,type|
-                "\"#{key.to_s}\",#{type.to_c("",level+1)}"
-            end})"
+            # res << "get_type_struct(#{self.each.map do |key,type|
+            #     "\"#{key.to_s}\",#{type.to_c("",level+1)}"
+            # end.join(",")})"
+            self.to_vector.to_c(res,level)
             return res
         end
     end
 
 
-    ## Extends the Behavior class with generation of C text.
     class Behavior
+        ## Extends the Behavior class with generation of C text.
 
         # Generates the text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object and
@@ -839,8 +840,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the TimeBehavior class with generation of C text.
+
     class TimeBehavior
+        ## Extends the TimeBehavior class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -852,8 +854,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Event class with generation of C text.
     class Event
+        ## Extends the Event class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -872,8 +874,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the SignalI class with generation of C text.
     class SignalI
+        ## Extends the SignalI class with generation of C text.
 
         # The id of a signal in the simulator.
         @@signal_id = 0
@@ -897,8 +899,17 @@ module HDLRuby::Low
         #  +level+ is the hierachical level of the object.
         # def to_c(level = 0)
         def to_c(res,level = 0)
+            # First generate the sub signals if any.
+            if self.each_signal.any? then
+                self.each_signal do |signal|
+                    signal.to_c(res,level)
+                end
+                # return res
+            end
 
-            # puts "Signal.to_c with name: #{Low2C.obj_name(self)}"
+            # No sub signals, generate for the current one.
+
+            # puts "Signal.to_c with signal #{self.name} and c_name: #{Low2C.obj_name(self)}"
             # Declare the global variable holding the signal.
             res << "SignalI "
             self.to_c_signal(res,level+1)
@@ -943,6 +954,22 @@ module HDLRuby::Low
             res << "signalI->type = "
             self.type.to_c(res,level+2)
             res << ";\n"
+
+            # Generate and set the sub signals if any.
+            res << " " * (level+1)*3
+            num_sig = self.each_signal.to_a.size
+            res << "signalI->num_signals = #{num_sig};\n"
+            if num_sig > 0 then
+                res << " " * (level+1)*3
+                res << "signalI->signals = calloc(sizeof(SignalI),#{num_sig});\n"
+                self.each_signal.with_index do |sig,i|
+                    res << " " * (level+1)*3
+                    res << "#{Low2C.obj_name(sig)} = #{Low2C.make_name(sig)}();\n"
+                    res << " " * (level+1)*3
+                    res << "signalI->signals[#{i}] = #{Low2C.obj_name(sig)};\n"
+                end
+            end
+
             # Set the current and the next value.
             res << " " * (level+1)*3
             res << "signalI->c_value = make_value(signalI->type,0);\n"
@@ -1000,6 +1027,15 @@ module HDLRuby::Low
         ## Generates the content of the h file.
         # def to_ch
         def to_ch(res)
+            # First generate the sub signals if any.
+            if self.each_signal.any? then
+                self.each_signal do |signal|
+                    signal.to_ch(res)
+                end
+                # return res
+            end
+
+            # No sub sub signal, generate for the current signal.
             # res = ""
             # puts "to_ch for SignalI: #{self.to_c_signal()}"
             # Declare the global variable holding the signal.
@@ -1053,8 +1089,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the SystemI class with generation of C text.
     class SystemI
+        ## Extends the SystemI class with generation of C text.
 
         ## Generates the C text of the equivalent HDLRuby code.
         #  +level+ is the hierachical level of the object.
@@ -1134,8 +1170,8 @@ module HDLRuby::Low
     end
 
 
-    # Extend the Chunk cass with generation of text code.
     class HDLRuby::Low::Chunk
+        # Extend the Chunk cass with generation of text code.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -1166,8 +1202,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the SystemI class with generation of C text.
     class Code
+        ## Extends the SystemI class with generation of C text.
+
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
         # def to_c(level = 0)
@@ -1288,8 +1325,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Statement class with generation of C text.
     class Statement
+        ## Extends the Statement class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -1330,8 +1367,8 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Transmit class with generation of C text.
     class Transmit
+        ## Extends the Transmit class with generation of C text.
 
         # # Generates the C text of the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object.
@@ -1432,8 +1469,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Print class with generation of C text.
     class Print
+        ## Extends the Print class with generation of C text.
 
         # # Generates the C text of the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object.
@@ -1501,8 +1538,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the TimeTerminate class with generation of C text.
+
     class TimeTerminate
+        ## Extends the TimeTerminate class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -1512,8 +1550,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Configure class with generation of C text.
+
     class Configure
+        ## Extends the Configure class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -1524,8 +1563,8 @@ module HDLRuby::Low
     end
 
     
-    ## Extends the If class with generation of C text.
     class If
+        ## Extends the If class with generation of C text.
 
         # # Generates the C text of the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object.
@@ -1645,8 +1684,8 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the When class with generation of C text.
     class When
+        ## Extends the When class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -1689,8 +1728,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Case class with generation of C text.
+
     class Case
+        ## Extends the Case class with generation of C text.
 
         # # Generates the text of the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object.
@@ -1823,8 +1863,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Delay class with generation of C text.
     class Delay
+        ## Extends the Delay class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -1839,8 +1879,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the TimeWait class with generation of C text.
     class TimeWait
+        ## Extends the TimeWait class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -1860,8 +1900,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the TimeRepeat class with generation of C text.
+
     class TimeRepeat
+        ## Extends the TimeRepeat class with generation of C text.
 
         # # Generates the C text of the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object.
@@ -1901,8 +1942,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Block class with generation of C text.
+
     class Block
+        ## Extends the Block class with generation of C text.
 
         # Adds the c code of the blocks to +res+ at +level+
         def add_blocks_code(res,level)
@@ -2054,20 +2096,22 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Block class with generation of C text.
     class TimeBlock
+        ## Extends the Block class with generation of C text.
+
         # TimeBlock is identical to Block in C
     end
 
 
-    ## Extends the Connection class with generation of C text.
     class Connection
+        ## Extends the Connection class with generation of C text.
+
         # Nothing required, Transmit is generated identically.
     end
 
 
-    ## Extends the Expression class with generation of C text.
     class Expression
+        ## Extends the Expression class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -2089,8 +2133,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Value class with generation of C text.
     class Value
+        ## Extends the Value class with generation of C text.
 
         ## Generates the C text for an access to the value.
         #  +level+ is the hierachical level of the object.
@@ -2205,7 +2249,7 @@ module HDLRuby::Low
                         res << "value->data_int = #{self.content}LLU;\n"
                     else
                         res << "value->data_int = "
-                        res << "#{self.content & 0xFFFFFFFFFFFF}LLU;\n"
+                        res << "#{self.content & 0xFFFF_FFFF_FFFF_FFFF}LLU;\n"
                     end
                     # Close the value.
                     res << " " * (level+1)*3
@@ -2258,8 +2302,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Cast class with generation of C text.
     class Cast
+        ## Extends the Cast class with generation of C text.
 
         # # Generates the C text of the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object.
@@ -2314,8 +2358,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Operation class with generation of C text.
     class Operation
+        ## Extends the Operation class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
@@ -2326,8 +2370,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Unary class with generation of C text.
+
     class Unary
+        ## Extends the Unary class with generation of C text.
 
         # # Generates the C text of the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object.
@@ -2410,8 +2455,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Binary class with generation of C text.
     class Binary
+        ## Extends the Binary class with generation of C text.
 
         # # Generates the C text of the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object.
@@ -2559,8 +2604,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Select class with generation of C text.
+
     class Select
+        ## Extends the Select class with generation of C text.
 
         # # Generates the C text of the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object.
@@ -2637,9 +2683,9 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Concat class with generation of C text.
-    class Concat
 
+    class Concat
+        ## Extends the Concat class with generation of C text.
 
         # # Generates the C text for the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object.
@@ -2697,7 +2743,7 @@ module HDLRuby::Low
             end
             # Compute the resulting concatenation.
             res << (" " * ((level+1)*3))
-            # puts "self.type.direction=#{self.type.direction}\n"
+            # puts "self.type=#{self.type} self.type.direction=#{self.type.direction}\n"
             res << "sconcat(#{expressions.size},"
             res << (self.type.direction == :little ? "1" : "0")
             res << ");\n"
@@ -2768,8 +2814,8 @@ module HDLRuby::Low
 
 
 
-    ## Extends the Ref class with generation of C text.
     class Ref
+        ## Extends the Ref class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object and
@@ -2782,8 +2828,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the RefConcat class with generation of C text.
     class RefConcat
+        ## Extends the RefConcat class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object and
@@ -2816,8 +2862,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the RefIndex class with generation of C text.
     class RefIndex
+        ## Extends the RefIndex class with generation of C text.
 
         # # Generates the C text of the equivalent HDLRuby code.
         # # +level+ is thehierachical level of the object and
@@ -2926,8 +2972,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the RefRange class with generation of C text.
     class RefRange
+        ## Extends the RefRange class with generation of C text.
 
         # # Generates the C text of the equivalent HDLRuby code.
         # # +level+ is the hierachical level of the object and
@@ -3039,8 +3085,8 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the RefName class with generation of C text.
     class RefName
+        ## Extends the RefName class with generation of C text.
 
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object and
@@ -3054,22 +3100,51 @@ module HDLRuby::Low
             res << "->" << (left ? "f_value" : "c_value")
             res << ");\n"
             return res
+            # sig = self.resolve
+            # if sig.each_signal.any? then
+            #     # Save the value pool state.
+            #     res << (" " * (level*3)) << "PV;\n"
+            #     # There are sub signals, get and concat their values.
+            #     subs = sig.each_signal.to_a
+            #     subs.each do |sub|
+            #         res << (" " * (level*3))
+            #         res << "push("
+            #         sub.to_c_signal(res,level+1)
+            #         res << "->" << (left ? "f_value" : "c_value")
+            #         res << ");\n"
+            #     end
+            #     # Compute the resulting concatenation.
+            #     res << (" " * ((level+1)*3))
+            #     res << "sconcat(#{subs.size},"
+            #     res << (sig.type.direction == :little ? "1" : "0")
+            #     res << ");\n"
+            #     # Restore the value pool state.
+            #     res << (" " * (level*3)) << "RV;\n"
+            # else
+            #     # There is no sub signals, get the signal value.
+            #     res << (" " * (level*3))
+            #     res << "push("
+            #     sig.to_c_signal(res,level+1)
+            #     res << "->" << (left ? "f_value" : "c_value")
+            #     res << ");\n"
+            # end
+            # return res
         end
 
         # Generates the C text for reference as left value to a signal.
         # +level+ is the hierarchical level of the object.
         # def to_c_signal(level = 0)
         def to_c_signal(res,level = 0)
-            # puts "to_c_signal with self=#{self.name}, resolve=#{self.resolve}"
-            # return "#{self.resolve.to_c_signal(level+1)}"
+            # puts "to_c_signal with self=#{self.name}"
             self.resolve.to_c_signal(res,level+1)
             return res
         end
     end
 
 
-    ## Extends the RefThis class with generation of C text.
     class RefThis 
+        ## Extends the RefThis class with generation of C text.
+
         # Generates the C text of the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object and
         # +left+ tells if it is a left value or not.