fdvm updated

dvm/fdvm/trunk/Sage/h/tag

@@ -624,4 +624,5 @@
 #define SPF_COVER_OP                     972     /* SAPFOR */
 #define SPF_MERGE_OP                     973     /* SAPFOR */
 #define SPF_PROCESS_PRIVATE_OP           974     /* SAPFOR */
+#define SPF_WEIGHT_OP			 975     /* SAPFOR */
 

dvm/fdvm/trunk/Sage/h/tag.h

@@ -626,4 +626,5 @@ script using "tag".  Run make tag.h to regenerate this file */
   tag [ SPF_COVER_OP ] = "SPF_COVER_OP";
   tag [ SPF_MERGE_OP ] = "SPF_MERGE_OP";
   tag [ SPF_PROCESS_PRIVATE_OP ] = "SPF_PROCESS_PRIVATE_OP";
+  tag [ SPF_WEIGHT_OP ] = "SPF_WEIGHT_OP";
 

dvm/fdvm/trunk/Sage/lib/include/bif_node.def

@@ -464,6 +464,7 @@ DEFNODECODE(SPF_UNROLL_OP, "nodetext",'e',1,LLNODE,    		'_','_','_','_','_')
 DEFNODECODE(SPF_COVER_OP, "nodetext",'e',1,LLNODE,    		'_','_','_','_','_')
 DEFNODECODE(SPF_MERGE_OP, "nodetext",'e',0,LLNODE,    		'_','_','_','_','_')
 DEFNODECODE(SPF_PROCESS_PRIVATE_OP, "nodetext",'e',1,LLNODE,	'_','_','_','_','_')
