Changes in src/CodeGen/CodeGenerator.cc [2a4b088:803deb1]

File:

• src/CodeGen/CodeGenerator.cc (modified) (35 diffs)

src/CodeGen/CodeGenerator.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CodeGenerator.cc -- 
+// CodeGenerator.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 25 21:22:00 2016
-// Update Count     : 242
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jan 20 12:54:50 2016
+// Update Count     : 241
 //
 
@@ -26 +26 @@
 #include "SynTree/Statement.h"
 
-#include "Common/utility.h"
-#include "Common/UnimplementedError.h"
+#include "utility.h"
+#include "UnimplementedError.h"
 
 #include "CodeGenerator.h"
@@ -98 +98 @@
                 handleStorageClass( objectDecl );
                 output << genType( objectDecl->get_type(), mangleName( objectDecl ) );
-        
+
                 if ( objectDecl->get_init() ) {
                         output << " = ";
@@ -112 +112 @@
                 if ( aggDecl->get_name() != "" )
                         output << aggDecl->get_name();
-        
+
                 std::list< Declaration * > &memb = aggDecl->get_members();
 
@@ -118 +118 @@
                         output << " {" << endl;
 
-                        cur_indent += CodeGenerator::tabsize; 
+                        cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
-                                output << indent; 
+                                output << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
                         }
 
-                        cur_indent -= CodeGenerator::tabsize; 
+                        cur_indent -= CodeGenerator::tabsize;
 
                         output << indent << "}";
@@ -140 +140 @@
                 handleAggregate( aggregateDecl );
         }
-  
+
         void CodeGenerator::visit( EnumDecl *aggDecl ) {
                 output << "enum ";
@@ -146 +146 @@
                 if ( aggDecl->get_name() != "" )
                         output << aggDecl->get_name();
-        
+
                 std::list< Declaration* > &memb = aggDecl->get_members();
 
@@ -152 +152 @@
                         output << " {" << endl;
 
-                        cur_indent += CodeGenerator::tabsize; 
+                        cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl *obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << indent << mangleName( obj ); 
+                                output << indent << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -164 +164 @@
                         } // for
 
-                        cur_indent -= CodeGenerator::tabsize; 
+                        cur_indent -= CodeGenerator::tabsize;
 
                         output << indent << "}";
                 } // if
         }
-  
+
         void CodeGenerator::visit( ContextDecl *aggregateDecl ) {}
-  
+
         void CodeGenerator::visit( TypedefDecl *typeDecl ) {
                 output << "typedef ";
                 output << genType( typeDecl->get_base(), typeDecl->get_name() );
         }
-  
+
         void CodeGenerator::visit( TypeDecl *typeDecl ) {
                 // really, we should mutate this into something that isn't a TypeDecl but that requires large-scale changes,
@@ -216 +216 @@
         }
 
-        void CodeGenerator::visit( Constant *constant ) { 
+        void CodeGenerator::visit( Constant *constant ) {
                 output << constant->get_value() ;
         }
@@ -233 +233 @@
                                                 assert( arg != applicationExpr->get_args().end() );
                                                 if ( AddressExpr *addrExpr = dynamic_cast< AddressExpr * >( *arg ) ) {
-                
+
                                                         *arg = addrExpr->get_arg();
                                                 } else {
@@ -242 +242 @@
                                                 break;
                                         }
-              
+
                                   default:
                                         // do nothing
                                         ;
                                 }
-            
+
                                 switch ( opInfo.type ) {
                                   case OT_INDEX:
@@ -256 +256 @@
                                         output << "]";
                                         break;
-              
+
                                   case OT_CALL:
                                         // there are no intrinsic definitions of the function call operator
                                         assert( false );
                                         break;
-              
+
                                   case OT_PREFIX:
                                   case OT_PREFIXASSIGN:
@@ -270 +270 @@
                                         output << ")";
                                         break;
-              
+
                                   case OT_POSTFIX:
                                   case OT_POSTFIXASSIGN:
@@ -287 +287 @@
                                         output << ")";
                                         break;
-              
+
                                   case OT_CONSTANT:
                                   case OT_LABELADDRESS:
@@ -306 +306 @@
                 } // if
         }
-  
+
         void CodeGenerator::visit( UntypedExpr *untypedExpr ) {
                 if ( NameExpr *nameExpr = dynamic_cast< NameExpr* >( untypedExpr->get_function() ) ) {
@@ -320 +320 @@
                                         output << "]";
                                         break;
-              
+
                                   case OT_CALL:
                                         assert( false );
                                         break;
-              
+
                                   case OT_PREFIX:
                                   case OT_PREFIXASSIGN:
@@ -334 +334 @@
                                         output << ")";
                                         break;
-              
+
                                   case OT_POSTFIX:
                                   case OT_POSTFIXASSIGN:
@@ -341 +341 @@
                                         output << opInfo.symbol;
                                         break;
-  
+
                                   case OT_INFIX:
                                   case OT_INFIXASSIGN:
@@ -351 +351 @@
                                         output << ")";
                                         break;
-                                        
+
                                   case OT_CONSTANT:
                                         // there are no intrinsic definitions of 0 or 1 as functions
@@ -369 +369 @@
                 } // if
         }
