Changeset 0bf5340

Timestamp:

Sep 10, 2019, 9:01:32 AM (6 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:

216597d

Parents:

7c8246d

Message:

updates after code review, use suffix .ifa for cc1 stage1 temp-file

Location:

driver

Files:

• cc1.cc (modified) (10 diffs)
• cfa.cc (modified) (2 diffs)

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 30 15:36:42 2019
-// Update Count     : 377
+// Last Modified On : Mon Sep  9 17:50:53 2019
+// Update Count     : 384
 //
 
@@ -58 +58 @@
 
 
-static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );
+static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );               // "N__=" suffix
 
 static void checkEnv1( const char * args[], int & nargs ) { // stage 1
@@ -70 +70 @@
 
                 if ( prefix( arg, __CFA_FLAGPREFIX__ ) ) {
-                        string val( arg.substr( __CFA_FLAGPREFIX__.size() + 4 ) );
+                        string val( arg.substr( arg.find_first_of( "=" ) + 1 ) );
                         if ( prefix( val, "-compiler=" ) ) {
                                 compiler_path = val.substr( 10 );
@@ -89 +89 @@
 
                 if ( prefix( arg, __CFA_FLAGPREFIX__ ) ) {
-                        string val( arg.substr( __CFA_FLAGPREFIX__.size() + 4 ) );
+                        string val( arg.substr( arg.find_first_of( "=" ) + 1 ) );
                         if ( prefix( val, "-compiler=" ) ) {
                                 compiler_path = val.substr( 10 );
@@ -101 +101 @@
                                 bprefix = val.substr( 3 );
                         } else {                                                                        // normal flag for cfa-cpp
-                                args[nargs++] = ( *new string( arg.substr( __CFA_FLAGPREFIX__.size() + 4 ) ) ).c_str();
+                                args[nargs++] = ( *new string( arg.substr( arg.find_first_of( "=" ) + 1 ) ) ).c_str();
                         } // if
                 } // if
@@ -108 +108 @@
 
 
-static char tmpname[] = P_tmpdir "/CFAXXXXXX.i";
+static char tmpname[] = P_tmpdir "/CFAXXXXXX.ifa";
 static int tmpfilefd = -1;
 static bool startrm = false;
@@ -414 +414 @@
                         } // if
                 } else {
-                        tmpfilefd = mkstemps( tmpname, 2 );
+                        tmpfilefd = mkstemps( tmpname, 4 );
                         if ( tmpfilefd == -1 ) {
                                 perror( "CC1 Translator error: stage 2, mkstemp" );
@@ -487 +487 @@
                 args[0] = compiler_path.c_str();
                 args[nargs++] = "-S";                                                   // only compile and put assembler output in specified file
-                if ( save_temps ) {                                                             // make gcc accept .ifa suffix
-                        args[nargs++] = "-x";
-                        args[nargs++] = "cpp-output";
-                } // if
+                args[nargs++] = "-x";
+                args[nargs++] = "cpp-output";
+
                 args[nargs++] = cfa_cpp_out.c_str();
                 args[nargs] = nullptr;                                                  // terminate argument list
@@ -509 +508 @@
 
         wait( &code );                                                                          // wait for child to finish
+        rmtmpfile();                                                                            // remove tmpname
 
         if ( WIFSIGNALED(code) ) {                                                      // child failed ?
-                rmtmpfile();                                                                    // remove tmpname
                 cerr << "CC1 Translator error: stage 2, child failed " << WTERMSIG(code) << endl;
                 exit( EXIT_FAILURE );
@@ -520 +519 @@
         #endif // __DEBUG_H__
 
-        rmtmpfile();                                                                            // remove tmpname
         exit( WEXITSTATUS( code ) );                                            // stop regardless of success or failure
 } // Stage2

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 27 06:11:24 2019
-// Update Count     : 416
+// Last Modified On : Mon Sep  9 17:57:40 2019
+// Update Count     : 417
 //
 
@@ -36 +36 @@
 
 
+static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );               // "N__=" suffix
+
 void Putenv( char * argv[], string arg ) {
         static int flags = 0;                                                           // environment variables must have unique names
 
-        if ( putenv( (char *)( *new string( string( "__CFA_FLAG" + to_string( flags++ ) + "__=" ) + arg ) ).c_str() ) ) {
+        if ( putenv( (char *)( *new string( string( __CFA_FLAGPREFIX__ + to_string( flags++ ) + "__=" ) + arg ) ).c_str() ) ) {
                 cerr << argv[0] << " error, cannot set environment variable." << endl;
                 exit( EXIT_FAILURE );