HDLRuby 2.6.8 → 2.6.18

data/lib/HDLRuby/hruby_low_resolve.rb

@@ -165,6 +165,30 @@ module HDLRuby::Low
             return false
         end
 
+        ## Gets the systemI the reference comes from if any.
+        def get_systemI
+            # Look for the owner from the name hierarchy.
+            if self.ref.is_a?(RefName) then
+                # Look in the parent hierachy for the sub reference name.
+                parent = self.parent
+                # puts "self.ref.name=#{self.ref.name}"
+                while parent
+                    # puts "parent=#{parent}"
+                    if parent.respond_to?(:get_by_name) then
+                        found = parent.get_by_name(self.ref.name)
+                        # puts "found is a :#{found.class}"
+                        return found if found.is_a?(SystemI)
+                    end
+                    parent = parent.parent
+                end
+                # Not found, look further in the reference hierarchy.
+                return self.ref.get_systemI
+            end
+            # Not from a systemI.
+            # puts "Not from systemI for #{self.name}"
+            return nil
+        end
+
 
         ## Resolves the name of the reference and return the
         #  corresponding object.

data/lib/HDLRuby/hruby_low_without_namespace.rb

@@ -44,8 +44,10 @@ module HDLRuby::Low
         def to_global_systemTs!
             # Force a name if not.
             self.force_name!
+            # puts "to_global_systemTs! for #{self.name}"
             # For each local systemT
             self.scope.each_systemT.to_a.each do |systemT|
+                # puts "Processing system: #{systemT}"
                 # Rename it for globalization.
                 former = systemT.name
                 self.extend_name!(systemT)
@@ -211,6 +213,7 @@ module HDLRuby::Low
         # Replaces recursively +former+ name by +nname+ until it is redeclared
         # in the internals.
         def replace_names_subs!(former,nname)
+            # puts "replace_names_subs! for #{self} with former=#{former} and nname=#{nname}"
             self.each_type do |type|
                 type.replace_names!(former,nname)
             end
@@ -416,8 +419,9 @@ module HDLRuby::Low
             if self.name == former then
                 self.set_name!(nname)
             end
-            # Recurse on the system type.
-            self.systemT.replace_names!(former,nname)
+            # Not needed since treated through scope and systemT.
+            # # Recurse on the system type.
+            # self.systemT.replace_names!(former,nname)
         end
     end
 

data/lib/HDLRuby/hruby_tools.rb

@@ -50,4 +50,28 @@ module HDLRuby
 
     end
 
+
+    # Display some messages depending on the verbosity mode.
+    @@verbosity = 1 # The verbosity level: default 1, only critical messages.
+
+    # Sets the verbosity.
+    def self.verbosity=(val)
+        @@verbosity = val.to_i
+    end
+    
+    # Display a critical message.
+    def self.show!(*args)
+        puts(*args) if @@verbosity > 0
+    end
+
+    # Display a common message.
+    def self.show(*args)
+        puts(*args) if @@verbosity > 1
+    end
+
+    # Display a minor message.
+    def self.show?(*args)
+        puts(*args) if @@verbosity > 2
+    end
+
 end

data/lib/HDLRuby/hruby_verilog.rb

@@ -134,7 +134,7 @@ module HDLRuby::Low
             if self.name && !self.name.empty? then
                 vname = name_to_verilog(self.name)
                 code << " : #{vname}"
-                self.properties[:verilog_name] = vname
+                # self.properties[:verilog_name] = vname
             end
             code << "\n" if block.each_inner.any?
             # Declaration of "inner" part within "always".
@@ -1371,7 +1371,7 @@ module HDLRuby::Low
         # Converts the system to Verilog code using +renamer+ for producing Verilog-compatible names.
         def to_verilog
             vname = name_to_verilog(self.name)
-            self.properties[:verilog_name] = vname
+            # self.properties[:verilog_name] = vname
             return "#{vname}"
         end
 
@@ -1677,7 +1677,7 @@ module HDLRuby::Low
         def to_verilog
             # Convert unusable characters and return them.
             vname = name_to_verilog(self.name)
