Fixing several issues with the new inline generator.

Author: phase1geo

diags/regress/Makefile

@@ -577,7 +577,8 @@ DIAGS1       += assign4           example2          example2.1        example2.3
 EXCLUDE      += bug2794588        case4.1           case5             casex2            casez3 \
                 example1          exclude5.1        exclude5.3        inline3           mem5 \
                 merge6.1          param10.1         param10.5         sbit_sel3.2       signed4.1 \
-                static_func4
+                static_func4 \
+generate5    generate5.2    generate5.3    generate8.9
 ifdef VPI
 EXCLUDE      += fork2             generate4         generate4.1       generate8
 endif

src/gen_parser.y

@@ -1457,6 +1457,7 @@ generate_item
       func_unit* funit = db_get_tfn_by_position( @1.first_line, @1.first_column );
       assert( funit != NULL );
       generator_push_funit( funit );
+      generator_create_tmp_regs();
     }
     generate_item_list_opt K_end
     {
@@ -1481,6 +1482,7 @@ generate_item
       func_unit* funit = db_get_tfn_by_position( @1.first_line, @1.first_column );
       assert( funit != NULL );
       generator_push_funit( funit );
+      generator_create_tmp_regs();
     }
     generate_item_list_opt K_end
     {
@@ -1494,11 +1496,13 @@ generate_item
       func_unit* funit = db_get_tfn_by_position( @11.first_line, @11.first_column );
       assert( funit != NULL );
       generator_push_funit( funit );
+      generator_create_tmp_regs();
     }
     generate_item_list_opt K_end
     {
       func_unit* funit = db_get_tfn_by_position( @11.first_line, @11.first_column );
       assert( funit != NULL );
+      generator_pop_funit();
       $$ = generator_build( 17, strdup_safe( "for(" ), $3, strdup_safe( ";" ), $5, strdup_safe( ";" ), $7, strdup_safe( ")" ), "\n", strdup_safe( "begin : " ), $11, "\n",
                             generator_inst_id_reg( funit ), "\n", generator_tmp_regs(), $13, strdup_safe( "end" ), "\n" );
     }
@@ -3858,7 +3862,6 @@ inc_for_depth
     {
       func_unit* funit = db_get_tfn_by_position( @$.first_line, (@$.first_column - 3) );
       assert( funit != NULL );
-      printf( "In inc_for_depth, first_line: %d, first_column: %d, funit->name: %s\n", @$.first_line, (@$.first_column - 3), funit->name );
       generator_push_funit( funit );
     }
   ;

src/generator.new.c

@@ -3289,9 +3289,10 @@ char* generator_fsm_covs() { PROFILE(GENERATOR_FSM_COVS);
 
     for( i=0; i<curr_funit->fsm_size; i++ ) {
 
-      fsm* table = curr_funit->fsms[i];
-      char idxstr[30];
-      char numstr[30];
+      fsm*  table    = curr_funit->fsms[i];
+      char  idxstr[30];
+      char  numstr[30];
+      char* tcov_str = cov_str;
 
       /* Get the string value of the index */
       rv = snprintf( idxstr, 30, "%d", (i + 1) );
@@ -3331,6 +3332,7 @@ char* generator_fsm_covs() { PROFILE(GENERATOR_FSM_COVS);
             slen    = 6 + strlen( numstr ) + 14 + strlen( idxstr ) + 4 + strlen( fexp ) + 1 + strlen( texp ) + 3;
             cov_str = (char*)malloc_safe( slen );
             rv      = snprintf( cov_str, slen, "wire [%d:0] \\covered$F%u = {%s,%s};", ((from_number + to_number) - 1), (i + 1), fexp, texp );
+            printf( "cov_str: %p, %s\n", cov_str, cov_str );
           } else {
             rv      = snprintf( numstr, 30, "%d", from_number );  assert( rv < 30 );
             slen    = 7 + strlen( numstr ) + 2 + strlen( (tsize != NULL) ? tsize : "1" ) + 18 + strlen( idxstr ) + 4 + strlen( fexp ) + 1 + strlen( texp ) + 3;
@@ -3357,6 +3359,9 @@ char* generator_fsm_covs() { PROFILE(GENERATOR_FSM_COVS);
 
       }
 
+      /* Concatenate strings */
+      cov_str = generator_build( 2, tcov_str, cov_str );
+
     }
 
   }

src/link.c

@@ -218,7 +218,7 @@ void funit_link_add(
 
   tmp->funit = funit;
   tmp->next  = NULL;
-	
+
   if( *head == NULL ) {
     *head = *tail = tmp;
   } else {