Changeset bbb1b35 for driver/cfa.cc

Timestamp:

Aug 23, 2019, 5:39:48 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

330d933

Parents:

ef22ad6

Message:

first attempt at -save-temp for cfa-cpp output, formatting

File:

• driver/cfa.cc (modified) (11 diffs)

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 22 22:29:50 2019
-// Update Count     : 403
+// Last Modified On : Fri Aug 23 16:27:07 2019
+// Update Count     : 411
 //
 
@@ -39 +39 @@
         static int flags = 0;                                                           // environment variables must have unique names
 
-        if ( putenv( (char *)( *new string( string( "__CFA_FLAG" + to_string( flags++ ) + "__=" ) + arg ) ).c_str() ) != 0 ) {
+        if ( putenv( (char *)( *new string( string( "__CFA_FLAG" + to_string( flags++ ) + "__=" ) + arg ) ).c_str() ) ) {
                 cerr << argv[0] << " error, cannot set environment variable." << endl;
                 exit( EXIT_FAILURE );
@@ -89 +89 @@
 
         bool x_flag = false;                                                            // -x flag
-        bool nonoptarg = false;                                                         // indicates non-option argument specified
-        bool link = true;                                                                       // linking as well as compiling
+        bool nonoptarg = false;                                                         // no non-option arguments specified, i.e., no file names
+        bool link = true;                                                                       // link stage occurring
         bool verbose = false;                                                           // -v flag
         bool quiet = false;                                                                     // -quiet flag
@@ -103 +103 @@
         bool m32 = false;                                                                       // -m32 flag
         bool m64 = false;                                                                       // -m64 flag
-        bool intree = false;
+        bool intree = false;                                                            // build in tree
         int o_file = 0;                                                                         // -o filename position
 
@@ -176 +176 @@
                                 debugging = true;                                               // symbolic debugging required
                                 args[nargs++] = argv[i];                                // pass argument along
+                        } else if ( arg == "-save-temps" ) {
+                                args[nargs++] = argv[i];                                // pass argument along
+                                Putenv( argv, arg );                                    // save cfa-cpp output
                         } else if ( prefix( arg, "-x" ) ) {                     // file suffix ?
                                 string lang;
@@ -258 +261 @@
         #endif // __DEBUG_H__
 
-        // if ( cpp_flag && CFA_flag ) {
-        //      cerr << argv[0] << " error, cannot use -E and -CFA flags together." << endl;
-        //      exit( EXIT_FAILURE );
-        // } // if
+        // -E flag stops at cc1 stage 1, so cfa-cpp in cc1 stage 2 is never executed.
+        if ( cpp_flag && CFA_flag ) {
+                cerr << argv[0] << " error, cannot use -E and -CFA flags together." << endl;
+                exit( EXIT_FAILURE );
+        } // if
 
         // add the CFA include-library paths, which allow direct access to header files without directory qualification
@@ -292 +296 @@
         } // if
 
-        string arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
+        string arch( m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU) );
         if ( ! m32 && ! m64 ) {
                 if ( arch == "x86" ) {
@@ -301 +305 @@
         } // if
 
-        string libdir = libbase + arch + "-" + (nolib ? "nolib" : (debug ? "debug": "nodebug"));
+        string libdir( libbase + arch + "-" + (nolib ? "nolib" : (debug ? "debug": "nodebug")) );
         if ( ! dirExists( libdir ) ) {
                 cerr << argv[0] << " internal error, cannot find prelude directory " << libdir << endl;
@@ -350 +354 @@
                 Putenv( argv, "-N" );
                 Putenv( argv, "-CFA" );
+                // -CFA implies cc1 stage 2, but gcc does not pass the -o file to this stage because it believe the file is for
+                // the linker. Hence, the -o file is explicit passed to cc1 stage 2 and used as cfa-cpp's output file.
                 if ( o_file ) Putenv( argv, string( "-o=" ) + argv[o_file] );
         } else {
@@ -401 +407 @@
         } // if
 
-        args[nargs] = NULL;                                                                     // terminate
+        args[nargs] = nullptr;                                                          // terminate
 
         #ifdef __DEBUG_H__
         cerr << "nargs: " << nargs << endl;
         cerr << "args:" << endl;
-        for ( int i = 0; args[i] != NULL; i += 1 ) {
+        for ( int i = 0; args[i] != nullptr; i += 1 ) {
                 cerr << " \"" << args[i] << "\"" << endl;
         } // for
@@ -428 +434 @@
                 if ( argc == 2 ) exit( EXIT_SUCCESS );                  // if only the -v flag is specified, do not invoke gcc
 
-                for ( int i = 0; args[i] != NULL; i += 1 ) {
+                for ( int i = 0; args[i] != nullptr; i += 1 ) {
                         cerr << args[i] << " ";
                 } // for