HDLRuby 3.9.3 → 3.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28b1202930bb068b286b20287846f5c89bbdc4b7a2361aad7719252fa23f72a9
-  data.tar.gz: 612ee6e9bfacfa5f670a138adf77c9924a182f1ea4ad7b48a1c5d25a49aabf89
+  metadata.gz: 2158fa1453147b4f00983a8e182f592a7878a3314fdabb351e79da00c99eb875
+  data.tar.gz: db538f8d85886189c4d309acf9ed6e5e9239e0bbe7a7b380c22a768d20eca52f
 SHA512:
-  metadata.gz: 53a81f6c68706a774377e4b2bb5de7b2c9e0432150c8b98803d26208b1ed195d164d1bbcbe0d9ba9824ed5624d82ccfc35e35b104f251da84300a7b38d255fd2
-  data.tar.gz: 16d7a500401513cd49550d58204497735f70540d09230701a9222fac24c515bb7a7bc10e30a118fc4bcf2a6b49f38578b4ce914abf3e0affdb7bfa6ea93e8e64
+  metadata.gz: 210bf9b4b29db252d1c7364d70aea07473381e8eb5500cf936edae1f01cd67d37cff69e5cff9391b65b6265b3e8261f87ec8335b75cae577379fe70304f0ef78
+  data.tar.gz: 7c4e9e1ff74dcba76224505182b506363f772795a45e1608918d4b60648faed104b3776fdb459964e9900633448bbdb59af6c8259e309d9da329f6834c250f8b

data/README.md

@@ -71,7 +71,14 @@ hdrcc --get-tuto
 
 __What's New__
 
-For HDKRuby version 3.9.2:
+For HDLRuby version 3.9.3/3.9.4/3.9.5:
+
+* Improved the graphical representation of the RTL code in SVG format for faster generation and better rendering. The tool is still experimental though.
+
+* Fixed various bugs.
+
+
+For HDLRuby version 3.9.2:
 
 * Added the `hbreak` command for exiting parallel enumerator loops.
 

data/ext/hruby_sim/hruby_rcsim_build.c

