HDLRuby 2.6.5 → 2.6.16

data/lib/HDLRuby/sim/hruby_sim_calc.c

@@ -686,6 +686,41 @@ static Value mod_value_defined_bitstring(Value src0, Value src1, Value dst) {
 }
 
 
+/** Computes the greater comparision of two defined bitstring values.
+ *  @param src0 the first source value of the addition
+ *  @param src1 the second source value of the addition
+ *  @param dst the destination value
+ *  @return dst */
+static Value greater_value_defined_bitstring(Value src0, Value src1, Value dst) {
+    /* Sets state of the destination using the first source. */
+    dst->type = src0->type;
+    dst->numeric = 1;
+
+    /* Perform the comparison. */
+    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;
+}
+
 /** Computes the lesser comparision of two defined bitstring values.
  *  @param src0 the first source value of the addition
  *  @param src1 the second source value of the addition
@@ -697,23 +732,97 @@ 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;
 }
 
+/** Computes the greater or equal comparision of two defined bitstring values.
+ *  @param src0 the first source value of the addition
+ *  @param src1 the second source value of the addition
+ *  @param dst the destination value
+ *  @return dst */
+static Value greater_equal_value_defined_bitstring(Value src0, Value src1, Value dst) {
+    /* Sets state of the destination using the first source. */
+    dst->type = src0->type;
+    dst->numeric = 1;
 
-/** Computes the greater comparision of two defined bitstring values.
+    /* Perform the comparison. */
+    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;
+}
+
+/** Computes the lesser or equal comparision of two defined bitstring values.
  *  @param src0 the first source value of the addition
  *  @param src1 the second source value of the addition
  *  @param dst the destination value
  *  @return dst */
