Changeset 3ecfa13 for src

Timestamp:

Feb 8, 2020, 3:21:45 PM (5 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:

8c9da33

Parents:

0f5da65 (diff), 74330e7 (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

Location:

src

Files:

• Common/PassVisitor.impl.h (modified) (3 diffs)
• Concurrency/Keywords.cc (modified) (1 diff)
• Parser/ParseNode.h (modified) (2 diffs)
• Parser/lex.ll (modified) (2 diffs)
• main.cc (modified) (5 diffs)

src/Common/PassVisitor.impl.h

@@ -3302 +3302 @@
         VISIT_START( node );
 
-        indexerAddStruct( node->name );
+        indexerAddUnion( node->name );
 
         {
@@ -3317 +3317 @@
         VISIT_START( node );
 
-        indexerAddStruct( node->name );
+        indexerAddUnion( node->name );
 
         {
@@ -3332 +3332 @@
         MUTATE_START( node );
 
-        indexerAddStruct( node->name );
+        indexerAddUnion( node->name );
 
         {

src/Concurrency/Keywords.cc

@@ -716 +716 @@
                                 new UntypedExpr(
                                         new NameExpr( "__thrd_start" ),
-                                        { new VariableExpr( param ) }
+                                        { new VariableExpr( param ), new NameExpr("main") }
                                 )
                         )

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 16 07:46:01 2019
-// Update Count     : 888
+// Last Modified On : Fri Feb  7 17:56:02 2020
+// Update Count     : 891
 //
 
@@ -449 +449 @@
                                 * out++ = result;
                         } else {
-                                assertf(false, "buildList unknown type");
+                                SemanticError( cur->location, "type specifier declaration in forall clause is currently unimplemented." );
                         } // if
                 } catch( SemanticErrorException & e ) {

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sat Feb  1 07:16:44 2020
- * Update Count     : 724
+ * Last Modified On : Fri Feb  7 19:02:43 2020
+ * Update Count     : 725
  */
 
@@ -330 +330 @@
                                 /* identifier */
 {identifier}    { IDENTIFIER_RETURN(); }
-"``"{identifier}"``" {                                                                  // CFA
-        yytext[yyleng - 2] = '\0'; yytext += 2;                         // SKULLDUGGERY: remove backquotes (ok to shorten?)
+"``"{identifier} {                                                                              // CFA
+        yytext[yyleng] = '\0'; yytext += 2;                                     // SKULLDUGGERY: remove backquotes (ok to shorten?)
         IDENTIFIER_RETURN();
 }

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 16 17:55:53 2019
-// Update Count     : 627
+// Last Modified On : Sat Feb  8 08:33:50 2020
+// Update Count     : 633
 //
 
@@ -105 +105 @@
 
 static void backtrace( int start ) {                                    // skip first N stack frames
-        enum { Frames = 50 };
+        enum { Frames = 50, };                                                          // maximum number of stack frames
         void * array[Frames];
-        int size = ::backtrace( array, Frames );
+        size_t size = ::backtrace( array, Frames );
         char ** messages = ::backtrace_symbols( array, size ); // does not demangle names
 
@@ -114 +114 @@
 
         // skip last 2 stack frames after main
-        for ( int i = start; i < size - 2 && messages != nullptr; i += 1 ) {
+        for ( unsigned int i = start; i < size - 2 && messages != nullptr; i += 1 ) {
                 char * mangled_name = nullptr, * offset_begin = nullptr, * offset_end = nullptr;
 
@@ -180 +180 @@
 } // sigSegvBusHandler
 
+static void sigFpeHandler( SIGPARMS ) {
+        const char * msg;
+
+        switch ( sfp->si_code ) {
+          case FPE_INTDIV: case FPE_FLTDIV: msg = "divide by zero"; break;
+          case FPE_FLTOVF: msg = "overflow"; break;
+          case FPE_FLTUND: msg = "underflow"; break;
+          case FPE_FLTRES: msg = "inexact result"; break;
+          case FPE_FLTINV: msg = "invalid operation"; break;
+          default: msg = "unknown";
+        } // choose
+        cerr << "Computation error " << msg << " at location " << sfp->si_addr << endl
+                 << "Possible cause is constant-expression evaluation invalid." << endl;
+        backtrace( 2 );                                                                         // skip first 2 stack frames
+        abort();                                                                                        // cause core dump for debugging
+} // sigFpeHandler
+
 static void sigAbortHandler( SIGPARMS ) {
         backtrace( 6 );                                                                         // skip first 6 stack frames
@@ -193 +210 @@
         Signal( SIGSEGV, sigSegvBusHandler, SA_SIGINFO );
         Signal( SIGBUS, sigSegvBusHandler, SA_SIGINFO );
+        Signal( SIGFPE, sigFpeHandler, SA_SIGINFO );
         Signal( SIGABRT, sigAbortHandler, SA_SIGINFO );