redshift 1.3.21 → 1.3.22

data/lib/redshift/target/c/flow/expr.rb

@@ -1,32 +1,31 @@
 module RedShift; class CexprGuard
-
   def initialize f
     super nil, f
   end
   
-  @@serial = 0
+  @@serial = Hash.new(0)
   
-  # +cl+ is the component class
-  ## maybe all these methods should just be called wrapper?
-  def guard_wrapper cl
-    guard = self
-    cl_cname = CGenerator.make_c_name cl.name
-    g_cname = "Guard_#{@@serial}"; @@serial += 1
-    guard_name = "guard_#{cl_cname}_#{g_cname}"
-    
-    Component::GuardWrapper.make_subclass guard_name do
-      @inspect_str = "#{cl.name}: #{guard.formula}"
+  def make_generator cl
+    @fname = "guard_#{CGenerator.make_c_name cl.name}_#{@@serial[cl]}"
+    @@serial[cl] += 1
+    @inspect_str = "#{cl.name}: #{formula}"
  
-      ssn = cl.shadow_struct.name
-      cont_state_ssn = cl.cont_state_class.shadow_struct.name
+    @generator = proc do
+      sl = cl.shadow_library
+      ssn = cl.shadow_struct_name
+      cont_state_ssn = cl.cont_state_class.shadow_struct_name
+      
+      include_file, source_file = sl.add_file fname
       
       # We need the struct
-      shadow_library_source_file.include(cl.shadow_library_include_file)
+      source_file.include(cl.shadow_library_include_file)
       
       strict = false
       
-      shadow_library_source_file.define(guard_name).instance_eval do
+      guard = self
+      source_file.define(fname).instance_eval do
         arguments "ComponentShadow *comp_shdw"
