Changeset 1cdfa82 for src/CodeGen

Timestamp:

Apr 25, 2018, 4:55:53 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (7 diffs)
• CodeGenerator.h (modified) (4 diffs)
• GenType.cc (modified) (2 diffs)
• Generate.cc (modified) (2 diffs)
• Generate.h (modified) (1 diff)
• OperatorTable.cc (modified) (2 diffs)
• OperatorTable.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -116 +116 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ), printExprTypes( printExprTypes ), endl( *this ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
@@ -159 +159 @@
         }
 
+        // *** Expression
+        void CodeGenerator::previsit( Expression * node ) {
+                previsit( (BaseSyntaxNode *)node );
+                GuardAction( [this, node](){
+                        if ( printExprTypes ) {
+                                output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
+                        }
+                } );
+        }
+
         // *** Declarations
         void CodeGenerator::postvisit( FunctionDecl * functionDecl ) {
@@ -203 +213 @@
 
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
-                genAttributes( aggDecl->get_attributes() );
-
                 if( ! aggDecl->get_parameters().empty() && ! genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
@@ -213 +221 @@
                 }
 
-                output << kind << aggDecl->get_name();
+                output << kind;
+                genAttributes( aggDecl->get_attributes() );
+                output << aggDecl->get_name();
 
                 if ( aggDecl->has_body() ) {
@@ -298 +308 @@
                         output << " }";
                 }
+        }
+
+        void CodeGenerator::postvisit( StaticAssertDecl * assertDecl ) {
+                output << "_Static_assert(";
+                assertDecl->condition->accept( *visitor );
+                output << ", ";
+                assertDecl->message->accept( *visitor );
+                output << ")";
         }
 
@@ -578 +596 @@
                         output << ")";
                 } // if
-                castExpr->get_arg()->accept( *visitor );
+                castExpr->arg->accept( *visitor );
+                output << ")";
+        }
+
+        void CodeGenerator::postvisit( KeywordCastExpr * castExpr ) {
+                assertf( ! genC, "KeywordCast should not reach code generation." );
+                extension( castExpr );
+                output << "((" << castExpr->targetString() << " &)";
+                castExpr->arg->accept( *visitor );
                 output << ")";
         }
@@ -928 +954 @@
                         output << "continue";
                         break;
+                  case BranchStmt::FallThrough:
+                  case BranchStmt::FallThroughDefault:
+                        assertf( ! genC, "fallthru should not reach code generation." );
+                  output << "fallthru";
+                        break;
                 } // switch
+                // print branch target for labelled break/continue/fallthru in debug mode
+                if ( ! genC && branchStmt->get_type() != BranchStmt::Goto ) {
+                        if ( ! branchStmt->get_target().empty() ) {
+                                output << " " << branchStmt->get_target();
+                        } else if ( branchStmt->get_type() == BranchStmt::FallThrough ) {
+                                output << " default";
+                        }
+                }
                 output << ";";
         }

src/CodeGen/CodeGenerator.h

