Changeset bec4d24 for driver/cc1.cc

Timestamp:

Sep 8, 2018, 8:56:30 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

7117ac3

Parents:

245a92c

Message:

fix debug print, better handle -x language command-line flag

File:

• driver/cc1.cc (modified) (15 diffs)

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 23 09:48:40 2018
-// Update Count     : 122
+// Last Modified On : Mon Sep  3 16:57:05 2018
+// Update Count     : 125
 //
 
@@ -32 +32 @@
 string compiler_name( CFA_BACKEND_CC );                                 // path/name of C compiler
 
-string D__GCC_X__( "-D__GCC_X__=" );
 string D__GCC_BPREFIX__( "-D__GCC_BPREFIX__=" );
 string D__CFA_FLAGPREFIX__( "-D__CFA_FLAG__=" );
@@ -46 +45 @@
 enum { NumSuffixes = 2 };
 const string suffixes[NumSuffixes] = { "cfa", "hfa", };
-
 
 void suffix( string arg, const char * args[], int & nargs ) {
@@ -116 +114 @@
 void Stage1( const int argc, const char * const argv[] ) {
         int code;
-        int i;
 
         string arg;
@@ -139 +136 @@
         cerr << "Stage1" << endl;
         #endif // __DEBUG_H__
+        checkEnv( args, nargs );                                                        // arguments passed via environment variables
+        #ifdef __DEBUG_H__
+        for ( int i = 1; i < argc; i += 1 ) {
+                cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
+        } // for
+        #endif // __DEBUG_H__
 
         // process all the arguments
 
-        checkEnv( args, nargs );                                                        // arguments passed via environment variables
-
-        for ( i = 1; i < argc; i += 1 ) {
-                #ifdef __DEBUG_H__
-                cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
-                #endif // __DEBUG_H__
+        for ( int i = 1; i < argc; i += 1 ) {
                 arg = argv[i];
-                #ifdef __DEBUG_H__
-                cerr << "arg:\"" << arg << "\"" << endl;
-                #endif // __DEBUG_H__
                 if ( prefix( arg, "-" ) ) {
                         // strip g++ flags that are inappropriate or cause duplicates in subsequent passes
@@ -185 +180 @@
                                 ncargs += 1;
                                 i += 1;                                                                 // and the argument
-                        // } else if ( prefix( arg, D__GCC_X__ ) ) {
-                        //      args[nargs] = "-x";
-                        //      nargs += 1;
-                        //      args[nargs] = ( *new string( arg.substr( D__GCC_X__.size() ) ) ).c_str(); // pass the flag along
-                        //      nargs += 1;
-                        // } else if ( arg == "-D" && prefix( argv[i + 1], D__GCC_X__.substr(2) ) ) {
-                        //      args[nargs] = "-x";
-                        //      nargs += 1;
-                        //      args[nargs] = ( *new string( string( argv[i + 1] ).substr( D__GCC_X__.size() - 2 ) ) ).c_str(); // pass the flag along
-                        //      nargs += 1;
-                        //      i += 1;                                                                 // and the argument
                         } else if ( prefix( arg, D__GCC_BPREFIX__ ) ) {
                                 bprefix = arg.substr( D__GCC_BPREFIX__.size() );
@@ -251 +235 @@
         #ifdef __DEBUG_H__
         cerr << "args:";
-        for ( i = 1; i < nargs; i += 1 ) {
+        for ( int i = 1; i < nargs; i += 1 ) {
                 cerr << " " << args[i];
         } // for
@@ -282 +266 @@
                 #ifdef __DEBUG_H__
                 cerr << "nargs: " << nargs << endl;
-                for ( i = 0; args[i] != NULL; i += 1 ) {
+                for ( int i = 0; args[i] != NULL; i += 1 ) {
                         cerr << args[i] << " ";
                 } // for
@@ -324 +308 @@
                 #ifdef __DEBUG_H__
                 cerr << "cpp nargs: " << nargs << endl;
-                for ( i = 0; args[i] != NULL; i += 1 ) {
+                for ( int i = 0; args[i] != NULL; i += 1 ) {
                         cerr << args[i] << " ";
                 } // for
@@ -377 +361 @@
                 #ifdef __DEBUG_H__
                 cerr << "cfa-cpp ncargs: " << o_name << " " << CFA_flag << " " << ncargs << endl;
-                for ( i = 0; cargs[i] != NULL; i += 1 ) {
+                for ( int i = 0; cargs[i] != NULL; i += 1 ) {
                         cerr << cargs[i] << " ";
                 } // for
@@ -407 +391 @@
 
 void Stage2( const int argc, const char * const * argv ) {
-        int i;
-
         string arg;
 
@@ -419 +401 @@
         cerr << "Stage2" << endl;
         #endif // __DEBUG_H__
+        checkEnv( args, nargs );                                                        // arguments passed via environment variables
+        #ifdef __DEBUG_H__
+        for ( int i = 1; i < argc; i += 1 ) {
+                cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
+        } // for
+        #endif // __DEBUG_H__
 
         // process all the arguments
 
-        checkEnv( args, nargs );                                                        // arguments passed via environment variables
-
-        for ( i = 1; i < argc; i += 1 ) {
-                #ifdef __DEBUG_H__
-                cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
-                #endif // __DEBUG_H__
+        for ( int i = 1; i < argc; i += 1 ) {
                 arg = argv[i];
-                #ifdef __DEBUG_H__
-                cerr << "arg:\"" << arg << "\"" << endl;
-                #endif // __DEBUG_H__
                 if ( prefix( arg, "-" ) ) {
                         // strip inappropriate flags
@@ -476 +456 @@
         #ifdef __DEBUG_H__
         cerr << "args:";
-        for ( i = 1; i < nargs; i += 1 ) {
+        for ( int i = 1; i < nargs; i += 1 ) {
                 cerr << " " << args[i];
         } // for
@@ -492 +472 @@
         #ifdef __DEBUG_H__
         cerr << "stage2 nargs: " << nargs << endl;
-        for ( i = 0; args[i] != NULL; i += 1 ) {
+        for ( int i = 0; args[i] != NULL; i += 1 ) {
                 cerr << args[i] << " ";
         } // for
@@ -506 +486 @@
 int main( const int argc, const char * const argv[], __attribute__((unused)) const char * const env[] ) {
         #ifdef __DEBUG_H__
-        for ( int i = 0; env[i] != NULL; i += 1 ) {
+        for ( int int i = 0; env[i] != NULL; i += 1 ) {
                 cerr << env[i] << endl;
         } // for