Changeset b3f252a for src/CodeGen

Timestamp:

Sep 7, 2017, 10:36:35 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, resolv-new, with_gc

Children:

e0886db

Parents:

871cdb4 (diff), 416cc86 (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/CodeGen

Files:

• CodeGenerator.cc (modified) (7 diffs)
• CodeGenerator.h (modified) (1 diff)
• Generate.cc (modified) (3 diffs)
• OperatorTable.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 15:34:00 2017
-// Update Count     : 488
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Sep  3 20:42:52 2017
+// Update Count     : 490
 //
 #include "CodeGenerator.h"
@@ -59 +59 @@
 
         void CodeGenerator::asmName( DeclarationWithType * decl ) {
-                if ( ConstantExpr * asmName = decl->get_asmName() ) {
+                if ( ConstantExpr * asmName = dynamic_cast<ConstantExpr *>(decl->get_asmName()) ) {
                         output << " asm ( " << asmName->get_constant()->get_value() << " )";
                 } // if
@@ -195 +195 @@
                 }
 
-                output << kind;
-                if ( aggDecl->get_name() != "" )
-                        output << aggDecl->get_name();
+                output << kind << aggDecl->get_name();
 
                 if ( aggDecl->has_body() ) {
@@ -233 +231 @@
                 genAttributes( enumDecl->get_attributes() );
 
-                if ( enumDecl->get_name() != "" )
-                        output << enumDecl->get_name();
+                output << enumDecl->get_name();
 
                 std::list< Declaration* > &memb = enumDecl->get_members();
@@ -260 +257 @@
         }
 
-        void CodeGenerator::visit( __attribute__((unused)) TraitDecl * traitDecl ) {}
+        void CodeGenerator::visit( TraitDecl * traitDecl ) {
+                assertf( ! genC, "TraitDecl nodes should not reach code generation." );
+                extension( traitDecl );
+                handleAggregate( traitDecl, "trait " );
+        }
 
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
@@ -545 +546 @@
                 extension( addressExpr );
                 output << "(&";
-                // this hack makes sure that we don't convert "constant_zero" to "0" if we're taking its address
-                if ( VariableExpr * variableExpr = dynamic_cast< VariableExpr* >( addressExpr->get_arg() ) ) {
-                        output << mangleName( variableExpr->get_var() );
-                } else {
-                        addressExpr->get_arg()->accept( *this );
-                } // if
+                addressExpr->arg->accept( *this );
                 output << ")";
+        }
+
+        void CodeGenerator::visit( LabelAddressExpr *addressExpr ) {
+                extension( addressExpr );
+                output << "(&&" << addressExpr->arg << ")";
         }
 
@@ -760 +761 @@
                 for ( Statement * stmt : stmts ) {
                         updateLocation( stmt );
-                        output << printLabels( stmt->get_labels() );
+                        output << indent << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
                                 // last statement in a statement expression needs to be handled specially -

src/CodeGen/CodeGenerator.h

@@ -59 +59 @@
                 virtual void visit( NameExpr *nameExpr );
                 virtual void visit( AddressExpr *addressExpr );
+                virtual void visit( LabelAddressExpr *addressExpr );
                 virtual void visit( CastExpr *castExpr );
                 virtual void visit( VirtualCastExpr *castExpr );

src/CodeGen/Generate.cc

@@ -21 +21 @@
 #include "CodeGenerator.h"           // for CodeGenerator, doSemicolon, oper...
 #include "GenType.h"                 // for genPrettyType
+#include "Common/PassVisitor.h"      // for PassVisitor
 #include "Parser/LinkageSpec.h"      // for isBuiltin, isGeneratable
 #include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
@@ -29 +30 @@
 
 namespace CodeGen {
+        namespace {
+                /// Removes misc. nodes that should not exist in CodeGen
+                struct TreeCleaner {
+                        void visit( CompoundStmt * stmt );
+
+                        static bool shouldClean( Declaration * );
+                };
+
+                void cleanTree( std::list< Declaration * > & translationUnit ) {
+                        PassVisitor<TreeCleaner> cleaner;
+                        filter( translationUnit, [](Declaration * decl) { return TreeCleaner::shouldClean(decl); }, false );
+                        acceptAll( translationUnit, cleaner );
+                } // cleanTree
+        } // namespace
+
         void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC, bool lineMarks ) {
+                cleanTree( translationUnit );
+
                 CodeGen::CodeGenerator cgv( os, pretty, generateC, lineMarks );
                 for ( auto & dcl : translationUnit ) {
@@ -52 +70 @@
                 os << std::endl;
         }
+
+        namespace {
+                void TreeCleaner::visit( CompoundStmt * cstmt ) {
+                        filter( cstmt->kids, [](Statement * stmt) {
+                                if ( DeclStmt * declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
+                                        return shouldClean( declStmt->decl );
+                                }
+                                return false;
+                        }, false );
+                }
+
+                bool TreeCleaner::shouldClean( Declaration * decl ) {
+                        return dynamic_cast< TraitDecl * >( decl );
+                }
+        } // namespace
 } // namespace CodeGen
 

src/CodeGen/OperatorTable.cc

@@ -19 +19 @@
 
 #include "OperatorTable.h"
+#include "Common/utility.h"
 
 namespace CodeGen {
@@ -65 +66 @@
                         {       "?^=?",         "^=",   "_operator_bitxorassign",               OT_INFIXASSIGN          },
                         {       "?|=?",         "|=",   "_operator_bitorassign",                OT_INFIXASSIGN          },
-                        {       "&&",           "&&",   "&&",                                                   OT_LABELADDRESS         },
-                        {       "0",            "0",    "_constant_zero",                               OT_CONSTANT                     },
-                        {       "1",            "1",    "_constant_one",                                OT_CONSTANT                     }
                 };
 
@@ -86 +84 @@
                         initialize();
                 } // if
+
                 std::map< std::string, OperatorInfo >::const_iterator i = table.find( funcName );
                 if ( i == table.end() ) {
+                        if ( isPrefix( funcName, "?`" ) ) {
+                                // handle literal suffixes, which are user-defined postfix operators
+                                info.inputName = funcName;
+                                info.symbol = funcName.substr(2);
+                                info.outputName = toString( "__operator_literal_", info.symbol );
+                                info.type = OT_POSTFIX;
+                                return true;
+                        }
                         return false;
                 } else {