-            self.properties[:verilog_name] = vname
+            # self.properties[:verilog_name] = vname
             return "#{vname}"
         end
     end
@@ -1842,7 +1842,7 @@ module HDLRuby::Low
             code = "`timescale 1ps/1ps\n\n"
 
             vname = name_to_verilog(self.name)
-            self.properties[:verilog_name] = vname
+            # self.properties[:verilog_name] = vname
             # Output the module name.
             code << "module #{vname}("
 
@@ -2007,7 +2007,7 @@ module HDLRuby::Low
                 systemT = systemI.systemT
                 code << name_to_verilog(systemT.name) << " "
                 vname = name_to_verilog(systemI.name)
-                systemI.properties[:verilog_name] = vname
+                # systemI.properties[:verilog_name] = vname
                 code << vname << "("
                 # Its ports connections
                 # Inputs

data/lib/HDLRuby/hruby_verilog_name.rb

@@ -10,41 +10,59 @@ module HDLRuby::Verilog
 
   # Since it is possible to use $ and numbers other than the beginning of the character string, it is divided.
   def name_to_verilog(name)
-    ref = ""         # For storing the converted character.
-    name = name.to_s # Ensure name is a string
-    
-    if (name[0] =~ /[a-zA-Z]/) then
-      ref << name[0]
-      # _ To convert it to __.
-    elsif (name[0] == "_") then
-      ref << "__"
-    # If it does not satisfy the above, it is another character.
-    # In that case, convert it to UTF-8 and convert it to a usable character string.
-    else
-      l = name[0].bytes.map{|v| v.to_s(16)}.join # Conversion to UTF-8 hexadecimal number.
+    # ref = ""         # For storing the converted character.
+    # name = name.to_s # Ensure name is a string
+    # 
+    # if (name[0] =~ /[a-zA-Z]/) then
+    #   ref << name[0]
+    #   # _ To convert it to __.
+    # elsif (name[0] == "_") then
+    #   ref << "__"
+    # # If it does not satisfy the above, it is another character.
+    # # In that case, convert it to UTF-8 and convert it to a usable character string.
+    # else
+    #   l = name[0].bytes.map{|v| v.to_s(16)}.join # Conversion to UTF-8 hexadecimal number.
    
-      ref << "_" + l.rjust(6,"0")      # Add an underscore indicating conversion.
-                                       # The remainder of 6 digits is filled with 0.
-    end
+    #   ref << "_" + l.rjust(6,"0")      # Add an underscore indicating conversion.
+    #                                    # The remainder of 6 digits is filled with 0.
+    # end
+    # 
+    # name[1..-1].each_char do |c|
+    #   # Confirmation of characters in array.
+    #   # If it is a-zA-Z 0 - 9, it is added to ref as it is.
+    #   if (c =~ /[a-zA-Z0-9]|\$/) then
+    #     ref << c
+    #   # _ To convert it to __.
+    #   elsif (c == "_") then
+    #     ref << "__"
+    #   # If it does not satisfy the above, it is another character.
+    #   # In that case, convert it to UTF-8 and convert it to a usable character string.
+    #   else
+    #     l = c.bytes.map{|v| v.to_s(16)}.join # Conversion to UTF-8 hexadecimal number.
+    #  
+    #     ref << "_" + l.rjust(6,"0")      # Add an underscore indicating conversion.
+    #                                      # The remainder of 6 digits is filled with 0.
+    #   end
+    # end
+    # return ref
+
     
-    name[1..-1].each_char do |c|
-      # Confirmation of characters in array.
-      # If it is a-zA-Z 0 - 9, it is added to ref as it is.
-      if (c =~ /[a-zA-Z0-9]|\$/) then
-        ref << c
-      # _ To convert it to __.
-      elsif (c == "_") then
-        ref << "__"
-      # If it does not satisfy the above, it is another character.
-      # In that case, convert it to UTF-8 and convert it to a usable character string.
-      else
-        l = c.bytes.map{|v| v.to_s(16)}.join # Conversion to UTF-8 hexadecimal number.
-     
-        ref << "_" + l.rjust(6,"0")      # Add an underscore indicating conversion.
-                                         # The remainder of 6 digits is filled with 0.
+      name = name.to_s
+      # Convert special characters.
+      name = name.each_char.map do |c|
+          if c=~ /[a-z0-9]/ then
+              c
+          elsif c == "_" then
+              "__"
+          else
+              "_" + c.ord.to_s
+          end
+      end.join
+      # First character: only letter is possible.
+      unless name[0] =~ /[a-z_]/ then
+          name = "_" + name
       end