-static Value greater_value_defined_bitstring(Value src0, Value src1, Value dst) {
+static Value lesser_equal_value_defined_bitstring(Value src0, Value src1, Value dst) {
     /* Sets state of the destination using the first source. */
     dst->type = src0->type;
     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;
 }
 
@@ -1762,13 +1871,49 @@ static Value equal_value_numeric(Value src0, Value src1, Value dst) {
     dst->type = src0->type;
     dst->numeric = 1;
 
-    /* Perform the !XOR. */
-    // dst->data_int = (src0->data_int == src1->data_int);
-    dst->data_int = ~(src0->data_int ^ src1->data_int);
+    // /* Perform the !XOR. */
+    // dst->data_int = ~(src0->data_int ^ src1->data_int);
+    /* Perform the comparison. */
+    dst->data_int = (src0->data_int == src1->data_int) ? 1 : 0;
     return dst;
 }
 
 
+/** Computes the greater comparision of two numeric values.
+ *  @param src0 the first source value of the addition
+ *  @param src1 the second source value of the addition
+ *  @param dst the destination value
+ *  @return the destination value */
+static Value greater_value_numeric(Value src0, Value src1, Value dst) {
+    /* Sets state of the destination using the first source. */
+    dst->type = src0->type;
+    dst->numeric = 1;
+
+    /* Perform the greater. */
+    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;
+}
+
 /** Computes the lesser comparision of two numeric values.
  *  @param src0 the first source value of the addition
  *  @param src1 the second source value of the addition
@@ -1780,22 +1925,97 @@ 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;
 }
 
-/** Computes the greater comparision of two numeric values.
+/** Computes the greater or equal comparision of two numeric values.
  *  @param src0 the first source value of the addition
  *  @param src1 the second source value of the addition
  *  @param dst the destination value
  *  @return the destination value */
-static Value greater_value_numeric(Value src0, Value src1, Value dst) {
+static Value greater_equal_value_numeric(Value src0, Value src1, Value dst) {
     /* Sets state of the destination using the first source. */
     dst->type = src0->type;
     dst->numeric = 1;
 
-    /* Perform the lesser. */
-    dst->data_int = (src0->data_int > src1->data_int);
+    /* Perform the greater or equal. */
+    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;
+}
+
+/** Computes the lesser or equal comparision of two numeric values.
+ *  @param src0 the first source value of the addition
+ *  @param src1 the second source value of the addition
+ *  @param dst the destination value
+ *  @return the destination value */
+static Value lesser_equal_value_numeric(Value src0, Value src1, Value dst) {
+    /* Sets state of the destination using the first source. */
+    dst->type = src0->type;
+    dst->numeric = 1;
+
+    /* Perform the lesser or equal. */
+    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;
 }
 
@@ -2434,6 +2654,34 @@ Value equal_value(Value src0, Value src1, Value dst) {
 }
 
 
+
+/** Computes the greater comparision of two general values.
+ *  @param src0 the first source value of the addition
+ *  @param src1 the second source value of the addition
+ *  @param dst the destination value
+ *  @return dst */
+Value greater_value(Value src0, Value src1, Value dst) {
+    /* Might allocate a new value so save the current pool state. */
+    unsigned int pos = get_value_pos();
+    /* Do a numeric computation if possible, otherwise fallback to bitstring
+     * computation. */
+    if (src0->numeric && src1->numeric) {
+        /* Both sources are numeric. */
+        return greater_value_numeric(src0,src1,dst);
+    } else if (is_defined_value(src0) && is_defined_value(src1)) {
+        /* Both sources can be converted to numeric values. */
+        return greater_value_defined_bitstring(src0,src1,dst);
+    } else {
+        /* Cannot compute (for now), simply undefines the destination. */
+        /* First ensure dst has the right shape. */
+        copy_value(src0,dst);
+        /* Then make it undefined. */
+        set_undefined_bitstring(dst);
+    }
+    return dst;
+}
+
+
 /** Computes the lesser comparision of two general values.
  *  @param src0 the first source value of the addition
  *  @param src1 the second source value of the addition
@@ -2461,22 +2709,22 @@ Value lesser_value(Value src0, Value src1, Value dst) {
 }
 
 
-/** Computes the greater comparision of two general values.
- *  @param src0 the first source value of the addition
- *  @param src1 the second source value of the addition
+/** Computes the greater or equal comparision of two values.
+ *  @param src0 the first source value of the comparison
+ *  @param src1 the second source value of the comparison
  *  @param dst the destination value
  *  @return dst */
-Value greater_value(Value src0, Value src1, Value dst) {
+Value greater_equal_value(Value src0, Value src1, Value dst) {
     /* Might allocate a new value so save the current pool state. */
     unsigned int pos = get_value_pos();
     /* Do a numeric computation if possible, otherwise fallback to bitstring
      * computation. */
     if (src0->numeric && src1->numeric) {
         /* Both sources are numeric. */
-        return greater_value_numeric(src0,src1,dst);
+        return greater_equal_value_numeric(src0,src1,dst);
     } else if (is_defined_value(src0) && is_defined_value(src1)) {
         /* Both sources can be converted to numeric values. */
-        return greater_value_defined_bitstring(src0,src1,dst);
+        return greater_equal_value_defined_bitstring(src0,src1,dst);
     } else {
         /* Cannot compute (for now), simply undefines the destination. */
         /* First ensure dst has the right shape. */
@@ -2487,6 +2735,33 @@ Value greater_value(Value src0, Value src1, Value dst) {
     return dst;
 }
 
+/** Computes the lesser or equal comparision of two values.
+ *  @param src0 the first source value of the comparison
+ *  @param src1 the second source value of the comparison
+ *  @param dst the destination value
+ *  @return dst */
+Value lesser_equal_value(Value src0, Value src1, Value dst) {
+    /* Might allocate a new value so save the current pool state. */
+    unsigned int pos = get_value_pos();
+    /* Do a numeric computation if possible, otherwise fallback to bitstring
+     * computation. */
+    if (src0->numeric && src1->numeric) {
+        /* Both sources are numeric. */
+        return lesser_equal_value_numeric(src0,src1,dst);
+    } else if (is_defined_value(src0) && is_defined_value(src1)) {
+        /* Both sources can be converted to numeric values. */
+        return lesser_equal_value_defined_bitstring(src0,src1,dst);
+    } else {
+        /* Cannot compute (for now), simply undefines the destination. */
+        /* First ensure dst has the right shape. */
+        copy_value(src0,dst);
+        /* Then make it undefined. */
+        set_undefined_bitstring(dst);
+    }
+    return dst;
+}
+
+
 
 /** Selects a value depending on a general condition.
  *  @param cond   the condition to use for selecting a value

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.5"
+  VERSION = "2.6.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.16
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - lib/HDLRuby/hdr_samples/alu.rb
 - lib/HDLRuby/hdr_samples/bstr_bench.rb
 - lib/HDLRuby/hdr_samples/calculator.rb
+- lib/HDLRuby/hdr_samples/comparison_bench.rb
 - lib/HDLRuby/hdr_samples/constant_in_function.rb
 - lib/HDLRuby/hdr_samples/counter_bench.rb
 - lib/HDLRuby/hdr_samples/dff.rb
@@ -134,6 +135,7 @@ files:
 - lib/HDLRuby/hdr_samples/sw_encrypt_cpusim_bench.rb
 - lib/HDLRuby/hdr_samples/system_open.rb
 - lib/HDLRuby/hdr_samples/tuple.rb
+- lib/HDLRuby/hdr_samples/type_minmax_bench.rb
 - lib/HDLRuby/hdr_samples/with_channel.rb
 - lib/HDLRuby/hdr_samples/with_class.rb
 - lib/HDLRuby/hdr_samples/with_connector.rb
@@ -148,6 +150,7 @@ files:
 - lib/HDLRuby/hdr_samples/with_memory_rom.rb
 - lib/HDLRuby/hdr_samples/with_multi_channels.rb
 - lib/HDLRuby/hdr_samples/with_reconf.rb
+- lib/HDLRuby/hdr_samples/with_to_array.rb
 - lib/HDLRuby/hdrcc.rb
 - lib/HDLRuby/high_samples/_adder_fault.rb
 - lib/HDLRuby/high_samples/_generic_transmission2.rb