-  
+
         void CodeGenerator::visit( NameExpr *nameExpr ) {
                 OperatorInfo opInfo;
@@ -379 +379 @@
                 } // if
         }
-  
+
         void CodeGenerator::visit( AddressExpr *addressExpr ) {
                 output << "(&";
@@ -408 +408 @@
                 output << ")";
         }
-  
+
         void CodeGenerator::visit( UntypedMemberExpr *memberExpr ) {
                 assert( false );
         }
-  
+
         void CodeGenerator::visit( MemberExpr *memberExpr ) {
                 memberExpr->get_aggregate()->accept( *this );
                 output << "." << mangleName( memberExpr->get_member() );
         }
-  
+
         void CodeGenerator::visit( VariableExpr *variableExpr ) {
                 OperatorInfo opInfo;
@@ -426 +426 @@
                 } // if
         }
-  
+
         void CodeGenerator::visit( ConstantExpr *constantExpr ) {
                 assert( constantExpr->get_constant() );
                 constantExpr->get_constant()->accept( *this );
         }
-  
+
         void CodeGenerator::visit( SizeofExpr *sizeofExpr ) {
                 output << "sizeof(";
@@ -442 +442 @@
         }
 
-        void CodeGenerator::visit( AlignofExpr *alignofExpr ) {
+        void CodeGenerator::visit( AlignofExpr *sizeofExpr ) {
                 // use GCC extension to avoid bumping std to C11
                 output << "__alignof__(";
-                if ( alignofExpr->get_isType() ) {
-                        output << genType( alignofExpr->get_type(), "" );
-                } else {
-                        alignofExpr->get_expr()->accept( *this );
+                if ( sizeofExpr->get_isType() ) {
+                        output << genType( sizeofExpr->get_type(), "" );
+                } else {
+                        sizeofExpr->get_expr()->accept( *this );
                 } // if
                 output << ")";
         }
 
-        void CodeGenerator::visit( UntypedOffsetofExpr *offsetofExpr ) {
-                assert( false );
-        }
-
-        void CodeGenerator::visit( OffsetofExpr *offsetofExpr ) {
-                // use GCC builtin
-                output << "__builtin_offsetof(";
-                output << genType( offsetofExpr->get_type(), "" );
-                output << ", " << mangleName( offsetofExpr->get_member() );
-                output << ")";
-        }
-  
         void CodeGenerator::visit( LogicalExpr *logicalExpr ) {
                 output << "(";
@@ -476 +464 @@
                 output << ")";
         }
-  
+
         void CodeGenerator::visit( ConditionalExpr *conditionalExpr ) {
                 output << "(";
@@ -486 +474 @@
                 output << ")";
         }
-  
+
         void CodeGenerator::visit( CommaExpr *commaExpr ) {
                 output << "(";
@@ -494 +482 @@
                 output << ")";
         }
-  
+
         void CodeGenerator::visit( TupleExpr *tupleExpr ) {}
-  
+
         void CodeGenerator::visit( TypeExpr *typeExpr ) {}
 
@@ -527 +515 @@
                         }
                 }
-                cur_indent -= CodeGenerator::tabsize; 
+                cur_indent -= CodeGenerator::tabsize;
 
                 output << indent << "}";
@@ -533 +521 @@
 
         void CodeGenerator::visit( ExprStmt *exprStmt ) {
-                // I don't see why this check is necessary. 
-                // If this starts to cause problems then put it back in, 
+                // I don't see why this check is necessary.
+                // If this starts to cause problems then put it back in,
                 // with an explanation
                 assert( exprStmt );
@@ -584 +572 @@
                 switchStmt->get_condition()->accept( *this );
                 output << " ) ";
-                
+
                 output << "{" << std::endl;
                 cur_indent += CodeGenerator::tabsize;
@@ -604 +592 @@
                 } // if
                 output << ":\n";
-                
+
                 std::list<Statement *> sts = caseStmt->get_statements();
 
@@ -621 +609 @@
                         if ( ! branchStmt->get_target().empty() )
                                 output << "goto " << branchStmt->get_target();
-                        else { 
+                        else {
                                 if ( branchStmt->get_computedTarget() != 0 ) {
                                         output << "goto *";
@@ -672 +660 @@
 
         void CodeGenerator::visit( ForStmt *forStmt ) {
-                // initialization is always hoisted, so don't 
-                // bother doing anything with that 
+                // initialization is always hoisted, so don't
+                // bother doing anything with that
                 output << "for (;";
 
@@ -697 +685 @@
         void CodeGenerator::visit( DeclStmt *declStmt ) {
                 declStmt->get_decl()->accept( *this );
-        
+
                 if ( doSemicolon( declStmt->get_decl() ) ) {
                         output << ";";