Changeset b1e63ac5 for src/CodeGen

Timestamp:

Jul 4, 2017, 9:40:16 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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' into references

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (20 diffs)
• CodeGenerator.h (modified) (7 diffs)
• FixNames.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 10 14:45:00 2017
-// Update Count     : 484
+// Last Modified On : Thu Jun  8 16:00:00 2017
+// Update Count     : 485
 //
 
@@ -65 +65 @@
                 } // if
         } // extension
-
-        ostream & CodeGenerator::Indenter::operator()( ostream & output ) const {
-          return output << string( cg.cur_indent, ' ' );
-        }
-
-        ostream & operator<<( ostream & output, const CodeGenerator::Indenter &indent ) {
-                return indent( output );
-        }
 
         CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()( std::list< Label > & l ) {
@@ -111 +103 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
-
-        CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
-                        : indent( *this), cur_indent( indentation ), insideFunction( infunp ), output( os ), printLabels( *this ) {
-                //output << std::string( init );
-        }
-
-        CodeGenerator::CodeGenerator( std::ostream & os, char * init, int indentation, bool infunp )
-                        : indent( *this ), cur_indent( indentation ), insideFunction( infunp ), output( os ), printLabels( *this ) {
-                //output << std::string( init );
-        }
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( CodeGenerator::tabsize ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
@@ -212 +194 @@
                         output << " {" << endl;
 
-                        cur_indent += CodeGenerator::tabsize;
+                        ++indent;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
                                 output << lineDirective( *i ) << indent;
@@ -219 +201 @@
                         } // for
 
-                        cur_indent -= CodeGenerator::tabsize;
+                        --indent;
 
                         output << indent << "}";
@@ -249 +231 @@
                         output << " {" << endl;
 
-                        cur_indent += CodeGenerator::tabsize;
+                        ++indent;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
@@ -261 +243 @@
                         } // for
 
-                        cur_indent -= CodeGenerator::tabsize;
+                        --indent;
 
                         output << indent << "}";
@@ -267 +249 @@
         }
 
-        void CodeGenerator::visit( TraitDecl * traitDecl ) {}
+        void CodeGenerator::visit( __attribute__((unused)) TraitDecl * traitDecl ) {}
 
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
@@ -298 +280 @@
         }
 
-        void CodeGenerator::printDesignators( std::list< Expression * > & designators ) {
-                typedef std::list< Expression * > DesignatorList;
+        void CodeGenerator::visit( Designation * designation ) {
+                std::list< Expression * > designators = designation->get_designators();
                 if ( designators.size() == 0 ) return;
-                for ( DesignatorList::iterator iter = designators.begin(); iter != designators.end(); ++iter ) {
-                        if ( dynamic_cast< NameExpr * >( *iter ) ) {
-                                // if expression is a name, then initializing aggregate member
+                for ( Expression * des : designators ) {
+                        if ( dynamic_cast< NameExpr * >( des ) || dynamic_cast< VariableExpr * >( des ) ) {
+                                // if expression is a NameExpr or VariableExpr, then initializing aggregate member
                                 output << ".";
-                                (*iter)->accept( *this );
+                                des->accept( *this );
                         } else {
-                                // if not a simple name, it has to be a constant expression, i.e. an array designator
+                                // otherwise, it has to be a ConstantExpr or CastExpr, initializing array eleemnt
                                 output << "[";
-                                (*iter)->accept( *this );
+                                des->accept( *this );
                                 output << "]";
                         } // if
@@ -317 +299 @@
 
         void CodeGenerator::visit( SingleInit * init ) {
-                printDesignators( init->get_designators() );
                 init->get_value()->accept( *this );
         }
 
         void CodeGenerator::visit( ListInit * init ) {
-                printDesignators( init->get_designators() );
+                auto initBegin = init->begin();
+                auto initEnd = init->end();
+                auto desigBegin = init->get_designations().begin();
+                auto desigEnd = init->get_designations().end();
+
                 output << "{ ";
-                if ( init->begin() == init->end() ) {
-                        // illegal to leave initializer list empty for scalar initializers, but always legal to have 0
-                        output << "0";
-                } else {
-                        genCommaList( init->begin(), init->end() );
-                } // if
+                for ( ; initBegin != initEnd && desigBegin != desigEnd; ) {
+                        (*desigBegin)->accept( *this );
+                        (*initBegin)->accept( *this );
+                        ++initBegin, ++desigBegin;
+                        if ( initBegin != initEnd ) {
+                                output << ", ";
+                        }
+                }
                 output << " }";
-        }
-
-        void CodeGenerator::visit( ConstructorInit * init ){
+                assertf( initBegin == initEnd && desigBegin == desigEnd, "Initializers and designators not the same length. %s", toString( init ).c_str() );
+        }
+
+        void CodeGenerator::visit( __attribute__((unused)) ConstructorInit * init ){
                 assertf( ! genC, "ConstructorInit nodes should not reach code generation." );
                 // xxx - generate something reasonable for constructor/destructor pairs
@@ -731 +719 @@
 
         void CodeGenerator::visit( TypeExpr * typeExpr ) {
-                assertf( ! genC, "TypeExpr should not reach code generation." );
-                output<< genType( typeExpr->get_type(), "", pretty, genC );
+                // if ( genC ) std::cerr << "typeexpr still exists: " << typeExpr << std::endl;
+                // assertf( ! genC, "TypeExpr should not reach code generation." );
+                if ( ! genC ) {
+                        output<< genType( typeExpr->get_type(), "", pretty, genC );
+                }
         }
 
@@ -756 +747 @@
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
                 output << lineDirective( stmtExpr) << "({" << std::endl;
-                cur_indent += CodeGenerator::tabsize;
+                ++indent;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
@@ -779 +770 @@
                         ++i;
                 }
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
                 output << indent << "})";
         }
@@ -788 +779 @@
                 output << "{" << endl;
 
-                cur_indent += CodeGenerator::tabsize;
+                ++indent;
 
                 for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++ ) {
@@ -799 +790 @@
                         } // if
                 } // for
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
 
                 output << indent << "}";
@@ -867 +858 @@
 
                 output << "{" << std::endl;
-                cur_indent += CodeGenerator::tabsize;
+                ++indent;
                 acceptAll( switchStmt->get_statements(), *this );
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
                 output << indent << "}";
         }
@@ -886 +877 @@
                 std::list<Statement *> sts = caseStmt->get_statements();
 
-                cur_indent += CodeGenerator::tabsize;
+                ++indent;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
                         output << indent << printLabels( (*i)->get_labels() )  ;
@@ -892 +883 @@
                         output << endl;
                 } // for
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
         }
 
