HDLRuby 2.7.5 → 2.9.0

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");
@@ -254,8 +253,8 @@ void hruby_sim_update_signals() {
             if (obj->kind == BEHAVIOR) {
                 /* Behavior case. */
                 Behavior beh = (Behavior)obj;
-                /* Is the code really activated? */
-                if (beh->activated) {
+                /* Is the code really enabled and activated? */
+                if (beh->enabled && beh->activated) {
                     /* Yes, execute it. */
                     beh->block->function();
                     /* And deactivate it. */
@@ -265,7 +264,7 @@ void hruby_sim_update_signals() {
                 /* Other code case. */
                 Code cod = (Code)obj;
                 /* Is the code really activated? */
-                if (cod->activated) {
+                if (cod->enabled && cod->activated) {
                     /* Yes, execute it. */
                     cod->function();
                     /* And deactivate it. */
@@ -295,6 +294,35 @@ void hruby_sim_advance_time() {
 }
 
 
+/** Sets the enamble status of the behaviors of a scope.
+ *  @param scope the scope to process.
+ *  @param status the enable status. */
+static void set_enable_scope(Scope scope, int status) {
+    int i;
+    int num_beh = scope->num_behaviors;
+    Behavior*  behs = scope->behaviors;
+    int num_scp = scope->num_scopes;
+    Scope* scps = scope->scopes;
+
+    /* Enable the behaviors. */
+    for(i=0; i<num_beh; ++i) {
+        behs[i]->enabled = status;
+    }
+
+    /* Recurse on the sub scopes. */
+    for(i=0; i<num_scp; ++i) {
+        set_enable_scope(scps[i],status);
+    }
+}
+
+/** Sets the enable status of the behaviors of a system type. 
+ *  @param systemT the system type to process.
+ *  @param status the enable status. */
+void set_enable_system(SystemT systemT, int status) {
+    set_enable_scope(systemT->scope,status);
+}
+
+
 /** Activates a behavior.
  *  @param behavior the behavior to activate. */
 void activate_behavior(Behavior behavior) {
@@ -360,7 +388,8 @@ void* behavior_run(void* arg) {
     pthread_mutex_unlock(&hruby_sim_mutex);
     // printf("#2\n");
     /* Now can start the execution of the behavior. */
-    behavior->block->function();
+    if (behavior->enabled)
+        behavior->block->function();
     // printf("#3\n");
     /* Now can start the execution of the behavior. */
     /* Stops the behavior. */
@@ -441,6 +470,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();
@@ -632,11 +665,35 @@ unsigned long long make_delay(int value, Unit unit) {
 
 
 
-/* Iterate over all the signals.
- * @param func function to applie on each signal. */
+/** Iterates over all the signals.
+ *  @param func function to applie on each signal. */
 void each_all_signal(void (*func)(SignalI)) {
     int i;
     for(i = 0; i<num_all_signals; ++i) {
         func(all_signals[i]);
     }
 }
+
+
+/** Configure a system instance.
+ *  @param systemI the system instance to configure.
+ *  @param idx the index of the target system. */
+void configure(SystemI systemI, int idx) {
+    int i;
+    // printf("Configure to: %i\n",idx);
+    /* Sets the current system type. */
+    systemI->system = systemI->systems[idx];
+    /* Disable all the behaviors of the system instance. */
+    for(i=0; i<systemI->num_systems; ++i) {
+        if (i != idx)
+            set_enable_system(systemI->systems[i],0);
+    }
+    /* Enable the current system. */
+    set_enable_system(systemI->systems[idx],1);
+}
+
+
+/** Terminates the simulation. */
+void terminate() {
+    exit(0);
+}

data/lib/HDLRuby/sim/hruby_sim_vcd.c

@@ -85,7 +85,7 @@ static void vcd_print_name(Object object) {
                 vcd_print("%s",name);
             } else {
                 /* No name, use the address of the object as name generator.*/
-                vcd_print("$%p",(void*)object);
+                vcd_print("x$%p",(void*)object);
             }
             break;
         default: /* Nothing to do */

data/lib/HDLRuby/std/reconf.rb

@@ -8,6 +8,9 @@ module HDLRuby::High::Std
     ## Describes a high-level reconfigurable component type.
     class ReconfT
 
+        extend Gem::Deprecate
+        deprecate :initialize, Configure, 2022, 3
+
         # The name of the reconfigurable component type.
         attr_reader :name
 

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.7.5"
+  VERSION = "2.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.9.0
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,7 @@ files:
 - lib/HDLRuby/hdr_samples/adder_assign_error.rb
 - lib/HDLRuby/hdr_samples/adder_bench.rb
 - lib/HDLRuby/hdr_samples/adder_gen.rb
+- lib/HDLRuby/hdr_samples/adder_gen_gen.rb
 - lib/HDLRuby/hdr_samples/adder_kadai.rb
 - lib/HDLRuby/hdr_samples/adder_nodef_error.rb
 - lib/HDLRuby/hdr_samples/addsub.rb
@@ -125,11 +126,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,11 +145,13 @@ 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
 - lib/HDLRuby/hdr_samples/with_connector_memory.rb
 - lib/HDLRuby/hdr_samples/with_decoder.rb
+- lib/HDLRuby/hdr_samples/with_def.rb
 - lib/HDLRuby/hdr_samples/with_fixpoint.rb
 - lib/HDLRuby/hdr_samples/with_fsm.rb
 - lib/HDLRuby/hdr_samples/with_function_generator.rb
@@ -157,11 +162,13 @@ files:
 - lib/HDLRuby/hdr_samples/with_memory.rb
 - lib/HDLRuby/hdr_samples/with_memory_rom.rb
 - lib/HDLRuby/hdr_samples/with_multi_channels.rb
+- lib/HDLRuby/hdr_samples/with_of.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_terminate.rb
 - lib/HDLRuby/hdr_samples/with_to_a.rb
 - lib/HDLRuby/hdr_samples/with_to_array.rb
 - lib/HDLRuby/hdr_samples/with_values.rb