HDLRuby 2.6.25 → 2.7.11

data/lib/HDLRuby/sim/hruby_sim_core.c

@@ -108,7 +108,7 @@ void register_signal(SignalI signal) {
 /** Recursively update the signals until no (untimed) behavior are
  *  activated. */
 void hruby_sim_update_signals() {
-    // printf("hruby_sim_update_signals...\n");
+     // printf("hruby_sim_update_signals...\n");
     /* As long as the list of touched signals is not empty go on computing. */
     while(!empty_list(touched_signals) || !empty_list(touched_signals_seq)) {
         // printf("## Checking touched signals.\n");
@@ -121,7 +121,6 @@ void hruby_sim_update_signals() {
             /* Is there a change? */
             if (same_content_value(sig->c_value,sig->f_value)) continue;
             /* Yes, process the signal. */
-            // println_signal(sig);
             printer.print_signal(sig);
             // printf("c_value="); printer.print_value(sig->c_value);
             // printf("\nf_value="); printer.print_value(sig->f_value); printf("\n");
@@ -441,6 +440,10 @@ void hruby_sim_core(char* name, void (*init_vizualizer)(char*),
         /* Update the signal values (recursively executing blocks locked
          * on the signals). */
         hruby_sim_update_signals(); 
+        if (hruby_sim_time == 0) {
+            /* Initially touch all the signals. */
+            each_all_signal(&touch_signal);
+        }
         if (num_run_behaviors <= 0) break;
         /* Advance time to next timestep. */
         hruby_sim_advance_time();

data/lib/HDLRuby/sim/hruby_sim_stack_calc.c

@@ -27,6 +27,17 @@ void push(Value val) {
     }
 }
 
+/** Duplicates a value in the stack. */
+void dup() {
+    if (head > 0 && head < STACK_SIZE) {
+        Value val = stack[head];
+        stack[--head] = val;
+    } else {
+        perror("Cannot dup in computation stack.\n");
+        exit(1);
+    }
+}
+
 /** Pops a value.
  *  @return the value. */
 Value pop() {
@@ -38,6 +49,17 @@ Value pop() {
     }
 }
 
+/** Access the top value of the stack without removing it.
+ *  @return the value. */
+Value peek() {
+    if (head < STACK_SIZE) {
+        return stack[head];
+    } else {
+        perror("Computation stack empty.\n");
+        exit(1);
+    }
+}
+
 /** Pops multiple values.
  *  @param num the number of values to pop.
  *  @return a pointer on the first value (in heap order!). */
@@ -58,10 +80,11 @@ static Value* popn(int num) {
  **/
 Value unary(Value (*oper)(Value,Value)) {
     // printf("unary\n");
-    Value dst = get_top_value();
-    dst = oper(pop(),dst);
-    push(dst);
-    return dst;
+    // Value dst = get_top_value();
+    // dst = oper(pop(),dst);
+    // push(dst);
+    // return dst;
+    return oper(pop(),peek());
 }
 
 /** Binary calculation.
@@ -70,12 +93,15 @@ Value unary(Value (*oper)(Value,Value)) {
  **/
 Value binary(Value (*oper)(Value,Value,Value)) {
     // printf("binary\n");
-    Value dst = get_top_value();
+    // Value dst = get_top_value();
+    // Value r = pop();
+    // Value l = pop();
+    // dst = oper(l,r,dst);
+    // push(dst);
+    // return dst;
     Value r = pop();
     Value l = pop();
-    dst = oper(l,r,dst);
-    push(dst);
-    return dst;
+    return oper(l,r,peek());
 }
 
 /** Cast calculation.
@@ -84,72 +110,93 @@ Value binary(Value (*oper)(Value,Value,Value)) {
  **/
 Value cast(Type typ) {
     // printf("cast\n"); 
-    Value dst = get_top_value();
-    Value src = pop();
-    dst = cast_value(src,typ,dst);
-    push(dst);
-    return dst;
+    // Value dst = get_top_value();
+    // Value src = pop();
+    // dst = cast_value(src,typ,dst);
+    // push(dst);
+    // return dst;
+    return cast_value(pop(),typ,peek());
 }
 
 /* Concat values.
  * @param num the number of values to concat.
  * @param dir the direction. */
 Value sconcat(int num, int dir) {
+    // Value* vals = alloca(num*sizeof(Value));
+    // Value dst = get_top_value();
+    // int i;
+    // // printf("sconcat\n");
+    // /* Get the values to concat from the stack. */
+    // for(i=1;i<=num;++i) vals[num-i] = pop();
+    // dst = concat_valueP(num,dir,dst,vals);
+    // push(dst);
+    // return dst;
     Value* vals = alloca(num*sizeof(Value));
-    Value dst = get_top_value();
     int i;
     // printf("sconcat\n");
     /* Get the values to concat from the stack. */
     for(i=1;i<=num;++i) vals[num-i] = pop();
-    dst = concat_valueP(num,dir,dst,vals);
-    push(dst);
-    return dst;
+    return concat_valueP(num,dir,peek(),vals);
 }
 
 /* Index read calculation.
  * @param typ the data type of the access. */
 Value sreadI(Type typ) {
+    // // printf("sreadI\n");
+    // Value dst = get_top_value();
+    // unsigned long long idx = value2integer(pop());
+    // dst = read_range(pop(),idx,idx,typ,dst);
+    // push(dst);
+    // return dst;
     // printf("sreadI\n");
-    Value dst = get_top_value();
     unsigned long long idx = value2integer(pop());
-    dst = read_range(pop(),idx,idx,typ,dst);
-    push(dst);
-    return dst;
+    return read_range(pop(),idx,idx,typ,peek());
 }
 
 /* Index write calculation.
  * @param typ the data type of the access. */
 Value swriteI(Type typ) {
+    // // printf("swriteI\n");
+    // Value dst = get_top_value();
+    // unsigned long long idx = value2integer(pop());
+    // dst = write_range(pop(),idx,idx,typ,dst);
+    // push(dst);
+    // return dst;
     // printf("swriteI\n");
-    Value dst = get_top_value();
     unsigned long long idx = value2integer(pop());
-    dst = write_range(pop(),idx,idx,typ,dst);
-    push(dst);
-    return dst;
+    return write_range(pop(),idx,idx,typ,peek());
 }
 
 /* Range read calculation.
  * @param typ the data type of the access. */
 Value sreadR(Type typ) {
+    // // printf("sreadR\n");
+    // Value dst = get_top_value();
+    // unsigned long long last = value2integer(pop());
+    // unsigned long long first = value2integer(pop());
+    // dst = read_range(pop(),first,last,typ,dst);
+    // push(dst);
+    // return dst;
     // printf("sreadR\n");
-    Value dst = get_top_value();
     unsigned long long last = value2integer(pop());
     unsigned long long first = value2integer(pop());
-    dst = read_range(pop(),first,last,typ,dst);
-    push(dst);
-    return dst;
+    return read_range(pop(),first,last,typ,peek());
 }
 
 /* Range write calculation.
  * @param typ the data type of the access. */
 Value swriteR(Type typ) {
+    // // printf("swriteR\n");
+    // Value dst = get_top_value();
+    // unsigned long long last = value2integer(pop());
+    // unsigned long long first = value2integer(pop());
+    // dst = write_range(pop(),first,last,typ,dst);
+    // push(dst);
+    // return dst;
     // printf("swriteR\n");
-    Value dst = get_top_value();
     unsigned long long last = value2integer(pop());
     unsigned long long first = value2integer(pop());
-    dst = write_range(pop(),first,last,typ,dst);
-    push(dst);
-    return dst;
+    return write_range(pop(),first,last,typ,peek());
 }
 
 /** Check if the top value is defined. */

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.6.25"
+  VERSION = "2.7.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.6.25
+  version: 2.7.11
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-02 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,11 +125,13 @@ files:
 - lib/HDLRuby/hdr_samples/neural/selector.rb
 - lib/HDLRuby/hdr_samples/neural/sigmoid.rb
 - lib/HDLRuby/hdr_samples/neural/z.rb
+- lib/HDLRuby/hdr_samples/parseq_bench.rb
 - lib/HDLRuby/hdr_samples/prog.obj
 - lib/HDLRuby/hdr_samples/ram.rb
 - lib/HDLRuby/hdr_samples/range_bench.rb
 - lib/HDLRuby/hdr_samples/register_with_code_bench.rb
 - lib/HDLRuby/hdr_samples/rom.rb
+- lib/HDLRuby/hdr_samples/rom_nest.rb
 - lib/HDLRuby/hdr_samples/ruby_fir_hw.rb
 - lib/HDLRuby/hdr_samples/seqpar_bench.rb
 - lib/HDLRuby/hdr_samples/struct.rb
@@ -142,6 +144,7 @@ files:
 - lib/HDLRuby/hdr_samples/type_minmax_bench.rb
 - lib/HDLRuby/hdr_samples/with_casts.rb
 - lib/HDLRuby/hdr_samples/with_channel.rb
+- lib/HDLRuby/hdr_samples/with_channel_other.rb
 - lib/HDLRuby/hdr_samples/with_class.rb
 - lib/HDLRuby/hdr_samples/with_concat.rb
 - lib/HDLRuby/hdr_samples/with_connector.rb
@@ -150,6 +153,8 @@ files:
 - lib/HDLRuby/hdr_samples/with_fixpoint.rb
 - lib/HDLRuby/hdr_samples/with_fsm.rb
 - lib/HDLRuby/hdr_samples/with_function_generator.rb
+- lib/HDLRuby/hdr_samples/with_init.rb
+- lib/HDLRuby/hdr_samples/with_instance.rb
 - lib/HDLRuby/hdr_samples/with_linear.rb
 - lib/HDLRuby/hdr_samples/with_loop.rb
 - lib/HDLRuby/hdr_samples/with_memory.rb
@@ -157,9 +162,12 @@ files:
 - lib/HDLRuby/hdr_samples/with_multi_channels.rb
 - lib/HDLRuby/hdr_samples/with_reconf.rb
 - lib/HDLRuby/hdr_samples/with_reduce.rb
+- lib/HDLRuby/hdr_samples/with_ref_array.rb
 - lib/HDLRuby/hdr_samples/with_str2value.rb
+- lib/HDLRuby/hdr_samples/with_subsums.rb
 - lib/HDLRuby/hdr_samples/with_to_a.rb
 - lib/HDLRuby/hdr_samples/with_to_array.rb
+- lib/HDLRuby/hdr_samples/with_values.rb
 - lib/HDLRuby/hdrcc.rb
 - lib/HDLRuby/high_samples/_adder_fault.rb
 - lib/HDLRuby/high_samples/_generic_transmission2.rb