HDLRuby 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6548ba8f8c1572f8aa254b168eab065bc5d0a06ac996d792b4082a9243a2dfc9
-  data.tar.gz: 97891dad52f2454d37755af82cf6d23b2665cccd39a44caff81701921f233931
+  metadata.gz: b9bca5842e518422f5e7b7edb864a8eae5955df19238cd9582a776d4ef6c7a1e
+  data.tar.gz: 6c094ebf5d69c8dbf57ddd800eca16aca88b4bc324db11eecac3f15569b633e3
 SHA512:
-  metadata.gz: 6df258eebc8a3448824aca9bf39d24ad98c9302728c2584bb34880b8160b42a00f6b7e0fed68a4097403046e0621bf16c8048c43ce95090254f4e9e6e1ebc079
-  data.tar.gz: 73cc373d53e91a756922c8539f15283f793db0ce6e1b3e7c2ae566ae6e2c19691ee62d7dd3ac5ca1f1e19c61a809ab234aba3c790ae207327f8cd2609c76816f
+  metadata.gz: f01e2f703bcade0db355c42e78267205ca3662c8b30589c5676eab6acaf334fac2a86205b600122e50f11eef3e6a17182dacb59b9a7821c3fa9d7aed90ebd6b7
+  data.tar.gz: 5c3b80eddb70a3f25f2941bc26c8e95a8f3a30f5020cb17d6a4a199678aacaab4ce0c5c4ffcd347c23b53bd86fb15d58392818673e57ca3d108aec0c5b062ed0

data/lib/HDLRuby/hruby_low2c.rb

@@ -1946,7 +1946,9 @@ module HDLRuby::Low
         # 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)
-            return to_c(level,true)
+            # return to_c(level,true)
+            return "make_ref_rangeS(#{self.ref.to_c_signal(level)}," +
+                "value2integer(#{self.range.first.to_c(level)}),value2integer(#{self.range.last.to_c(level)}))"
         end
     end
 

data/lib/HDLRuby/sim/hruby_sim.h

