Changeset b84ab40

Timestamp:

Dec 16, 2019, 11:28:03 AM (4 years ago)

Author:

Dmitry Kobets <dkobets@…>

Branches:

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

Children:

1712f542

Parents:

0f4527d (diff), ab5c0008 (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' into vector-generic

Files:

• libcfa/src/interpose.cfa (modified) (2 diffs)
• src/AST/Type.cpp (modified) (3 diffs)
• src/BasicTypes-gen.cc (modified) (3 diffs)
• src/SynTree/Type.cc (modified) (5 diffs)

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Nov 30 07:09:42 2019
-// Update Count     : 119
+// Last Modified On : Fri Dec 13 13:45:21 2019
+// Update Count     : 121
 //
 
@@ -229 +229 @@
 
 void sigHandler_segv( __CFA_SIGPARMS__ ) {
-        abort( "Addressing invalid memory at location %p\n"
-                        "Possible cause is reading outside the address space or writing to a protected area within the address space with an invalid pointer or subscript.\n",
-                        sfp->si_addr );
+                if ( sfp->si_addr == NULL ) {
+                        abort( "Null pointer (0p) dereference.\n" );
+                } else {
+                        abort( "%s at memory location %p.\n"
+                                   "Possible cause is reading outside the address space or writing to a protected area within the address space with an invalid pointer or subscript.\n",
+                                   (sig == SIGSEGV ? "Segment fault" : "Bus error"), sfp->si_addr );
+                }
 }
 

src/AST/Type.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Mon May 13 15:00:00 2019
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon May 13 15:00:00 2019
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Dec 15 16:56:28 2019
+// Update Count     : 4
 //
 
@@ -48 +48 @@
 // --- BasicType
 
-const char *BasicType::typeNames[] = {
+// GENERATED START, DO NOT EDIT
+// GENERATED BY BasicTypes-gen.cc
+const char * BasicType::typeNames[] = {
         "_Bool",
         "char",
@@ -86 +88 @@
         "_Float128x _Complex",
 };
-static_assert(
-        sizeof(BasicType::typeNames)/sizeof(BasicType::typeNames[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
-        "Each basic type name should have a corresponding kind enum value"
-);
+// GENERATED END
 
 // --- FunctionType

src/BasicTypes-gen.cc

@@ -273 +273 @@
 
 
-        #define Type TOP_SRCDIR "src/SynTree/Type.h"
-        resetInput( file, Type, buffer, code, str );
-
-        if ( (start = str.find( STARTMK )) == string::npos ) Abort( "start", Type );
+        #define TypeH TOP_SRCDIR "src/SynTree/Type.h"
+        resetInput( file, TypeH, buffer, code, str );
+
+        if ( (start = str.find( STARTMK )) == string::npos ) Abort( "start", TypeH );
         start += sizeof( STARTMK );                                                     // includes newline
         code << str.substr( 0, start );
@@ -289 +289 @@
         code << "\t";                                                                           // indentation for end marker
 
-        if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", Type );
-        code << str.substr( start );
-
-        output( file, Type, code );
+        if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", TypeH );
+        code << str.substr( start );
+
+        output( file, TypeH, code );
+        // cout << code.str();
+
+
+        #define TypeC TOP_SRCDIR "src/SynTree/Type.cc"
+        resetInput( file, TypeC, buffer, code, str );
+
+        if ( (start = str.find( STARTMK )) == string::npos ) Abort( "start", TypeC );
+        start += sizeof( STARTMK );                                                     // includes newline
+        code << str.substr( 0, start );
+
+        code << BYMK << endl;
+        code << "const char * BasicType::typeNames[] = {" << endl;
+        for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
+                code << "\t\"" << graph[r].type << "\"," << endl;
+        } // for        
+        code << "};" << endl;
+
+        if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", TypeC );
+        code << str.substr( start );
+
+        output( file, TypeC, code );
         // cout << code.str();
 
 
         // TEMPORARY DURING CHANGE OVER
-        #define TypeAST TOP_SRCDIR "src/AST/Type.hpp"
-        resetInput( file, TypeAST, buffer, code, str );
-
-        if ( (start = str.find( STARTMK )) == string::npos ) Abort( "start", TypeAST );
+        #define TypeH_AST TOP_SRCDIR "src/AST/Type.hpp"
+        resetInput( file, TypeH_AST, buffer, code, str );
+
+        if ( (start = str.find( STARTMK )) == string::npos ) Abort( "start", TypeH_AST );
         start += sizeof( STARTMK );                                                     // includes newline
         code << str.substr( 0, start );
@@ -313 +334 @@
         code << "\t";                                                                           // indentation for end marker
 
-        if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", TypeAST );
-        code << str.substr( start );
-
-        output( file, TypeAST, code );
+        if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", TypeH_AST );
+        code << str.substr( start );
+
+        output( file, TypeH_AST, code );
+        // cout << code.str();
+
+
+        #define TypeC_AST TOP_SRCDIR "src/AST/Type.cpp"
+        resetInput( file, TypeC_AST, buffer, code, str );
+
+        if ( (start = str.find( STARTMK )) == string::npos ) Abort( "start", TypeC_AST );
+        start += sizeof( STARTMK );                                                     // includes newline
+        code << str.substr( 0, start );
+
+        code << BYMK << endl;
+        code << "const char * BasicType::typeNames[] = {" << endl;
+        for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
+                code << "\t\"" << graph[r].type << "\"," << endl;
+        } // for        
+        code << "};" << endl;
+
+        if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", TypeC_AST );
+        code << str.substr( start );
+
+        output( file, TypeC_AST, code );
         // cout << code.str();
 

src/SynTree/Type.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  4 21:05:07 2019
-// Update Count     : 45
+// Last Modified On : Sun Dec 15 16:52:37 2019
+// Update Count     : 49
 //
 #include "Type.h"
@@ -24 +24 @@
 using namespace std;
 
+// GENERATED START, DO NOT EDIT
+// GENERATED BY BasicTypes-gen.cc
 const char * BasicType::typeNames[] = {
         "_Bool",
@@ -45 +47 @@
         "float",
         "float _Complex",
-        //"float _Imaginary",
         "_Float32x",
         "_Float32x _Complex",
@@ -52 +53 @@
         "double",
         "double _Complex",
-        //"double _Imaginary",
         "_Float64x",
         "_Float64x _Complex",
@@ -61 +61 @@
         "long double",
         "long double _Complex",
-        //"long double _Imaginary",
         "_Float128x",
         "_Float128x _Complex",
 };
-static_assert(
-        sizeof(BasicType::typeNames) / sizeof(BasicType::typeNames[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
-        "Each basic type name should have a corresponding kind enum value"
-);
+// GENERATED END
 
 Type::Type( const Qualifiers &tq, const std::list< Attribute * > & attributes ) : tq( tq ), attributes( attributes ) {}