matiec: comparison stage4/generate_c/generate

equal deleted inserted replaced

-:30cbae46190d
+:8387cac2aba6
 #define SECOND 1000 * MILLISECOND
 /* A helper class that knows how to generate code for both the IL and ST languages... */
 class calculate_time_c: public iterator_visitor_c {
 private:
-unsigned long time;
+unsigned long long time;
 float current_value;
 public:
 calculate_time_c(void){time = 0;};
-unsigned long get_time(void) {return time;};
+unsigned long long get_time(void) {return time;};
 void *get_integer_value(token_c *token) {
 std::string str = "";
 for (unsigned int i = 0; i < strlen(token->value); i++)
 if (token->value[i] != '_')
 /* SYM_REF2(days_c, days, hours) */
 void *visit(days_c *symbol) {
 if (symbol->hours)
 symbol->hours->accept(*this);
 symbol->days->accept(*this);
-time += (unsigned long)(current_value * 24 * 3600 * SECOND);
+time += (unsigned long long)(current_value * 24 * 3600 * SECOND);
 return NULL;
 }
 /* SYM_REF2(hours_c, hours, minutes) */
 void *visit(hours_c *symbol) {
 if (symbol->minutes)
 symbol->minutes->accept(*this);
 symbol->hours->accept(*this);
-time += (unsigned long)(current_value * 3600 * SECOND);
+time += (unsigned long long)(current_value * 3600 * SECOND);
 return NULL;
 }
 /* SYM_REF2(minutes_c, minutes, seconds) */
 void *visit(minutes_c *symbol) {
 if (symbol->seconds)
 symbol->seconds->accept(*this);
 symbol->minutes->accept(*this);
-time += (unsigned long)(current_value * 60 * SECOND);
+time += (unsigned long long)(current_value * 60 * SECOND);
 return NULL;
 }
 /* SYM_REF2(seconds_c, seconds, milliseconds) */
 void *visit(seconds_c *symbol) {
 if (symbol->milliseconds)
 symbol->milliseconds->accept(*this);
 symbol->seconds->accept(*this);
-time += (unsigned long)(current_value * SECOND);
+time += (unsigned long long)(current_value * SECOND);
 return NULL;
 }
 /* SYM_REF2(milliseconds_c, milliseconds, unused) */
 void *visit(milliseconds_c *symbol) {
 symbol->milliseconds->accept(*this);
-time += (unsigned long)(current_value * MILLISECOND);
+time += (unsigned long long)(current_value * MILLISECOND);
 return NULL;
 }
 };
 /***********************************************************************/
 /***********************************************************************/
 /***********************************************************************/
 class calculate_common_ticktime_c: public iterator_visitor_c {
 private:
-unsigned long common_ticktime;
+unsigned long long common_ticktime;
+unsigned long long least_common_ticktime;
 public:
-calculate_common_ticktime_c(void){common_ticktime = 0;}
+calculate_common_ticktime_c(void){
+common_ticktime = 0;
-unsigned long euclide(unsigned long a, unsigned long b) {
+least_common_ticktime = 0;
-unsigned long c = a % b;
+}
+unsigned long long euclide(unsigned long long a, unsigned long long b) {
+unsigned long long c = a % b;
 if (c == 0)
 return b;
 else
 return euclide(b, c);
 }
-void update_ticktime(unsigned long time) {
+void update_ticktime(unsigned long long time) {
 if (common_ticktime == 0)
 common_ticktime = time;
 else if (time > common_ticktime)
 common_ticktime = euclide(time, common_ticktime);
 else
 common_ticktime = euclide(common_ticktime, time);
-}
+if (least_common_ticktime == 0)
+least_common_ticktime = time;
-unsigned long get_ticktime(void) {
+else
+least_common_ticktime = (least_common_ticktime * time) / common_ticktime;
+}
+unsigned long long get_common_ticktime(void) {
 return common_ticktime;
+}
+unsigned long get_greatest_tick_count(void) {
+unsigned long long least_common_tick = least_common_ticktime / common_ticktime;
+if (least_common_tick >> 32)
+ERROR;
+return (unsigned long)(~(((unsigned long)-2) % (unsigned long)least_common_tick) + 1);
 }
 /*  TASK task_name task_initialization */
 //SYM_REF2(task_configuration_c, task_name, task_initialization)
 void *visit(task_initialization_c *symbol) {
 calculate_time_c calculate_time;
-unsigned long time = 0;
+unsigned long long time = 0;
 if (symbol->interval_data_source != NULL) {
 symbol->interval_data_source->accept(calculate_time);
 time = calculate_time.get_time();
 }
 if (time > 0)
 s4o.print("\n");
 /* (C.2) Run function name... */
 s4o.print(s4o.indent_spaces + "void config");
 s4o.print(FB_RUN_SUFFIX);
-s4o.print("(int tick) {\n");
+s4o.print("(unsigned long tick) {\n");
 s4o.indent_right();
 /* (C.3) Resources initializations... */
 wanted_declaretype = rundeclare_dt;
 symbol->resource_declarations->accept(*this);
 s4o.print(FB_INIT_SUFFIX);
 s4o.print("(void);\n");
 }
 else {
 s4o.print(FB_RUN_SUFFIX);
-s4o.print("(int tick);\n");
+s4o.print("(unsigned long tick);\n");
 }
 }
 if (wanted_declaretype == initdeclare_dt || wanted_declaretype == rundeclare_dt) {
 s4o.print(s4o.indent_spaces);
 symbol->resource_name->accept(*this);
 s4o.print(FB_INIT_SUFFIX);
 s4o.print("(void);\n");
 }
 else {
 s4o.print(FB_RUN_SUFFIX);
-s4o.print("(int tick);\n");
+s4o.print("(unsigned long tick);\n");
 }
 }
 if (wanted_declaretype == initdeclare_dt || wanted_declaretype == rundeclare_dt) {
 s4o.print(s4o.indent_spaces + "RESOURCE");
 if (wanted_declaretype == initdeclare_dt) {
 /* (C) Resource run function... */
 /* (C.1) Run function name... */
 s4o.print("void ");
 current_resource_name->accept(*this);
 s4o.print(FB_RUN_SUFFIX);
-s4o.print("(int tick) {\n");
+s4o.print("(unsigned long tick) {\n");
 s4o.indent_right();
 wanted_declaretype = run_dt;
 /* (C.2) Task management... */
 current_configuration = symbol;
 calculate_common_ticktime_c calculate_common_ticktime;
 symbol->accept(calculate_common_ticktime);
-common_ticktime = calculate_common_ticktime.get_ticktime();
+common_ticktime = calculate_common_ticktime.get_common_ticktime();
 symbol->configuration_name->accept(*this);
 stage4out_c config_s4o(current_builddir, current_name, "c");
 generate_c_config_c generate_c_config(&config_s4o);
 symbol->accept(generate_c_config);
-config_s4o.print("int common_ticktime__ = ");
+config_s4o.print("unsigned long long common_ticktime__ = ");
-config_s4o.print_integer((int)(common_ticktime / 1000000));
+config_s4o.print_long_long_integer(common_ticktime);
-config_s4o.print("; /*ms*/\n");
+config_s4o.print("; /*ns*/\n");
+config_s4o.print("unsigned long greatest_tick_count__ = ");
+config_s4o.print_long_integer(calculate_common_ticktime.get_greatest_tick_count());
+config_s4o.print("; /*tick*/\n");
 symbol->resource_declarations->accept(*this);
 current_configuration = NULL;

changeset 210	8387cac2aba6
parent 202	da1a8186f86f
child 217	f5dfadf5de54