+DEFNODECODE(SPF_WEIGHT_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
 
 DEFNODECODE(SPF_ANALYSIS_DIR,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
 DEFNODECODE(SPF_PARALLEL_DIR,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')

dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def

@@ -440,5 +440,9 @@ DEFNODECODE(SPF_COVER_OP,            "COVER (%LL1)",
 'e',1,LLNODE)
 DEFNODECODE(SPF_PROCESS_PRIVATE_OP,   "PROCESS_PRIVATE (%LL1)",
 'e',1,LLNODE)
+DEFNODECODE(SPF_WEIGHT_OP,	      "WEIGHT (%LL1)",
+'e',1,LLNODE)
+DEFNODECODE(SPF_CODE_COVERAGE_OP,     "CODE_COVERAGE",
+'e',0,LLNODE)
 
 

dvm/fdvm/trunk/fdvm/acc_rtc.cpp

@@ -340,15 +340,21 @@ void _RTC_UnparsedFunctionsToKernelConst(SgStatement *stmt)
     char *buffer = _RTC_PrototypesForKernel(call_list);
 
     for (; call_list; call_list = call_list->next)
-    {
+    {   SgStatement *stmt, *end_st;
         gnode = GRAPHNODE(call_list->symb);
-        char *unp_buf = UnparseBif_Char(gnode->st_copy->thebif, C_LANG);
+        end_st = gnode->st_copy_first->lastNodeOfStmt()->lexNext();
+        stmt = gnode->st_copy;
+        while (stmt != end_st) //st_copy,...,st_copy_first
+        {
+            char *unp_buf = UnparseBif_Char(stmt->thebif, C_LANG);
             char *buf = new char[strlen(unp_buf) + strlen(buffer) + 1];
             //buf[0] = '\0';
             strcpy(buf, buffer);
             strcat(buf, unp_buf);
             delete[] buffer;
             buffer = buf;
+            stmt = stmt->lastNodeOfStmt()->lexNext();
+        }
     }
     buffer = _RTC_convertUnparse(buffer);
   

dvm/fdvm/trunk/include/dvm_tag.h

@@ -157,3 +157,4 @@
 #define SPF_COVER_OP                     972     /* SAPFOR */
 #define SPF_MERGE_OP                     973     /* SAPFOR */
 #define SPF_PROCESS_PRIVATE_OP           974     /* SAPFOR */
+#define SPF_WEIGHT_OP                    975     /* SAPFOR */

dvm/fdvm/trunk/include/fdvm_version.h

@@ -1 +1 @@
-#define COMPILER_VERSION  "6.0 (11.05.2018)" 
+#define COMPILER_VERSION "4.1 (06.03.2025)" 

dvm/fdvm/trunk/parser/fspf.gram

@@ -34,6 +34,14 @@ characteristic_list:  characteristic
 
 characteristic: needkeyword SPF_CODE_COVERAGE
                 {  $$ = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
+              | needkeyword SPF_WEIGHT LEFTPAR DP_CONSTANT RIGHTPAR
+                { 
+                   PTR_LLND w;
+                   w = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
+	           w->entry.string_val = copys(yytext);
+	           w->type = global_double;
+                   $$ = make_llnd(fi,SPF_WEIGHT_OP,w,LLNULL,SMNULL);
+                }
               ;
 
 opt_clause_apply_fragment: 

dvm/fdvm/trunk/parser/gram1.tab.h

@@ -401,8 +401,9 @@ extern int yydebug;
     SPF_MERGE = 354,
     SPF_COVER = 355,
     SPF_PROCESS_PRIVATE = 356,
-    BINARY_OP = 359,
+    SPF_WEIGHT = 357,
-    UNARY_OP = 360
+    BINARY_OP = 360,
+    UNARY_OP = 361
   };
 #endif
 
@@ -411,7 +412,7 @@ extern int yydebug;
 
 union YYSTYPE
 {
-#line 439 "gram1.y" /* yacc.c:1909  */
+#line 440 "gram1.y" /* yacc.c:1909  */
 
     int token;
     char charv;
@@ -423,7 +424,7 @@ union YYSTYPE
     PTR_HASH hash_entry;
     PTR_LABEL label;
 
-#line 427 "gram1.tab.h" /* yacc.c:1909  */
+#line 428 "gram1.tab.h" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;

dvm/fdvm/trunk/parser/gram1.y

@@ -354,6 +354,7 @@
 %token SPF_MERGE 354
 %token SPF_COVER 355
 %token SPF_PROCESS_PRIVATE 356
+%token SPF_WEIGHT 357
 
 %{
 #include <string.h>
@@ -8030,6 +8031,14 @@ characteristic_list:  characteristic
 
 characteristic: needkeyword SPF_CODE_COVERAGE
                 {  $$ = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
+              | needkeyword SPF_WEIGHT LEFTPAR DP_CONSTANT RIGHTPAR
+                { 
+                   PTR_LLND w;
+                   w = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
+	           w->entry.string_val = copys(yytext);
+	           w->type = global_double;
+                   $$ = make_llnd(fi,SPF_WEIGHT_OP,w,LLNULL,SMNULL);
+                }
               ;
 
 opt_clause_apply_fragment: 

dvm/fdvm/trunk/parser/lexfdvm.c

@@ -610,6 +610,7 @@ struct Keylist keys[] = {
         {"varlist", VARLIST},
 	{"virtual", VIRTUAL},
         {"wait", WAIT},
+        {"weight", SPF_WEIGHT},
         {"wgt_block", WGT_BLOCK},
 	{"where", WHERE},
 	{"while", WHILE},

dvm/fdvm/trunk/parser/tag

@@ -624,4 +624,5 @@
 #define SPF_COVER_OP                     972     /* SAPFOR */
 #define SPF_MERGE_OP                     973     /* SAPFOR */
 #define SPF_PROCESS_PRIVATE_OP           974     /* SAPFOR */
+#define SPF_WEIGHT_OP			 975     /* SAPFOR */
 

dvm/fdvm/trunk/parser/tag.h

@@ -626,4 +626,5 @@ script using "tag".  Run make tag.h to regenerate this file */
   tag [ SPF_COVER_OP ] = "SPF_COVER_OP";
   tag [ SPF_MERGE_OP ] = "SPF_MERGE_OP";
   tag [ SPF_PROCESS_PRIVATE_OP ] = "SPF_PROCESS_PRIVATE_OP";
+  tag [ SPF_WEIGHT_OP ] = "SPF_WEIGHT_OP";
 

dvm/fdvm/trunk/parser/tokdefs.h

@@ -354,3 +354,4 @@
 #define SPF_MERGE 354
 #define SPF_COVER 355
 #define SPF_PROCESS_PRIVATE 356
+#define SPF_WEIGHT 357

dvm/fdvm/trunk/parser/tokens

@@ -354,3 +354,4 @@ SPF_UNROLL
 SPF_MERGE
 SPF_COVER
 SPF_PROCESS_PRIVATE
+SPF_WEIGHT