@@ -923 +914 @@
         }
 
+        void CodeGenerator::visit( ThrowStmt * throwStmt ) {
+                assertf( ! genC, "Throw statements should not reach code generation." );
+
+                output << ((throwStmt->get_kind() == ThrowStmt::Terminate) ?
+                           "throw" : "throwResume");
+                if (throwStmt->get_expr()) {
+                        output << " ";
+                        throwStmt->get_expr()->accept( *this );
+                }
+                if (throwStmt->get_target()) {
+                        output << " _At ";
+                        throwStmt->get_target()->accept( *this );
+                }
+                output << ";";
+        }
+
         void CodeGenerator::visit( WhileStmt * whileStmt ) {
                 if ( whileStmt->get_isDoWhile() ) {
@@ -967 +974 @@
         }
 
-        void CodeGenerator::visit( NullStmt * nullStmt ) {
+        void CodeGenerator::visit( __attribute__((unused)) NullStmt * nullStmt ) {
                 //output << indent << CodeGenerator::printLabels( nullStmt->get_labels() );
                 output << "/* null statement */ ;";

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 10 10:57:00 2017
-// Update Count     : 51
+// Last Modified On : Thu Jun  8 15:48:00 2017
+// Update Count     : 52
 //
 
@@ -25 +25 @@
 #include "SymTab/Indexer.h"
 
+#include "Common/Indenter.h"
 #include "Common/utility.h"
 
@@ -47 +48 @@
 
                 //*** Initializer
+                virtual void visit( Designation * );
                 virtual void visit( SingleInit * );
                 virtual void visit( ListInit * );
@@ -91 +93 @@
                 virtual void visit( BranchStmt * );
                 virtual void visit( ReturnStmt * );
+                virtual void visit( ThrowStmt * );
                 virtual void visit( WhileStmt * );
                 virtual void visit( ForStmt * );
@@ -99 +102 @@
 
                 template< class Iterator > void genCommaList( Iterator begin, Iterator end );
-
-                struct Indenter {
-                        Indenter(CodeGenerator &cg) : cg(cg) {}
-                        CodeGenerator & cg;
-                        std::ostream& operator()(std::ostream & os) const;
-                };
 
                 struct LabelPrinter {
@@ -128 +125 @@
           private:
                 Indenter indent;
-                int cur_indent;
                 bool insideFunction;
                 std::ostream &output;
@@ -136 +132 @@
                 bool lineMarks = false;
 
-                void printDesignators( std::list< Expression * > & );
                 void handleStorageClass( DeclarationWithType *decl );
                 void handleAggregate( AggregateDecl *aggDecl, const std::string & kind );

src/CodeGen/FixNames.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 07:50:30 2017
-// Update Count     : 16
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 28 15:26:00 2017
+// Update Count     : 20
 //
 
@@ -93 +93 @@
         void FixNames::fixDWT( DeclarationWithType *dwt ) {
                 if ( dwt->get_name() != "" ) {
-                        if ( LinkageSpec::isDecoratable( dwt->get_linkage() ) ) {
+                        if ( LinkageSpec::isMangled( dwt->get_linkage() ) ) {
                                 dwt->set_mangleName( SymTab::Mangler::mangle( dwt ) );
                                 dwt->set_scopeLevel( scopeLevel );
@@ -114 +114 @@
                                 throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl); 
                         }
-                        functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), "0") ) ) );
+                        functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new ConstantExpr( Constant::from_int( 0 ) ) ) );
                         CodeGen::FixMain::registerMain( functionDecl );
                 }