Changeset e6d39fe for src/CodeGen

Timestamp:

Apr 20, 2018, 9:04:41 AM (7 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, with_gc

Children:

22bdc34

Parents:

9181f1d (diff), 88f15ae (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) (3 diffs)
• CodeGenerator.h (modified) (4 diffs)
• GenType.cc (modified) (2 diffs)
• Generate.cc (modified) (2 diffs)
• Generate.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 ) {
@@ -157 +157 @@
                 node->print( ss );
                 assertf( false, "Unhandled node reached in CodeGenerator: %s", ss.str().c_str() );
+        }
+
+        // *** Expression
+        void CodeGenerator::previsit( Expression * node ) {
+                previsit( (BaseSyntaxNode *)node );
+                GuardAction( [this, node](){
+                        if ( printExprTypes ) {
+                                output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
+                        }
+                } );
         }
 
@@ -586 +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 << ")";
         }

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
@@ -37 +37 @@
                 //*** Error for unhandled node types
                 void postvisit( BaseSyntaxNode * );
+
+                //*** print type for all expressions
+                void previsit( Expression * node );
 
                 //*** Declaration
@@ -66 +69 @@
                 void postvisit( LabelAddressExpr *addressExpr );
                 void postvisit( CastExpr *castExpr );
+                void postvisit( KeywordCastExpr * castExpr );
                 void postvisit( VirtualCastExpr *castExpr );
                 void postvisit( UntypedMemberExpr *memberExpr );
@@ -140 +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