Changeset d029162

Timestamp:

May 6, 2016, 2:07:41 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9a92216

Parents:

4e24610 (diff), 4acc87f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into global-init

Conflicts:

src/main.cc

Location:

src

Files:

• driver/cc1.cc (modified) (6 diffs)
• main.cc (modified) (6 diffs)

src/driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 25 16:05:15 2016
-// Update Count     : 56
+// Last Modified On : Thu May  5 16:04:30 2016
+// Update Count     : 77
 //
 
@@ -108 +108 @@
         const char *args[argc + 100];                                           // leave space for 100 additional cpp command line values
         int nargs = 1;                                                                          // number of arguments in args list; 0 => command name
-        const char *uargs[20];                                                          // leave space for 20 additional cfa-cpp command line values
-        int nuargs = 1;                                                                         // 0 => command name
+        const char *cargs[20];                                                          // leave space for 20 additional cfa-cpp command line values
+        int ncargs = 1;                                                                         // 0 => command name
 
         signal( SIGINT,  sigTermHandler );
         signal( SIGTERM, sigTermHandler );
+
+#ifdef __DEBUG_H__
+        cerr << "Stage1" << endl;
+#endif // __DEBUG_H__
 
         // process all the arguments
@@ -153 +157 @@
                                 CFA_flag = true;
                         } else if ( prefix( arg, D__CFA_FLAGPREFIX__ ) ) {
-                                uargs[nuargs] = ( *new string( arg.substr( D__CFA_FLAGPREFIX__.size() ) ) ).c_str();
-                                nuargs += 1;
+                                cargs[ncargs] = ( *new string( arg.substr( D__CFA_FLAGPREFIX__.size() ) ) ).c_str();
+                                ncargs += 1;
                         } else if ( arg == "-D" && prefix( argv[i + 1], D__CFA_FLAGPREFIX__.substr(2) ) ) {
-                                uargs[nuargs] = ( *new string( string( argv[i + 1] ).substr( D__CFA_FLAGPREFIX__.size() - 2 ) ) ).c_str();
-                                nuargs += 1;
+                                cargs[ncargs] = ( *new string( string( argv[i + 1] ).substr( D__CFA_FLAGPREFIX__.size() - 2 ) ) ).c_str();
+                                ncargs += 1;
                                 i += 1;                                                                 // and the argument
                         } else if ( prefix( arg, D__GCC_BPREFIX__ ) ) {
@@ -317 +321 @@
 
         if ( fork() == 0 ) {                                                            // child runs CFA
-                uargs[0] = ( *new string( bprefix + "/cfa-cpp" ) ).c_str();
-
-                uargs[nuargs] = tmpname;
-                nuargs += 1;
+                cargs[0] = ( *new string( bprefix + "/cfa-cpp" ) ).c_str();
+
+                // Source file-name used to generate routine names containing global initializations for TU.
+                cargs[ncargs] = ( *new string( "-F" ) ).c_str();
+                ncargs += 1;
+                cargs[ncargs] = ( *new string( string( cpp_in ) ) ).c_str();
+                ncargs += 1;
+
+                cargs[ncargs] = tmpname;
+                ncargs += 1;
                 if ( o_name != NULL ) {
-                        uargs[nuargs] = o_name;
-                        nuargs += 1;
+                        cargs[ncargs] = o_name;
+                        ncargs += 1;
                 } else if ( ! CFA_flag ) {                                              // run cfa-cpp ?
-                        uargs[nuargs] = cpp_out;
-                        nuargs += 1;
+                        cargs[ncargs] = cpp_out;
+                        ncargs += 1;
                 } // if
-                uargs[nuargs] = NULL;                                                   // terminate argument list
-
-#ifdef __DEBUG_H__
-                cerr << "cfa-cpp nuargs: " << o_name << " " << CFA_flag << " " << nuargs << endl;
-                for ( i = 0; uargs[i] != NULL; i += 1 ) {
-                        cerr << uargs[i] << " ";
+                cargs[ncargs] = NULL;                                                   // terminate argument list
+
+#ifdef __DEBUG_H__
+                cerr << "cfa-cpp ncargs: " << o_name << " " << CFA_flag << " " << ncargs << endl;
+                for ( i = 0; cargs[i] != NULL; i += 1 ) {
+                        cerr << cargs[i] << " ";
                 } // for
                 cerr << endl;
 #endif // __DEBUG_H__
 
-                execvp( uargs[0], (char * const *)uargs );              // should not return
+                execvp( cargs[0], (char * const *)cargs );              // should not return
                 perror( "CFA Translator error: cpp level, execvp" );
                 exit( EXIT_FAILURE );
@@ -370 +380 @@
         const char *args[argc + 100];                                           // leave space for 100 additional cfa command line values
         int nargs = 1;                                                                          // number of arguments in args list; 0 => command name
+
+#ifdef __DEBUG_H__
+        cerr << "Stage2" << endl;
+#endif // __DEBUG_H__
 
         // process all the arguments
@@ -467 +481 @@
 
         if ( arg == "-E" ) {
-#ifdef __DEBUG_H__
-                cerr << "Stage1" << endl;
-#endif // __DEBUG_H__
                 Stage1( argc, argv );
         } else if ( arg == "-fpreprocessed" ) {
-#ifdef __DEBUG_H__
-                cerr << "Stage2" << endl;
-#endif // __DEBUG_H__
                 Stage2( argc, argv );
         } else {

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 04 16:54:52 2016
-// Update Count     : 199
+// Last Modified On : Fri May 06 14:04:49 2016
+// Update Count     : 203
 //
 
@@ -98 +98 @@
         std::ostream *output = &std::cout;
         int long_index;
-        std::list< Declaration* > translationUnit;
+        std::list< Declaration * > translationUnit;
+        const char *filename = NULL;
 
         opterr = 0;                                                                                     // prevent getopt from printing error messages
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abefglnpqrstvyzD:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abefglnpqrstvyzD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -163 +164 @@
                         break;
                   case 'D':                                                                             // ignore -Dxxx
+                        break;
+                  case 'F':                                                                             // source file-name without suffix
+                        filename = optarg;
                         break;
                   case '?':
@@ -173 +177 @@
 
         try {
-                std::string fileName;
-
                 // choose to read the program from a file or stdin
                 if ( optind < argc ) {
@@ -182 +184 @@
                                 exit( 1 );
                         } // if
+                        // if running cfa-cpp directly, might forget to pass -F option (and really shouldn't have to)
+                        if ( filename == NULL ) filename = argv[ optind ];
                         optind += 1;
-
-                        // assert( optind < argc );
-                        fileName = argv[ optind-1 ]; // placeholder
-                        // optind += 1;
                 } else {
                         input = stdin;
@@ -259 +259 @@
                 CodeGen::fixNames( translationUnit );
                 OPTPRINT( "fixGlobalInit" );
-                InitTweak::fixGlobalInit( translationUnit, fileName );
+                InitTweak::fixGlobalInit( translationUnit, filename );
                 OPTPRINT( "tweak" )
                 InitTweak::tweak( translationUnit );