@@ -688,6 +688,7 @@ VALUE rcsim_make_value_numeric(VALUE mod, VALUE typeV, VALUE contentV) {
     /* Get the type. */
     Type type;
     value_to_rcsim(TypeS,typeV,type);
+    // printf("type=%llu\n",type_width(type));
     /* Create the value. */
     Value value = make_value(type,0);
     // printf("value=%p\n",value);
@@ -703,6 +704,28 @@ VALUE rcsim_make_value_numeric(VALUE mod, VALUE typeV, VALUE contentV) {
     return res;
 }
 
+/* Creating a numeric value C object forcing bit 63 to one. */
+VALUE rcsim_make_value_numeric_63one(VALUE mod, VALUE typeV, VALUE contentV) {
+    // printf("rcsim_make_value_numeric_63one\n");
+    /* Get the type. */
+    Type type;
+    value_to_rcsim(TypeS,typeV,type);
+    // printf("type=%llu\n",type_width(type));
+    /* Create the value. */
+    Value value = make_value(type,0);
+    // printf("value=%p\n",value);
+    /* Set it to numeric. */
+    value->numeric = 1;
+    value->capacity = 0;
+    value->data_str = NULL;
+    value->data_int = NUM2LL(contentV) | 0x8000000000000000ULL;
+    // printf("value->data_int=%lld\n",value->data_int);
+    /* Returns the C value embedded into a ruby VALUE. */
+    VALUE res;
+    rcsim_to_value(ValueS,value,res);
+    return res;
+}
+
 
 /* Creating a bitstring value C object. */
 VALUE rcsim_make_value_bitstring(VALUE mod, VALUE typeV, VALUE contentV) {
@@ -1906,6 +1929,7 @@ void Init_hruby_sim() {
     rb_define_singleton_method(mod,"rcsim_make_hcase",rcsim_make_hcase,2);
     rb_define_singleton_method(mod,"rcsim_make_block",rcsim_make_block,1);
     rb_define_singleton_method(mod,"rcsim_make_value_numeric",rcsim_make_value_numeric,2);
+    rb_define_singleton_method(mod,"rcsim_make_value_numeric_63one",rcsim_make_value_numeric_63one,2);
     rb_define_singleton_method(mod,"rcsim_make_value_bitstring",rcsim_make_value_bitstring,2);
     rb_define_singleton_method(mod,"rcsim_make_cast",rcsim_make_cast,2);
     rb_define_singleton_method(mod,"rcsim_make_unary",rcsim_make_unary,3);

data/ext/hruby_sim/hruby_sim_calc.c

@@ -327,6 +327,7 @@ Value copy_value(Value src, Value dst) {
     /* Copy the data. */
     if (src->numeric) {
         /* Numeric copy. */
+        // printf("copy_value with data_in: %llu\n", src->data_int);
         dst->data_int = fix_numeric_type(dst->type,src->data_int);
     } else {
         // printf("copy_value with bit string: %.*s\n",src->capacity,src->data_str);
@@ -2166,7 +2167,6 @@ fix_numeric_type(Type type, unsigned long long val) {
     if (type->flags.sign) {
         /* Yes, perform sign extension. */
         int is_neg = (val >> (width-1)) & 1;
-        // printf("is_neg=%i\n",is_neg);
         if (is_neg) {
             /* Negative sign extension. */
             return val | mask;

data/lib/HDLRuby/hdr_samples/constant_prop_bench.rb

@@ -16,8 +16,8 @@ system :dff_bench do
     [8].inner :count
     [8].constant inc: 5
 
-    # counter(:my_counter).(clk,rst,inc,count)
-    counter(:my_counter).(clk,rst,5,count)
+    counter(:my_counter).(clk,rst,inc,count)
+    # counter(:my_counter).(clk,rst,5,count)
 
     # par do
     #     my_counter.inc <= 5

data/lib/HDLRuby/hruby_high.rb

@@ -5604,7 +5604,7 @@ module HDLRuby::High
                 # Check the value
                 return nil unless value.match(/^[0-9]+$/)
                 # Compute it (base 10 values cannot be 4-state!)
-                value = value.to_i.to_s(2)
+                value = value.to_i.to_s(2).rjust(width,"0")
             when "h" then
                 # base 16, compute the width
                 width = width ? width.to_i : value.size * 4

data/lib/HDLRuby/hruby_low_split_signals.rb

@@ -156,7 +156,7 @@ module HDLRuby::Low
               blk = self.block
               sig = blk ? blk.get_signal_up(expr.ref.name) : 
                 self.scope.get_signal_up(expr.ref.name)
-              sig.split_to_index(expr,expr.index,res)
+              sig.split_to_index(expr,expr.index,res) if sig
             elsif expr.is_a?(RefRange) and expr.ref.is_a?(RefName) and
               expr.range.first.is_a?(Value) and
               expr.range.last.is_a?(Value) then
@@ -164,7 +164,7 @@ module HDLRuby::Low
               blk = self.block
               sig = blk ? blk.get_signal_up(expr.ref.name) : 
                 self.scope.get_signal_up(expr.ref.name)
-              sig.split_to_range(expr,expr.range,res)
+              sig.split_to_range(expr,expr.range,res) if sig
             end
           end
         end

data/lib/HDLRuby/hruby_rcsim.rb

@@ -904,8 +904,13 @@ module HDLRuby::High
                         return RCSim.rcsim_make_value_numeric(self.type.to_rcsim,
                                                               self.content)
                     else
+                      if (self.content >= 0 and self.content & 0x8000_0000_0000_0000 == 0) then
                         return RCSim.rcsim_make_value_numeric(self.type.to_rcsim,
-                                                              self.content & 0xFFFFFFFFFFFF)
+                                                              self.content & 0x7FFF_FFFF_FFFF_FFFF)
+                      else
+                        return RCSim.rcsim_make_value_numeric_63one(self.type.to_rcsim,
+                                                              self.content & 0x7FFF_FFFF_FFFF_FFFF)
+                      end
                     end
                 else
                     if self.content < 0 then