@@ -27 +27 @@
 
 namespace CodeGen {
-        struct CodeGenerator : public WithShortCircuiting, public WithVisitorRef<CodeGenerator> {
+        struct CodeGenerator : public WithShortCircuiting, public WithGuards, public WithVisitorRef<CodeGenerator> {
           static int tabsize;
 
-                CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false, bool lineMarks = false );
+                CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false, bool lineMarks = false, bool printExprTypes = false );
 
                 //*** Turn off visit_children for all nodes
@@ -38 +38 @@
                 void postvisit( BaseSyntaxNode * );
 
+                //*** print type for all expressions
+                void previsit( Expression * node );
+
                 //*** Declaration
                 void postvisit( StructDecl * );
                 void postvisit( FunctionDecl * );
                 void postvisit( ObjectDecl * );
-                void postvisit( UnionDecl *aggregateDecl );
-                void postvisit( EnumDecl *aggregateDecl );
-                void postvisit( TraitDecl *aggregateDecl );
-                void postvisit( TypedefDecl *typeDecl );
-                void postvisit( TypeDecl *typeDecl );
+                void postvisit( UnionDecl * aggregateDecl );
+                void postvisit( EnumDecl * aggregateDecl );
+                void postvisit( TraitDecl * aggregateDecl );
+                void postvisit( TypedefDecl * typeDecl );
+                void postvisit( TypeDecl * typeDecl );
+                void postvisit( StaticAssertDecl * assertDecl );
 
                 //*** Initializer
@@ -65 +69 @@
                 void postvisit( LabelAddressExpr *addressExpr );
                 void postvisit( CastExpr *castExpr );
+                void postvisit( KeywordCastExpr * castExpr );
                 void postvisit( VirtualCastExpr *castExpr );
                 void postvisit( UntypedMemberExpr *memberExpr );
@@ -139 +144 @@
                 bool genC = false;    // true if output has to be C code
                 bool lineMarks = false;
+                bool printExprTypes = false;
         public:
                 LineEnder endl;

src/CodeGen/GenType.cc

@@ -48 +48 @@
                 void postvisit( ZeroType * zeroType );
                 void postvisit( OneType * oneType );
+                void postvisit( TraitInstType * inst );
+                void postvisit( TypeofType * typeof );
 
           private:
@@ -289 +291 @@
         }
 
+        void GenType::postvisit( TraitInstType * inst ) {
+                assertf( ! genC, "Trait types should not reach code generation." );
+                typeString = inst->name + " " + typeString;
+                handleQualifiers( inst );
+        }
+
+        void GenType::postvisit( TypeofType * typeof ) {
+                std::ostringstream os;
+                PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                os << "typeof(";
+                typeof->expr->accept( cg );
+                os << ") " << typeString;
+                typeString = os.str();
+                handleQualifiers( typeof );
+        }
+
         void GenType::handleQualifiers( Type * type ) {
                 if ( type->get_const() ) {

src/CodeGen/Generate.cc

@@ -46 +46 @@
         } // namespace
 
-        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC, bool lineMarks ) {
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC, bool lineMarks, bool printExprTypes ) {
                 cleanTree( translationUnit );
 
-                PassVisitor<CodeGenerator> cgv( os, pretty, generateC, lineMarks );
+                PassVisitor<CodeGenerator> cgv( os, pretty, generateC, lineMarks, printExprTypes );
                 for ( auto & dcl : translationUnit ) {
                         if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
@@ -66 +66 @@
                         os << CodeGen::genPrettyType( type, "" );
                 } else {
-                        PassVisitor<CodeGenerator> cgv( os, true, false, false );
+                        PassVisitor<CodeGenerator> cgv( os, true, false, false, false );
                         node->accept( cgv );
                 }

src/CodeGen/Generate.h

@@ -24 +24 @@
 namespace CodeGen {
         /// Generates code. doIntrinsics determines if intrinsic functions are printed, pretty formats output nicely (e.g., uses unmangled names, etc.), generateC is true when the output must consist only of C code (allows some assertions, etc.)
-        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false , bool lineMarks = false );
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false , bool lineMarks = false, bool printTypeExpr = false );
 
         /// Generate code for a single node -- helpful for debugging in gdb

src/CodeGen/OperatorTable.cc

@@ -79 +79 @@
         } // namespace
 
-        bool operatorLookup( std::string funcName, OperatorInfo &info ) {
+        bool operatorLookup( const std::string & funcName, OperatorInfo & info ) {
                 static bool init = false;
                 if ( ! init ) {
@@ -100 +100 @@
                         return true;
                 } // if
+        }
+
+        bool isOperator( const std::string & funcName ) {
+                OperatorInfo info;
+                return operatorLookup( funcName, info );
         }
 

src/CodeGen/OperatorTable.h

@@ -41 +41 @@
         };
 
-        bool operatorLookup( std::string funcName, OperatorInfo &info );
+        bool isOperator( const std::string & funcName );
+        bool operatorLookup( const std::string & funcName, OperatorInfo & info );
 
         bool isConstructor( const std::string & );