-    end
-    return ref
+      return name
   end
 
   #puts ref

data/lib/HDLRuby/sim/hruby_sim_calc.c

@@ -697,7 +697,27 @@ static Value greater_value_defined_bitstring(Value src0, Value src1, Value dst)
     dst->numeric = 1;
 
     /* Perform the comparison. */
-    dst->data_int = (value2integer(src0) > value2integer(src1));
+    if (src0->type->flags.sign) {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((signed long long)value2integer(src0) > 
+                 (signed long long)value2integer(src1));
+        } else {
+            dst->data_int = 
+                ((signed long long)value2integer(src0) > 
+                 (unsigned long long)value2integer(src1));
+        }
+    } else {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((unsigned long long)value2integer(src0) > 
+                 (signed long long)value2integer(src1));
+        } else {
+            dst->data_int = 
+                ((unsigned long long)value2integer(src0) > 
+                 (unsigned long long)value2integer(src1));
+        }
+    }
     return dst;
 }
 
@@ -712,7 +732,27 @@ static Value lesser_value_defined_bitstring(Value src0, Value src1, Value dst) {
     dst->numeric = 1;
 
     /* Perform the comparison. */
-    dst->data_int = (value2integer(src0) < value2integer(src1));
+    if (src0->type->flags.sign) {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((signed long long)value2integer(src0) < 
+                 (signed long long)value2integer(src1));
+        } else {
+            dst->data_int = 
+                ((signed long long)value2integer(src0) < 
+                 (unsigned long long)value2integer(src1));
+        }
+    } else {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((unsigned long long)value2integer(src0) < 
+                 (signed long long)value2integer(src1));
+        } else {
+            dst->data_int = 
+                ((unsigned long long)value2integer(src0) < 
+                 (unsigned long long)value2integer(src1));
+        }
+    }
     return dst;
 }
 
@@ -727,7 +767,27 @@ static Value greater_equal_value_defined_bitstring(Value src0, Value src1, Value
     dst->numeric = 1;
 
     /* Perform the comparison. */
-    dst->data_int = (value2integer(src0) >= value2integer(src1));
+    if (src0->type->flags.sign) {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((signed long long)value2integer(src0) >=
+                 (signed long long)value2integer(src1));
+        } else {
+            dst->data_int = 
+                ((signed long long)value2integer(src0) >=
+                 (unsigned long long)value2integer(src1));
+        }
+    } else {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((unsigned long long)value2integer(src0) >=
+                 (signed long long)value2integer(src1));
+        } else {
+            dst->data_int = 
+                ((unsigned long long)value2integer(src0) >=
+                 (unsigned long long)value2integer(src1));
+        }
+    }
     return dst;
 }
 
@@ -742,7 +802,27 @@ static Value lesser_equal_value_defined_bitstring(Value src0, Value src1, Value
     dst->numeric = 1;
 
     /* Perform the comparison. */
-    dst->data_int = (value2integer(src0) <= value2integer(src1));
+    if (src0->type->flags.sign) {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((signed long long)value2integer(src0) <=
+                 (signed long long)value2integer(src1));
+        } else {
+            dst->data_int = 
+                ((signed long long)value2integer(src0) <=
+                 (unsigned long long)value2integer(src1));
+        }
+    } else {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((unsigned long long)value2integer(src0) <=
+                 (signed long long)value2integer(src1));
+        } else {
+            dst->data_int = 
+                ((unsigned long long)value2integer(src0) <=
+                 (unsigned long long)value2integer(src1));
+        }
+    }
     return dst;
 }
 