@@ -612,14 +612,18 @@ extern Value read_range(Value value, long long first, long long last,
  *  @param src the source value
  *  @param first the first index of the range
  *  @param last the last index of the range
+ *  @param base the type of the elements
  *  @param dst the destination value
  *  @return dst */
-extern Value write_range(Value src, long long first, long long last, Value dst);
+extern Value write_range(Value src, long long first, long long last, 
+        Type base, Value dst);
 
 /** Writes to a range within a value but without overwrite with Z. 
  *  @param src the source value
  *  @param first the first index of the range
  *  @param last the last index of the range
+ *  @param base the type of the elements
  *  @param dst the destination value
  *  @return dst */
-extern Value write_range_no_z(Value src, long long first, long long last, Value dst);
+extern Value write_range_no_z(Value src, long long first, long long last,
+        Type base, Value dst);

data/lib/HDLRuby/sim/hruby_sim_calc.c

@@ -1354,10 +1354,11 @@ Value read_range_bitstring(Value src, long long first, long long last,
  *  @param src the source value
  *  @param first the first index of the range
  *  @param last the last index of the range
+ *  @param base the type of the elements
  *  @param dst the destination value
  *  @return dst */
 Value write_range_bitstring(Value src, long long first, long long last,
-        Value dst) {
+        Type base, Value dst) {
     unsigned long long i;
     /* Ensure first is the smaller. */
     if (first > last) {
@@ -1370,7 +1371,8 @@ Value write_range_bitstring(Value src, long long first, long long last,
     unsigned long long src_width = type_width(src->type);
     unsigned long long dst_width = type_width(dst->type);
     /* scale the range according to the base type. */
-    unsigned long long bw = dst->type->base;
+    // unsigned long long bw = dst->type->base;
+    unsigned long long bw = type_width(base);
     first *= bw;
     last *=  bw;
     last += bw-1;
@@ -1391,10 +1393,11 @@ Value write_range_bitstring(Value src, long long first, long long last,
  *  @param src the source value
  *  @param first the first index of the range
  *  @param last the last index of the range
+ *  @param base the type of the elements
  *  @param dst the destination value
  *  @return dst */
 Value write_range_bitstring_no_z(Value src, long long first, long long last,
-        Value dst) {
+        Type base, Value dst) {
     unsigned long long i;
     /* Ensure first is the smaller. */
     if (first > last) {
@@ -1406,7 +1409,8 @@ Value write_range_bitstring_no_z(Value src, long long first, long long last,
     unsigned long long src_width = type_width(src->type);
     unsigned long long dst_width = type_width(dst->type);
     /* scale the range according to the base type. */
-    unsigned long long bw = dst->type->base;
+    // unsigned long long bw = dst->type->base;
+    unsigned long long bw = type_width(base);
     first *= bw;
     last *=  bw;
     /* Access the source and destination bitstring data. */
@@ -1864,10 +1868,11 @@ Value read_range_numeric(Value value, long long first, long long last,
  *  @param src the source value
  *  @param first the first index of the range
  *  @param last the last index of the range
+ *  @param base the type of the elements
  *  @param dst the destination value
  *  @return dst */
 Value write_range_numeric(Value src, long long first, long long last,
-        Value dst) {
+        Type base, Value dst) {
     // printf("write_range_numeric\n");
     /* Ensure first is the smaller. */
     if (first > last) {
@@ -1879,7 +1884,8 @@ Value write_range_numeric(Value src, long long first, long long last,
     unsigned long long src_width = type_width(src->type);
     unsigned long long dst_width = type_width(dst->type);
     /* scale the range according to the base type of the destination. */
-    unsigned long long bw = dst->type->base;
+    // unsigned long long bw = dst->type->base;
+    unsigned long long bw = type_width(base);
     // printf("src_width=%llu dst_wdith=%llu bw=%llu\n",src_width,dst_width,bw);
     first *= bw;
     last *= bw;
@@ -2691,14 +2697,17 @@ Value read_range(Value value, long long first, long long last, Type base,
  *  @param src the source value
  *  @param first the first index of the range
  *  @param last the last index of the range
+ *  @param base the type of the elements
  *  @param dst the destination value
  *  @return dst */
-Value write_range(Value src, long long first, long long last, Value dst) {
+Value write_range(Value src, long long first, long long last, Type base,
+        Value dst) {
     // printf("write_range\n");
     /* Is the value numeric? */
     if ((src->numeric) && (dst->numeric)) {
         /* Yes, do a numeric range read. */
-        return write_range_numeric(src,first,last,dst);
+        // return write_range_numeric(src,first,last,dst);
+        return write_range_numeric(src,first,last,base,dst);
     } else {
         /* No, do a bitstring range read. */
         if (dst->numeric) {
@@ -2708,7 +2717,8 @@ Value write_range(Value src, long long first, long long last, Value dst) {
             /* Need to convert the source to a bitstring. */
             src = set_bitstring_value(src,get_value());
         }
-        return write_range_bitstring(src,first,last,dst);
+        // return write_range_bitstring(src,first,last,dst);
+        return write_range_bitstring(src,first,last,base,dst);
     }
 }
 
@@ -2717,14 +2727,16 @@ Value write_range(Value src, long long first, long long last, Value dst) {
  *  @param src the source value
  *  @param first the first index of the range
  *  @param last the last index of the range
+ *  @param base the type of the elements
  *  @param dst the destination value
  *  @return dst */
-Value write_range_no_z(Value src, long long first, long long last, Value dst) {
+Value write_range_no_z(Value src, long long first, long long last, Type base,
+        Value dst) {
     // printf("write_range_no_z\n");
     /* Is the value numeric? */
     if ((src->numeric) && (dst->numeric)) {
         /* Yes, do a numeric range read. */
-        return write_range_numeric(src,first,last,dst);
+        return write_range_numeric(src,first,last,base,dst);
     } else {
         /* No, do a bitstring range read. */
         if (dst->numeric) {
@@ -2734,7 +2746,8 @@ Value write_range_no_z(Value src, long long first, long long last, Value dst) {
             /* Need to convert the source to a bitstring. */
             src = set_bitstring_value(src,get_value());
         }
-        return write_range_bitstring_no_z(src,first,last,dst);
+        // return write_range_bitstring_no_z(src,first,last,dst);
+        return write_range_bitstring_no_z(src,first,last,base,dst);
     }
 }
 

data/lib/HDLRuby/sim/hruby_sim_core.c

@@ -499,12 +499,18 @@ void transmit_to_signal_range(Value value, RefRangeS ref) {
     SignalI signal = ref.signal;
     unsigned long long first = ref.first;
     unsigned long long last = ref.last;
+    /* The base type is stored here to avoid allocating a new type each time.
+     * It have an arbitrary base size a single element. */
+    static TypeS baseT = { 1, 1 };
+    baseT.base = signal->f_value->type->base;
     // printf("Tansmit to signal range: %s(%p) [%lld:%lld]\n",signal->name,signal,first,last);
     /* Can transmit, copy the content. */
     if (signal->fading)
-        signal->f_value = write_range(value,first,last,signal->f_value);
+        signal->f_value = write_range(value,first,last,&baseT,
+                signal->f_value);
     else
-        signal->f_value = write_range_no_z(value,first,last,signal->f_value);
+        signal->f_value = write_range_no_z(value,first,last,&baseT,
+                signal->f_value);
     /* And touch the signal. */
     touch_signal(signal);
 }
@@ -553,9 +559,9 @@ void transmit_to_signal_range_seq(Value value, RefRangeS ref) {
     // printf("Tansmit to signal range: %s(%p)\n",signal->name,signal);
     /* Can transmit, copy the content. */
     if (signal->fading)
-        write_range(value,first,last,signal->f_value);
+        write_range(value,first,last,signal->f_value->type,signal->f_value);
     else
-        write_range_no_z(value,first,last,signal->f_value);
+        write_range_no_z(value,first,last,signal->f_value->type,signal->f_value);
     /* And touch the signal. */
     touch_signal_seq(signal);
 }

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.3.3"
+  VERSION = "2.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-09 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler