Changeset 63f2697 for driver

Timestamp:

Dec 7, 2021, 5:01:23 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

130a778

Parents:

75873cf

Message:

try plan B to find debug C code

File:

• driver/as.cc (modified) (2 diffs)

driver/as.cc

@@ -11 +11 @@
 // Created On       : Wed Aug  1 10:49:42 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  7 10:03:34 2021
-// Update Count     : 108
+// Last Modified On : Tue Dec  7 16:56:24 2021
+// Update Count     : 115
 //
 
@@ -48 +48 @@
                 if ( start == (void *)-1 ) { perror( "mmap" ); exit( EXIT_FAILURE ); };
 
-                if ( char * dcursor = strstr( start, ".Ldebug_info0:" ) ) { // debug information ?
-                        // Expand file by one byte to hold 2 character Cforall language code.
-                        if ( ftruncate( fd, size + 1 ) ) { perror( "ftruncate" ); exit( EXIT_FAILURE ); };
+                char * dcursor;
+                if ( (dcursor = strstr( start, ".Ldebug_info0:" ) ) ) { // debug information ?
 
-                        char * cursor = dcursor;
-                        for ( int i = 0; i < 8; i += 1 ) {                      // move N (magic) lines forward
-                                cursor = strstr( cursor, "\n" ) + 1;
-                        } // for
-
-                        cursor -= 2;                                                            // backup over "c\n" language value
-                        if ( *(cursor - 1) != 'x' ) {                           // 0x before code
-                                for ( int i = 0; i < 8; i += 1 ) {                      // move N (magic) lines forward
+                        if ( char * cursor = strstr( dcursor, ".long\t.LASF" ) ) { // debug information ?
+                                for ( int i = 0; i < 2; i += 1 ) {              // move N (magic) lines forward
                                         cursor = strstr( cursor, "\n" ) + 1;
                                 } // for
-                                fprintf( stderr, "*** ERROR *** Invalid C language code found in assembler file: %s\n"
-                                                 "Assembler debug information:\n%.*s",
-                                                 argv[argc - 1], (int)(cursor - dcursor) + 2, dcursor );
-                                exit( EXIT_FAILURE );
-                        };
 
-                        memmove( cursor + 2, cursor + 1, start + size - cursor - 1 ); // move remaining text 1 character right
+                                cursor -= 2;                                                    // backup over "c\n" language value
+                                if ( *(cursor - 1) != 'x' ) {                   // 0x before code
+                                        for ( int i = 0; i < 6; i += 1 ) {      // move N (magic) lines forward
+                                                cursor = strstr( cursor, "\n" ) + 1;
+                                        } // for
+                                        fprintf( stderr, "*** ERROR *** Invalid C language code found in assembler file: %s\n"
+                                                         "Assembler debug information:\n%.*s",
+                                                         argv[argc - 1], (int)(cursor - dcursor), dcursor );
+                                        exit( EXIT_FAILURE );
+                                };
 
-                        *(cursor) = '2';                                                        // replace C language value with CFA
-                        *(cursor + 1) = '5';
+                                // Expand file by one byte to hold 2 character Cforall language code.
+                                if ( ftruncate( fd, size + 1 ) ) { perror( "ftruncate" ); exit( EXIT_FAILURE ); };
+
+                                memmove( cursor + 2, cursor + 1, start + size - cursor - 1 ); // move remaining text 1 character right
+
+                                *(cursor) = '2';                                                // replace C language value with CFA
+                                *(cursor + 1) = '5';
+                        } // if
                 } // if