@@ -1810,7 +1890,27 @@ static Value greater_value_numeric(Value src0, Value src1, Value dst) {
     dst->numeric = 1;
 
     /* Perform the greater. */
-    dst->data_int = (src0->data_int > src1->data_int);
+    if (src0->type->flags.sign) {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((signed long long)src0->data_int > 
+                 (signed long long)src1->data_int);
+        } else {
+            dst->data_int = 
+                ((signed long long)src0->data_int > 
+                 (unsigned long long)src1->data_int);
+        }
+    } else {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((unsigned long long)src0->data_int > 
+                 (signed long long)src1->data_int);
+        } else {
+            dst->data_int = 
+                ((unsigned long long)src0->data_int > 
+                 (unsigned long long)src1->data_int);
+        }
+    }
     return dst;
 }
 
@@ -1825,7 +1925,27 @@ static Value lesser_value_numeric(Value src0, Value src1, Value dst) {
     dst->numeric = 1;
 
     /* Perform the lesser. */
-    dst->data_int = (src0->data_int < src1->data_int);
+    if (src0->type->flags.sign) {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((signed long long)src0->data_int < 
+                 (signed long long)src1->data_int);
+        } else {
+            dst->data_int = 
+                ((signed long long)src0->data_int < 
+                 (unsigned long long)src1->data_int);
+        }
+    } else {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((unsigned long long)src0->data_int < 
+                 (signed long long)src1->data_int);
+        } else {
+            dst->data_int = 
+                ((unsigned long long)src0->data_int < 
+                 (unsigned long long)src1->data_int);
+        }
+    }
     return dst;
 }
 
@@ -1840,7 +1960,27 @@ static Value greater_equal_value_numeric(Value src0, Value src1, Value dst) {
     dst->numeric = 1;
 
     /* Perform the greater or equal. */
-    dst->data_int = (src0->data_int >= src1->data_int);
+    if (src0->type->flags.sign) {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((signed long long)src0->data_int >=
+                 (signed long long)src1->data_int);
+        } else {
+            dst->data_int = 
+                ((signed long long)src0->data_int >=
+                 (unsigned long long)src1->data_int);
+        }
+    } else {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((unsigned long long)src0->data_int >=
+                 (signed long long)src1->data_int);
+        } else {
+            dst->data_int = 
+                ((unsigned long long)src0->data_int >=
+                 (unsigned long long)src1->data_int);
+        }
+    }
     return dst;
 }
 
@@ -1855,7 +1995,27 @@ static Value lesser_equal_value_numeric(Value src0, Value src1, Value dst) {
     dst->numeric = 1;
 
     /* Perform the lesser or equal. */
-    dst->data_int = (src0->data_int <= src1->data_int);
+    if (src0->type->flags.sign) {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((signed long long)src0->data_int <=
+                 (signed long long)src1->data_int);
+        } else {
+            dst->data_int = 
+                ((signed long long)src0->data_int <=
+                 (unsigned long long)src1->data_int);
+        }
+    } else {
+        if (src1->type->flags.sign) {
+            dst->data_int = 
+                ((unsigned long long)src0->data_int <=
+                 (signed long long)src1->data_int);
+        } else {
+            dst->data_int = 
+                ((unsigned long long)src0->data_int <=
+                 (unsigned long long)src1->data_int);
+        }
+    }
     return dst;
 }
 

data/lib/HDLRuby/std/function_generator.rb

@@ -107,13 +107,15 @@ module HDLRuby::High::Std
         end
 
         # Make the interpolation.
-        diff <= (next_data-base).as(diff.type) * remaining
-        if(otyp.signed?) then
-            interpolated_value <= base + 
-                ([[diff[diff.type.width-1]]*shift_bits,
-                  diff[diff.type.width-1..shift_bits]]).to_expr
-        else
-            interpolated_value <= base + (diff >> shift_bits)
+        par do
+            diff <= (next_data-base).as(diff.type) * remaining
+            if(otyp.signed?) then
+                interpolated_value <= base + 
+                    ([[diff[diff.type.width-1]]*shift_bits,
+                      diff[diff.type.width-1..shift_bits]]).to_expr
+            else
+                interpolated_value <= base + (diff >> shift_bits)
+            end
         end
     end
 

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.6.8"
+  VERSION = "2.6.18"
 end

metadata

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