Changeset 6250a312 for src/CodeGen

Timestamp:

May 10, 2017, 5:00:47 PM (9 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:

8514fe19, dbfb35d

Parents:

0f9bef3 (diff), 29cf9c8 (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) (18 diffs)
• Generate.cc (modified) (2 diffs)
• Generate.h (modified) (1 diff)
• LineStream.cc (added)
• LineStream.h (added)

src/CodeGen/CodeGenerator.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 30 16:38:01 2017
-// Update Count     : 482
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus May  9 16:50:00 2017
+// Update Count     : 484
 //
 
@@ -41 +41 @@
 namespace CodeGen {
         int CodeGenerator::tabsize = 4;
+
+        // Pseudo Function: output << lineDirective(currentNode);
+    struct lineDirective {
+        CodeLocation const & loc;
+                lineDirective(CodeLocation const & location) : loc(location) {}
+                lineDirective(BaseSyntaxNode const * node) : loc(node->location) {}
+        };
+        std::ostream & operator<<(std::ostream & out, lineDirective const & ld) {
+                if (ld.loc.isSet())
+                        return out << "\n# " << ld.loc.linenumber << " \""
+                                << ld.loc.filename << "\"\n";
+                return out << "\n// Unset Location\n";
+        }
 
         // the kinds of statements that would ideally be followed by whitespace
@@ -128 +141 @@
 
 
-        //*** Declarations
+        // *** Declarations
         void CodeGenerator::visit( FunctionDecl * functionDecl ) {
+                output << lineDirective( functionDecl );
+
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -153 +168 @@
                 }
 
+                output << lineDirective( objectDecl );
+
                 extension( objectDecl );
                 genAttributes( objectDecl->get_attributes() );
@@ -192 +209 @@
                         cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
-                                output << indent;
+                                output << lineDirective( *i ) << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
@@ -204 +221 @@
 
         void CodeGenerator::visit( StructDecl * structDecl ) {
+                output << lineDirective( structDecl );
+
                 extension( structDecl );
                 handleAggregate( structDecl, "struct " );
@@ -209 +228 @@
 
         void CodeGenerator::visit( UnionDecl * unionDecl ) {
+                output << lineDirective( unionDecl );
+
                 extension( unionDecl );
                 handleAggregate( unionDecl, "union " );
@@ -215 +236 @@
         void CodeGenerator::visit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
+                output << lineDirective ( enumDecl );
                 output << "enum ";
                 genAttributes( enumDecl->get_attributes() );
@@ -230 +252 @@
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << indent << mangleName( obj );
+                                output << lineDirective( obj ) << indent << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -248 +270 @@
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
                 assertf( ! genC, "Typedefs are removed and substituted in earlier passes." );
+                output << lineDirective( typeDecl );
                 output << "typedef ";
                 output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl;
@@ -262 +285 @@
                         } // if
                 } else {
-                        output << typeDecl->typeString() << " " << typeDecl->get_name();
+                        output << typeDecl->genTypeString() << " " << typeDecl->get_name();
+                        if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->get_sized() ) {
+                                output << " | sized(" << typeDecl->get_name() << ")";
+                        }
                         if ( ! typeDecl->get_assertions().empty() ) {
                                 output << " | { ";
@@ -316 +342 @@
         }
 
-        //*** Expressions
+        // *** Expressions
         void CodeGenerator::visit( ApplicationExpr * applicationExpr ) {
                 extension( applicationExpr );
@@ -719 +745 @@
         void CodeGenerator::visit( StmtExpr * stmtExpr ) {
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
-                output << "({" << std::endl;
+                output << lineDirective( stmtExpr) << "({" << std::endl;
                 cur_indent += CodeGenerator::tabsize;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
                 for ( Statement * stmt : stmts ) {
-                        output << indent << printLabels( stmt->get_labels() );
+                        output << lineDirective( stmt ) << indent;
+            output << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
                                 // last statement in a statement expression needs to be handled specially -
@@ -746 +773 @@
         }
 
-        //*** Statements
+        // *** Statements
         void CodeGenerator::visit( CompoundStmt * compoundStmt ) {
                 std::list<Statement*> ks = compoundStmt->get_kids();
@@ -769 +796 @@
         void CodeGenerator::visit( ExprStmt * exprStmt ) {
                 assert( exprStmt );
-                // cast the top-level expression to void to reduce gcc warnings.
-                Expression * expr = new CastExpr( exprStmt->get_expr() );
+                Expression * expr = exprStmt->get_expr();
+                if ( genC ) {
+                        // cast the top-level expression to void to reduce gcc warnings.
+                        expr = new CastExpr( expr );
+                }
                 expr->accept( *this );
                 output << ";";
@@ -807 +837 @@
 
         void CodeGenerator::visit( IfStmt * ifStmt ) {
+                output << lineDirective( ifStmt );
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -820 +851 @@
 
         void CodeGenerator::visit( SwitchStmt * switchStmt ) {
+                output << lineDirective( switchStmt );
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -832 +864 @@
 
         void CodeGenerator::visit( CaseStmt * caseStmt ) {
+                output << lineDirective( caseStmt );
                 output << indent;
                 if ( caseStmt->isDefault()) {

src/CodeGen/Generate.cc

@@ -22 +22 @@
 #include "SynTree/Declaration.h"
 #include "CodeGenerator.h"
-#include "Tuples/Tuples.h"
+#include "GenType.h"
+#include "SynTree/SynTree.h"
+#include "SynTree/Type.h"
+#include "SynTree/BaseSyntaxNode.h"
+// #include "Tuples/Tuples.h"
 
 using namespace std;
@@ -39 +43 @@
                 } // for
         }
+
+        void generate( BaseSyntaxNode * node, std::ostream & os ) {
+                if ( Type * type = dynamic_cast< Type * >( node ) ) {
+                        os << CodeGen::genPrettyType( type, "" );
+                } else {
+                        CodeGen::CodeGenerator cgv( os, true, false );
+                        node->accept( cgv );
+                }
+                os << std::endl;
+        }
 } // namespace CodeGen
 

src/CodeGen/Generate.h

@@ -25 +25 @@
         /// 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 );
+
+        /// Generate code for a single node -- helpful for debugging in gdb
+        void generate( BaseSyntaxNode * node, std::ostream & os );
 } // namespace CodeGen