+        scope:extern
         return_type "int"
         declare :shadow => %{
           struct #{ssn} *shadow;
@@ -35,23 +34,21 @@ module RedShift; class CexprGuard
         }
         setup :shadow => %{
           shadow = (#{ssn} *)comp_shdw;
-          cont_state = (#{cont_state_ssn} *)shadow->cont_state;
+          cont_state = (struct #{cont_state_ssn} *)shadow->cont_state;
         }
         declare :result => "int result"
-        translation = guard.translate(self, "result", 0, cl) {|s| strict = s}
+        translation = guard.translate(self, "result", cl, 0) {|s| strict = s}
         body %{
           #{translation.join("
           ")};
           return result;
         }
       end
-      
+
+      s = strict ? "STRICT" : "NONSTRICT"
+      sl.init_library_function.body \
+        "s_init_guard(#{fname}, #{fname.inspect}, #{inspect_str.inspect}, #{s});"
       @strict = strict
-      ## should set guard.strict = strict too?
-      
-      define_c_method :calc_function_pointer do
-        body "shadow->guard = &#{guard_name}"
-      end
     end
   end
 end; end
@@ -64,26 +61,30 @@ module RedShift; class Expr
     @type = type
   end
   
-  @@serial = 0
+  @@serial = Hash.new(0)
   
-  # +cl+ is the component class
-  def wrapper(cl)
-    expr = self
-    cl_cname = CGenerator.make_c_name cl.name
-    ex_cname = "Expr_#{@@serial}"; @@serial += 1
-    expr_name = "expr_#{cl_cname}_#{ex_cname}"
+  def make_generator cl
+    @fname = "expr_#{CGenerator.make_c_name cl.name}_#{@@serial[cl]}"
+    @@serial[cl] += 1
+    @inspect_str = "#{cl.name}: #{formula}"
     
-    Component::ExprWrapper.make_subclass expr_name do
-      @inspect_str = "#{cl.name}: #{expr.formula}"
+    @generator = proc do
+      sl = cl.shadow_library
+      ssn = cl.shadow_struct_name
+      cont_state_ssn = cl.cont_state_class.shadow_struct_name
+
+      sl.init_library_function.body \
+        "s_init_expr(#{fname}, #{fname.inspect}, #{inspect_str.inspect});"
 
-      ssn = cl.shadow_struct.name
-      cont_state_ssn = cl.cont_state_class.shadow_struct.name
+      include_file, source_file = sl.add_file fname
       
       # We need the struct
-      shadow_library_source_file.include(cl.shadow_library_include_file)
+      source_file.include(cl.shadow_library_include_file)
       
-      shadow_library_source_file.define(expr_name).instance_eval do
+      expr = self
+      source_file.define(fname).instance_eval do
         arguments "ComponentShadow *comp_shdw"
+        scope:extern
         return_type expr.type
         declare :shadow => %{
           struct #{ssn} *shadow;
@@ -92,20 +93,16 @@ module RedShift; class Expr
         }
         setup :shadow => %{
           shadow = (#{ssn} *)comp_shdw;
-          cont_state = (#{cont_state_ssn} *)shadow->cont_state;
+          cont_state = (struct #{cont_state_ssn} *)shadow->cont_state;
         }
         declare :result => "#{expr.type} result"
-        translation = expr.translate(self, "result", 0, cl)
+        translation = expr.translate(self, "result", cl, 0)
         body %{
           #{translation.join("
           ")};
           return result;
         }
       end
-      
-      define_c_method :calc_function_pointer do
-        body "shadow->expr = &#{expr_name}"
-      end
     end
   end
 end; end

data/lib/redshift/target/c/flow/rk4.rb

@@ -1,21 +1,26 @@
 module RedShift; class RK4DifferentialFlow
-  def flow_wrapper cl, state
-    var_name = @var
-    flow = self
-    
-    flow_name = "flow_#{CGenerator.make_c_name cl.name}_#{var_name}_#{state}"
-    
-    Component::FlowWrapper.make_subclass flow_name do
-      @inspect_str = "#{cl.name}:#{state}: #{var_name} = #{flow.formula}"
+  def make_generator cl, state
+    @fname = "flow_#{CGenerator.make_c_name cl.name}_#{var}_#{state}"
+    @inspect_str = "#{cl.name}:#{state}: #{var} = #{formula}"
 
-      ssn = cl.shadow_struct.name
-      cont_state_ssn = cl.cont_state_class.shadow_struct.name
+    @generator = proc do
+      sl = cl.shadow_library
+      ssn = cl.shadow_struct_name
+      cont_state_ssn = cl.cont_state_class.shadow_struct_name
+
+      sl.init_library_function.body \
+        "s_init_flow(#{fname}, #{fname.inspect}, #{inspect_str.inspect}, NONALGEBRAIC);"
+
+      include_file, source_file = sl.add_file fname
       
       # We need the struct
-      shadow_library_source_file.include(cl.shadow_library_include_file)
+      source_file.include(cl.shadow_library_include_file)
       
-      shadow_library_source_file.define(flow_name).instance_eval do
+      flow = self
+      var_name = @var
+      source_file.define(fname).instance_eval do
         arguments "ComponentShadow *comp_shdw"
+        scope :extern
         declare :shadow => %{
           struct #{ssn} *shadow;
           struct #{cont_state_ssn} *cont_state;
@@ -26,7 +31,7 @@ module RedShift; class RK4DifferentialFlow
         }
         setup :shadow => %{
           shadow = (#{ssn} *)comp_shdw;
-          cont_state = (#{cont_state_ssn} *)shadow->cont_state;
+          cont_state = (struct #{cont_state_ssn} *)shadow->cont_state;
           var = &cont_state->#{var_name};
           time_step = shadow->world->time_step;
         }
@@ -34,32 +39,27 @@ module RedShift; class RK4DifferentialFlow
           shadow->world->rk_level--;
         } # has to happen before referenced alg flows are called in other setups
         body %{
+          #{flow.translate(self, "ddt_#{var_name}", cl).join("
+          ")};
+
           switch (shadow->world->rk_level) {
           case 0:
-            #{flow.translate(self, "ddt_#{var_name}", 0, cl).join("
-            ")};
-            var->value_1 = var->value_0 + ddt_#{var_name} * time_step/2;
+            var->value[1] = var->value[0] + ddt_#{var_name} * time_step/2;
             break;
 
           case 1:
-            #{flow.translate(self, "ddt_#{var_name}", 1, cl).join("
-            ")};
-            var->value_2 = var->value_0 + ddt_#{var_name} * time_step/2;
+            var->value[2] = var->value[0] + ddt_#{var_name} * time_step/2;
             break;
 
           case 2:
-            #{flow.translate(self, "ddt_#{var_name}", 2, cl).join("
-            ")};
-            var->value_3 = var->value_0 + ddt_#{var_name} * time_step;
+            var->value[3] = var->value[0] + ddt_#{var_name} * time_step;
             break;
 
           case 3:
-            #{flow.translate(self, "ddt_#{var_name}", 3, cl).join("
-            ")};
-            value_4 = var->value_0 + ddt_#{var_name} * time_step;
-            var->value_0 = 
-              (-3*var->value_0 + 2*var->value_1 + 4*var->value_2 +
-                2*var->value_3 + value_4) / 6;
+            value_4 = var->value[0] + ddt_#{var_name} * time_step;
+            var->value[0] =
+              (-3*var->value[0] + 2*var->value[1] + 4*var->value[2] +
+                2*var->value[3] + value_4) / 6;
             break;
 
           default:
@@ -71,10 +71,6 @@ module RedShift; class RK4DifferentialFlow
           var->rk_level = shadow->world->rk_level;
         }
       end
-
-      define_c_method :calc_function_pointer do
-        body "shadow->flow = &#{flow_name}"
-      end
     end
   end
 end; end

data/lib/redshift/target/c/library.rb

@@ -12,14 +12,7 @@ module RedShift
       super
       
       self.purge_source_dir = :delete
-      
-      self.show_times_flag =
-        case $REDSHIFT_BUILD_TIMES
-        when nil, false, /\A(false|0*)\z/i
-          false
-        else
-          true
-        end
+      self.show_times_flag = $REDSHIFT_BUILD_TIMES
 
       if $REDSHIFT_DEBUG
         include_file.include "<assert.h>"
@@ -89,6 +82,7 @@ module RedShift
     def precommit
       ## no need to precommit Component? Other abstract classes?
       component_classes.each {|cl| cl.precommit}
+      component_classes.each {|cl| cl.generate_wrappers}
       ## optimization?
       ## check if changed
     end

data/lib/redshift/target/c/world-gen.rb

@@ -90,6 +90,10 @@ class World
   shadow_attr_accessor :rk_level      => "long     rk_level"
   shadow_attr_accessor :d_tick        => "long     d_tick"
   shadow_attr_accessor :alg_nest      => "long     alg_nest"
+  shadow_attr_accessor :input_depth_limit =>
+                                         "long     input_depth_limit"
+  shadow_attr_accessor :alg_depth_limit =>
+                                         "long     alg_depth_limit"
   
   shadow_attr_accessor :base_clock    => "double   base_clock"
   shadow_attr_accessor :base_step_count =>
@@ -209,7 +213,7 @@ class World
           while (var < end_var) {
             var->rk_level = 0;
             if (!var->flow) {
-              var->value_1 = var->value_2 = var->value_3 = var->value_0;
+              var->value[1] = var->value[2] = var->value[3] = var->value[0];
             }
             var++;
           }
@@ -377,7 +381,7 @@ class World
           move_comp(l->ptr[l->len-1], list, next_list);
       }
       inline static void remove_comp(VALUE comp, VALUE list,
-                                   #{World.shadow_struct.name} *shadow)
+                                   #{World.shadow_struct_name} *shadow)
       {
         ComponentShadow *comp_shdw = get_shadow(comp);
         assert(RARRAY(list)->ptr[RARRAY(list)->len-1] == comp);
@@ -390,7 +394,7 @@ class World
       {
         double (*fn)(ComponentShadow *), rslt;
         assert(rb_obj_is_kind_of(expr, ExprWrapperClass));
-        fn = ((#{RedShift::Component::ExprWrapper.shadow_struct.name} *)
+        fn = ((#{RedShift::Component::ExprWrapper.shadow_struct_name} *)
                get_shadow(expr))->expr;
         rslt = (*fn)(get_shadow(comp));
         return rslt;
@@ -400,7 +404,8 @@ class World
         ComponentShadow *(*fn)(ComponentShadow *);
         ComponentShadow *rslt;
         assert(rb_obj_is_kind_of(expr, ExprWrapperClass));
-        fn = ((#{RedShift::Component::ExprWrapper.shadow_struct.name} *)
+        fn = (ComponentShadow *(*)(ComponentShadow *))
+          ((#{RedShift::Component::ExprWrapper.shadow_struct_name} *)
                get_shadow(expr))->expr;
         rslt = (*fn)(get_shadow(comp));
         return rslt;
@@ -409,7 +414,7 @@ class World
       {
         int (*fn)(ComponentShadow *), rslt;
         assert(rb_obj_is_kind_of(guard, GuardWrapperClass));
-        fn = ((#{RedShift::Component::GuardWrapper.shadow_struct.name} *)
+        fn = ((#{RedShift::Component::GuardWrapper.shadow_struct_name} *)
                get_shadow(guard))->guard;
         rslt = (*fn)(get_shadow(comp));
         return rslt;
@@ -459,15 +464,6 @@ class World
               }
               break;
 
-            case T_CLASS:
-              assert(RTEST(rb_funcall(guard, #{declare_symbol "<"},
-                1, GuardWrapperClass)));
-              guard = rb_funcall(guard, #{declare_symbol :instance}, 0);
-              RARRAY(guards)->ptr[i] = guard;
-              if (!test_cexpr_guard(comp, guard))
-                return 0;
-              break;
-
             default:
               assert(0);
             }
@@ -477,7 +473,7 @@ class World
       }
       
       inline static int comp_can_sync(ComponentShadow *comp_shdw,
-               #{World.shadow_struct.name} *shadow)
+               #{World.shadow_struct_name} *shadow)
       {
         int i, j;
         int can_sync = 1;
@@ -523,7 +519,7 @@ class World
       }
       
       inline static int eval_events(ComponentShadow *comp_shdw,
-               #{World.shadow_struct.name} *shadow)
+               #{World.shadow_struct_name} *shadow)
       {
         VALUE events = cur_events(comp_shdw);
         int has_events = RTEST(events);
@@ -557,7 +553,7 @@ class World
       
       inline static void cache_new_constant_value(
         double *dbl_ptr, double value,
-               #{World.shadow_struct.name} *shadow)
+               #{World.shadow_struct_name} *shadow)
       {
         CVCacheEntry *entry;
         
@@ -586,7 +582,7 @@ class World
       }
       
       inline static int assign_new_constant_values(
-        #{World.shadow_struct.name} *shadow)
+        #{World.shadow_struct_name} *shadow)
       {
         int did_reset = shadow->cv_cache_used;
 
@@ -606,7 +602,7 @@ class World
       
       inline static void cache_new_link(
         ComponentShadow **link_ptr, VALUE value,
-               #{World.shadow_struct.name} *shadow)
+               #{World.shadow_struct_name} *shadow)
       {
         LinkCacheEntry *entry;
         
@@ -634,7 +630,7 @@ class World
       }
       
       inline static int assign_new_links(
-        #{World.shadow_struct.name} *shadow)
+        #{World.shadow_struct_name} *shadow)
       {
         int did_reset = shadow->link_cache_used;
         
@@ -658,7 +654,7 @@ class World
       }
       
       inline static void cache_new_port(VALUE input_port, VALUE other_port,
-               #{World.shadow_struct.name} *shadow)
+               #{World.shadow_struct_name} *shadow)
       {
         PortCacheEntry *entry;
         
@@ -686,7 +682,7 @@ class World
       }
       
       inline static int assign_new_ports(
-        #{World.shadow_struct.name} *shadow)
+        #{World.shadow_struct_name} *shadow)
       {
         int did_reset = shadow->port_cache_used;
         
@@ -706,7 +702,7 @@ class World
       }
       
       inline static int eval_continuous_resets(ComponentShadow *comp_shdw,
-                              #{World.shadow_struct.name} *shadow)
+                              #{World.shadow_struct_name} *shadow)
       {
         VALUE   resets          = cur_resets(comp_shdw);
         VALUE   cont_resets;
@@ -770,7 +766,7 @@ class World
               //%%   rb_funcall(comp_shdw->cont_state->self,//
               //%%              #{declare_symbol :var_at_index},1,INT2NUM(i)),
               //%%   rb_float_new(new_value));
-              var->value_1 = new_value;
+              var->value[1] = new_value;
               var->reset = 1;
             }
           }
@@ -780,7 +776,7 @@ class World
       }
 
       inline static int eval_constant_resets(ComponentShadow *comp_shdw,
-               #{World.shadow_struct.name} *shadow)
+               #{World.shadow_struct_name} *shadow)
       {
         VALUE     resets            = cur_resets(comp_shdw);
         VALUE     const_resets;
@@ -879,7 +875,7 @@ class World
       }
       
       inline static int eval_port_connects(ComponentShadow *comp_shdw,
-               #{World.shadow_struct.name} *shadow)
+               #{World.shadow_struct_name} *shadow)
       {
         VALUE     connects    = cur_connects(comp_shdw);
 
@@ -937,7 +933,7 @@ class World
         for (i = len; i > 0; i--, var++) {
           if (var->reset) {
             var->reset = 0;
-            var->value_0 = var->value_1;
+            var->value[0] = var->value[1];
             did_reset = 1;
           }
         }
@@ -945,7 +941,7 @@ class World
       }
 
       inline static void do_actions(ComponentShadow *comp_shdw, VALUE actions,
-                              #{World.shadow_struct.name} *shadow)
+                              #{World.shadow_struct_name} *shadow)
       {
         long  i;
         VALUE comp    = comp_shdw->self;
@@ -969,7 +965,7 @@ class World
       }
 
       inline static void update_all_alg_vars(ComponentShadow *comp_shdw,
-                              #{World.shadow_struct.name} *shadow)
+                              #{World.shadow_struct_name} *shadow)
       {
         ContVar    *vars = (ContVar *)&FIRST_CONT_VAR(comp_shdw);
         long        count = comp_shdw->var_count;
@@ -985,7 +981,7 @@ class World
       }
       
       inline static void start_trans(ComponentShadow *comp_shdw,
-                              #{World.shadow_struct.name} *shadow,
+                              #{World.shadow_struct_name} *shadow,
                               VALUE trans, VALUE dest)
       {
         comp_shdw->trans  = trans;
@@ -994,7 +990,7 @@ class World
       }
       
       inline static void finish_trans(ComponentShadow *comp_shdw,
-                               #{World.shadow_struct.name} *shadow)
+                               #{World.shadow_struct_name} *shadow)
       { //%% hook_finish_transition(comp_shdw->self, comp_shdw->trans,
         //%%                        comp_shdw->dest);
         if (comp_shdw->state != comp_shdw->dest) {
@@ -1024,16 +1020,16 @@ class World
           if (var->ck_strict) {
             var->ck_strict = 0;
             (*var->flow)(comp_shdw);
-            if (var->value_0 != var->value_1) {
+            if (var->value[0] != var->value[1]) {
               rb_funcall(comp_shdw->self,
                 #{declare_symbol :handle_strictness_error}, 3, INT2NUM(i),
-                rb_float_new(var->value_0), rb_float_new(var->value_1));
+                rb_float_new(var->value[0]), rb_float_new(var->value[1]));
             }
           }
         }
       }
       
-      inline static void check_guards(#{World.shadow_struct.name} *shadow,
+      inline static void check_guards(#{World.shadow_struct_name} *shadow,
             int sync_retry)
       {
         VALUE             comp;
@@ -1109,7 +1105,7 @@ class World
         assert(RARRAY(shadow->prev_awake)->len == 0);
       }
       
-      inline static void do_sync_phase(#{World.shadow_struct.name} *shadow)
+      inline static void do_sync_phase(#{World.shadow_struct_name} *shadow)
       {
         VALUE             comp;
         ComponentShadow  *comp_shdw;