HDLRuby 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 970d857a0599c47d617e6a3d4be7720134a33adc009a3c069332fa198ef05a3f
-  data.tar.gz: a81688812f9a76bf80a56d2d3aabb59caf507dd3cd4897d37ced83c3f2319f03
+  metadata.gz: 586ce6da5943ec0473a7849a515c9a673d3467e1acb5a5214cbccc0794e33848
+  data.tar.gz: fd6d45a53a35154b4936a9e146028e74fa2b351185a6f7f0f87e16b884188a42
 SHA512:
-  metadata.gz: 1b2e23d1c84cb1a7e4e3bcb16b90f409caaa6ded6855b85590ee10de2d378976f44f35612b955b710ed4dc7bd7b316b0a3c2e1a1d1a1b8a74a34051e49b3459b
-  data.tar.gz: 92c75812d649592042da377556762c64aa43d2c2ceca6515f3424cec41c0e79ed2c81880f7e566cb6ea5ffdbb9c6d3f1106ae8c1750b38fe4283e4c5c4f0648b
+  metadata.gz: 9cd1a599cadb487012df47fcce184de6b5eab1d64a631869ad508ce52833ebbaa1320dd692d3657f30e0b8cb50829d001f2529161f0255963969469a1b1338e3
+  data.tar.gz: e71c9dff6b99b9a037b9d8e7a14ca5adb757ca4a21e45481c4816b26e909f92db221e1acdbad1d53ceb65b04f207e3b07b95b0f08745681d856b1eee44f234b5

data/lib/HDLRuby/hruby_low_without_connection.rb

@@ -86,14 +86,28 @@ module HDLRuby::Low
                             outputs_blk.add_statement(
                                 Transmit.new(left.clone,right.clone))
                         else
-                            # puts "left/right is inout"
+                            # # puts "left/right is inout"
+                            # if (left.is_a?(Ref)) then
+                            #     inputs_blk.add_statement(
+                            #         Transmit.new(left.clone,right.clone))
+                            # end
+                            # if (right.is_a?(Ref)) then
+                            #     outputs_blk.add_statement(
+                            #         Transmit.new(right.clone,left.clone))
+                            # end
+                            # Both or neither input/output, make a behavior
+                            # for each.
                             if (left.is_a?(Ref)) then
-                                inputs_blk.add_statement(
+                                blk = Block.new(:par)
+                                blk.add_statement(
                                     Transmit.new(left.clone,right.clone))
+                                scope.add_behavior(Behavior.new(blk))
                             end
                             if (right.is_a?(Ref)) then
-                                outputs_blk.add_statement(
+                                blk = Block.new(:par)
+                                blk.add_statement(
                                     Transmit.new(right.clone,left.clone))
+                                scope.add_behavior(Behavior.new(blk))
                             end
                         end
                     end

data/lib/HDLRuby/hruby_verilog.rb

@@ -1446,7 +1446,7 @@ class If
         # If noif (else if) exists, it outputs it.
         # Since noif is directly under, respond_to is unnecessary.
         self.each_noif do |condition, block|
-            result << "#{"   " * $space_count}   else if (#{condition.to_verilog})\n"
+            result << "#{"   " * $space_count}   else if (#{condition.to_verilog}) begin\n"
             block.each_statement do |statement|
                 result << "#{"   " * $space_count}      #{statement.to_verilog(mode)}"
             end

data/lib/HDLRuby/sim/hruby_sim_calc.c

@@ -585,6 +585,22 @@ static Value sub_value_bitstring(Value src0, Value src1, Value dst) {
 }
 
 
+/** Computes the multiplication 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 mul_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 addition. */
+    dst->data_int = value2integer(src0) * value2integer(src1);
+    return dst;
+}
+
+
 /** Computes the NOT of a bitstring value.
  *  @param src the source value of the not
  *  @param dst the destination value
@@ -1803,8 +1819,14 @@ Value mul_value(Value src0, Value src1, Value dst) {
     if (src0->numeric && src1->numeric) {
         /* Both sources are numeric. */
         return mul_value_numeric(src0,src1,dst);
+    } else if (is_defined_value(src0) && is_defined_value(src1)) {
+        /* Both sources can be converted to numeric values. */
+        return mul_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;

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.2.5"
+  VERSION = "2.2.6"
 end

metadata

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