Changeset d7312ac

Timestamp:

May 5, 2018, 9:33:28 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7867eb9

Parents:

43c461d

Message:

make directives work and use them to remove warnings

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (9 diffs)
• libcfa/interpose.c (modified) (7 diffs)
• libcfa/time.c (modified) (5 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep  3 20:42:52 2017
-// Update Count     : 490
+// Last Modified On : Sat May  5 09:08:32 2018
+// Update Count     : 494
 //
 #include "CodeGenerator.h"
@@ -370 +370 @@
 
         void CodeGenerator::postvisit( Constant * constant ) {
-                output << constant->get_value() ;
+                output << constant->get_value();
         }
 
@@ -587 +587 @@
                 output << "(";
                 if ( castExpr->get_result()->isVoid() ) {
-                        output << "(void)" ;
+                        output << "(void)";
                 } else {
                         // at least one result type of cast.
@@ -878 +878 @@
                         } // for
                 } // if
-                output << " );" ;
+                output << " );";
         }
 
@@ -886 +886 @@
                 output << "( ";
                 if ( asmStmt->get_instruction() ) asmStmt->get_instruction()->accept( *visitor );
-                output << " )" ;
+                output << " )";
         }
 
         void CodeGenerator::postvisit( DirectiveStmt * dirStmt ) {
-                output << dirStmt->directive;
+                output << endl << dirStmt->directive;                   // endl prevents spaces before directive
         }
 
@@ -907 +907 @@
 
         void CodeGenerator::postvisit( SwitchStmt * switchStmt ) {
-                output << "switch ( " ;
+                output << "switch ( ";
                 switchStmt->get_condition()->accept( *visitor );
                 output << " ) ";
@@ -933 +933 @@
                 ++indent;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
-                        output << indent << printLabels( (*i)->get_labels() )  ;
+                        output << indent << printLabels( (*i)->get_labels() ) ;
                         (*i)->accept( *visitor );
                         output << endl;
@@ -1070 +1070 @@
         void CodeGenerator::postvisit( WhileStmt * whileStmt ) {
                 if ( whileStmt->get_isDoWhile() ) {
-                        output << "do" ;
-                } else {
-                        output << "while (" ;
+                        output << "do";
+                } else {
+                        output << "while (";
                         whileStmt->get_condition()->accept( *visitor );
                         output << ")";
@@ -1084 +1084 @@
 
                 if ( whileStmt->get_isDoWhile() ) {
-                        output << " while (" ;
+                        output << " while (";
                         whileStmt->get_condition()->accept( *visitor );
                         output << ");";

src/libcfa/interpose.c

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri May  4 14:35:13 2018
-// Update Count     : 97
+// Last Modified On : Sat May  5 09:16:57 2018
+// Update Count     : 99
 //
 
@@ -85 +85 @@
 
 struct {
-        void (* exit)( int ) __attribute__ (( __noreturn__ ));
-        void (* abort)( void ) __attribute__ (( __noreturn__ ));
+        void (* exit)( int ) __attribute__(( __noreturn__ ));
+        void (* abort)( void ) __attribute__(( __noreturn__ ));
 } __cabi_libc;
 
@@ -94 +94 @@
                 const char *version = NULL;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
                 INTERPOSE_LIBC( abort, version );
                 INTERPOSE_LIBC( exit , version );
+#pragma GCC diagnostic pop
 
                 __cfaabi_sigaction( SIGSEGV, sigHandler_segv , SA_SIGINFO ); // Failure handler
@@ -112 +115 @@
 
 // Forward declare abort after the __typeof__ call to avoid ambiguities
-void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ ));
-void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
+void exit( int status, const char fmt[], ... ) __attribute__(( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ ));
+void abort( const char fmt[], ... ) __attribute__(( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 
 extern "C" {
-        void abort( void ) __attribute__ (( __nothrow__, __leaf__, __noreturn__ )) {
+        void abort( void ) __attribute__(( __nothrow__, __leaf__, __noreturn__ )) {
                 abort( NULL );
         }
 
-        void __cabi_abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
+        void __cabi_abort( const char fmt[], ... ) __attribute__(( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
                 va_list argp;
                 va_start( argp, fmt );
@@ -127 +130 @@
         }
 
-        void exit( int status ) __attribute__ (( __nothrow__, __leaf__, __noreturn__ )) {
+        void exit( int status ) __attribute__(( __nothrow__, __leaf__, __noreturn__ )) {
                 __cabi_libc.exit( status );
         }
 }
 
-void * kernel_abort    ( void ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) { return NULL; }
-void   kernel_abort_msg( void * data, char * buffer, int size ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) {}
-int kernel_abort_lastframe( void ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) { return 4; }
+void * kernel_abort    ( void ) __attribute__(( __nothrow__, __leaf__, __weak__ )) { return NULL; }
+void   kernel_abort_msg( void * data, char * buffer, int size ) __attribute__(( __nothrow__, __leaf__, __weak__ )) {}
+int kernel_abort_lastframe( void ) __attribute__(( __nothrow__, __leaf__, __weak__ )) { return 4; }
 
 enum { abort_text_size = 1024 };
@@ -140 +143 @@
 static int abort_lastframe;
 
-void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ )) {
+void exit( int status, const char fmt[], ... ) __attribute__(( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ )) {
     va_list args;
     va_start( args, fmt );
@@ -148 +151 @@
 }
 
-void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
+void abort( const char fmt[], ... ) __attribute__(( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
         void * kernel_data = kernel_abort();                    // must be done here to lock down kernel
         int len;

src/libcfa/time.c

@@ -10 +10 @@
 // Created On       : Tue Mar 27 13:33:14 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 12 14:41:00 2018
-// Update Count     : 22
+// Last Modified On : Sat May  5 09:04:51 2018
+// Update Count     : 36
 // 
 
@@ -17 +17 @@
 #include "iostream"
 #include <stdio.h>                                                                              // snprintf
+#include <assert.h>
 
 static char * nanomsd( long int ns, char * buf ) {              // most significant digits
@@ -87 +88 @@
         time_t s = tv / TIMEGRAN;
         tm tm;
-        gmtime_r( &s, &tm );
+        gmtime_r( &s, &tm );                                                            // tm_mon <= 11, tm_mday <= 31
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
         snprintf( buf, 9, "%02d/%02d/%02d", tm.tm_year % 99, tm.tm_mon + 1, tm.tm_mday );
+#pragma GCC diagnostic pop
         return buf;
 } // yy_mm_dd
@@ -95 +99 @@
         time_t s = tv / TIMEGRAN;
         tm tm;
-        gmtime_r( &s, &tm );
+        gmtime_r( &s, &tm );                                                            // tm_mon <= 11, tm_mday <= 31
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
         snprintf( buf, 9, "%02d/%02d/%02d", tm.tm_mon + 1, tm.tm_mday, tm.tm_year % 99 );
+#pragma GCC diagnostic pop
         return buf;
 } // mm_dd_yy
@@ -103 +110 @@
         time_t s = tv / TIMEGRAN;
         tm tm;
-        gmtime_r( &s, &tm );
+        gmtime_r( &s, &tm );                                                            // tm_mon <= 11, tm_mday <= 31
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
         snprintf( buf, 9, "%02d/%02d/%02d", tm.tm_mday, tm.tm_mon + 1, tm.tm_year % 99 );
+#pragma GCC diagnostic pop
         return buf;
 } // dd_mm_yy