Changeset 6c53a93 for driver/as.cc

Timestamp:

Jan 5, 2022, 10:39:39 AM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

0ac728b

Parents:

e2853eb (diff), 6111f1f (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

driver/as.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// as.c -- map assembler file, scan for debug information. If found, expand file by one character and insert Cforall
-//         language code on the N line from the start of the debug information.
+// as.c -- map assembler file, scan for debug information, then language code, and skip N lines forward to code. If
+//         code is C dialect, possibly expand file by one character, and replace with Cforall language code.
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug  1 10:49:42 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Sep  8 08:40:16 2018
-// Update Count     : 97
+// Last Modified On : Wed Dec  8 07:56:12 2021
+// Update Count     : 136
 //
 
@@ -18 +18 @@
 #include <cstdlib>                                                                              // exit
 #include <fcntl.h>                                                                              // open
-#include <unistd.h>
-#include <sys/stat.h>
+#include <cstring>                                                                              // strstr, memmove
+#include <unistd.h>                                                                             // ftruncate,execvp
+#include <sys/stat.h>                                                                   // fstat
 #include <sys/mman.h>                                                                   // mmap
-#include <string.h>
 
 //#define __DEBUG_H__
-
-#ifdef __DEBUG_H__
-#include <iostream>
-using namespace std;
-#endif // __DEBUG_H__
 
 int main( const int argc, const char * argv[] ) {
         #ifdef __DEBUG_H__
         for ( int i = 0; i < argc; i += 1 ) {
-                cerr << argv[i] << endl;
+                fprintf( stderr, "%s\n", argv[i] );
         } // for
         #endif // __DEBUG_H__
@@ -48 +43 @@
                 if ( start == (void *)-1 ) { perror( "mmap" ); exit( EXIT_FAILURE ); };
 
-                if ( char * cursor = 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 ?
 
-                        for ( int i = 0; i < 8; i += 1 ) {                      // move N (magic) lines forward
-                                cursor = strstr( cursor, "\n" ) + 1;
-                        } // for
+                        if ( char * cursor = strstr( dcursor, ".long\t.LASF" ) ) { // language code ?
+                                for ( int i = 0; i < 2; i += 1 ) {              // move N (magic) lines forward
+                                        cursor = strstr( cursor, "\n" ) + 1;
+                                } // for
+                                cursor -= 2;                                                    // backup over "d\n", where d is a hex digit
+                                // From elfcpp/dwarf.h in the binutils source tree.
+                                // DW_LANG_C89 = 0x1, DW_LANG_C = 0x2, DW_LANG_C99 = 0xc, DW_LANG_C11 = 0x1d
+                                if ( *(cursor - 2) == '0' && *(cursor - 1) == 'x' &&
+                                         (*cursor == 'c' || *cursor == '1' || *cursor == '2') ) { // C99/C89/C
+                                        // 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
+                                } else if ( *(cursor - 3) == '0' && *(cursor - 2) == 'x' && *(cursor - 1) == '1' && *cursor == 'd' ) { // C11
+                                } else {
+                                        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 );
+                                } // if
 
-                        cursor -= 2;                                                            // backup over "c\n" language value
-                        if ( *(cursor - 1) != 'x' ) { fprintf( stderr, "invalid C language code\n" ); 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';
+                                *(cursor - 1) = '2';                                    // replace C89/C/C99/C11 language code with CFA code
+                                *cursor = '5';
+                        } // if
                 } // if