Changeset 35b1bf4 for src/CodeGen

Timestamp:

Feb 8, 2017, 9:09:39 AM (7 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:

52c14b3

Parents:

fe26fbf

Message:

added pretty print flag, which currently just turns off name mangling in code gen

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (12 diffs)
• CodeGenerator.h (modified) (2 diffs)
• GenType.cc (modified) (8 diffs)
• GenType.h (modified) (1 diff)
• Generate.cc (modified) (2 diffs)
• Generate.h (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -89 +89 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool mangle ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), mangle( mangle ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ) {}
 
         CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
@@ -102 +102 @@
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
-                if ( ! mangle ) return decl->get_name();
+                if ( pretty ) return decl->get_name();
                 if ( decl->get_mangleName() != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
@@ -140 +140 @@
                         output << "_Noreturn ";
                 } // if
-                output << genType( functionDecl->get_functionType(), mangleName( functionDecl ) );
+                output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), pretty );
 
                 // how to get this to the Functype?
@@ -161 +161 @@
 
                 handleStorageClass( objectDecl );
-                output << genType( objectDecl->get_type(), mangleName( objectDecl ) );
+                output << genType( objectDecl->get_type(), mangleName( objectDecl ), pretty );
 
                 asmName( objectDecl );
@@ -178 +178 @@
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl ) {
                 genAttributes( aggDecl->get_attributes() );
-                
+
                 if ( aggDecl->get_name() != "" )
                         output << aggDecl->get_name();
@@ -249 +249 @@
                 assert( false && "Typedefs are removed and substituted in earlier passes." );
                 //output << "typedef ";
-                //output << genType( typeDecl->get_base(), typeDecl->get_name() );
+                //output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty );
         }
 
@@ -258 +258 @@
                 output << "extern unsigned long " << typeDecl->get_name();
                 if ( typeDecl->get_base() ) {
-                        output << " = sizeof( " << genType( typeDecl->get_base(), "" ) << " )";
+                        output << " = sizeof( " << genType( typeDecl->get_base(), "", pretty ) << " )";
                 } // if
         }
@@ -552 +552 @@
                         // at least one result type of cast, but not an lvalue
                         output << "(";
-                        output << genType( castExpr->get_result(), "" );
+                        output << genType( castExpr->get_result(), "", pretty );
                         output << ")";
                 } else {
@@ -592 +592 @@
                 output << "sizeof(";
                 if ( sizeofExpr->get_isType() ) {
-                        output << genType( sizeofExpr->get_type(), "" );
+                        output << genType( sizeofExpr->get_type(), "", pretty );
                 } else {
                         sizeofExpr->get_expr()->accept( *this );
@@ -604 +604 @@
                 output << "__alignof__(";
                 if ( alignofExpr->get_isType() ) {
-                        output << genType( alignofExpr->get_type(), "" );
+                        output << genType( alignofExpr->get_type(), "", pretty );
                 } else {
                         alignofExpr->get_expr()->accept( *this );
@@ -618 +618 @@
                 // use GCC builtin
                 output << "__builtin_offsetof(";
-                output << genType( offsetofExpr->get_type(), "" );
+                output << genType( offsetofExpr->get_type(), "", pretty );
                 output << ", " << mangleName( offsetofExpr->get_member() );
                 output << ")";
@@ -680 +680 @@
         void CodeGenerator::visit( CompoundLiteralExpr *compLitExpr ) {
                 assert( compLitExpr->get_type() && dynamic_cast< ListInit * > ( compLitExpr->get_initializer() ) );
-                output << "(" << genType( compLitExpr->get_type(), "" ) << ")";
+                output << "(" << genType( compLitExpr->get_type(), "", pretty ) << ")";
                 compLitExpr->get_initializer()->accept( *this );
         }

src/CodeGen/CodeGenerator.h

@@ -30 +30 @@
                 static int tabsize;
 
-                CodeGenerator( std::ostream &os, bool mangle = true );
+                CodeGenerator( std::ostream &os, bool pretty = false );
                 CodeGenerator( std::ostream &os, std::string, int indent = 0, bool infun = false );
                 CodeGenerator( std::ostream &os, char *, int indent = 0, bool infun = false );
@@ -119 +119 @@
                 std::ostream &output;
                 LabelPrinter printLabels;
-                bool mangle = true;
+                bool pretty = false;  // pretty print
 
                 void printDesignators( std::list< Expression * > & );

src/CodeGen/GenType.cc

@@ -28 +28 @@
         class GenType : public Visitor {
           public:
-                GenType( const std::string &typeString, bool mangle = true );
+                GenType( const std::string &typeString, bool pretty = false );
                 std::string get_typeString() const { return typeString; }
                 void set_typeString( const std::string &newValue ) { typeString = newValue; }
@@ -51 +51 @@
 
                 std::string typeString;
-                bool mangle = true;
+                bool pretty = false; // pretty print
         };
 
-        std::string genType( Type *type, const std::string &baseString, bool mangle ) {
-                GenType gt( baseString, mangle );
-                std::ostringstream os;
-                
+        std::string genType( Type *type, const std::string &baseString, bool pretty ) {
+                GenType gt( baseString, pretty );
+                std::ostringstream os;
+
                 if ( ! type->get_attributes().empty() ) {
-                        CodeGenerator cg( os, mangle );
+                        CodeGenerator cg( os, pretty );
                         cg.genAttributes( type->get_attributes() );
                 } // if
@@ -67 +67 @@
         }
 
-        GenType::GenType( const std::string &typeString, bool mangle ) : typeString( typeString ), mangle( mangle ) {}
+  std::string genPrettyType( Type * type, const std::string & baseString ) {
+        return genType( type, baseString, true );
+  }
+
+        GenType::GenType( const std::string &typeString, bool pretty ) : typeString( typeString ), pretty( pretty ) {}
 
         void GenType::visit( VoidType *voidType ) {
@@ -108 +112 @@
                 } // if
                 if ( dimension != 0 ) {
-                        CodeGenerator cg( os, mangle );
+                        CodeGenerator cg( os, pretty );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
@@ -162 +166 @@
                         } // if
                 } else {
-                        CodeGenerator cg( os, mangle );
+                        CodeGenerator cg( os, pretty );
                         os << "(" ;
 
@@ -203 +207 @@
 
         void GenType::visit( TupleType * tupleType ) {
-                assertf( ! mangle, "Tuple types should not make it to Code Gen." );
+                assertf( pretty, "Tuple types should not make it to Code Gen." );
                 Visitor::visit( tupleType );
+                unsigned int i = 0;
+                std::ostringstream os;
+                os << "[";
+                for ( Type * t : *tupleType ) {
+                        i++;
+                        os << genType( t, "", pretty ) << (i == tupleType->size() ? "" : ", ");
+                }
+                os << "]";
+                typeString = os.str() + typeString;
         }
 
@@ -214 +227 @@
         void GenType::visit( ZeroType *zeroType ) {
                 // ideally these wouldn't hit codegen at all, but should be safe to make them ints
-                typeString = "long int " + typeString;
+                typeString = (pretty ? "zero_t " : "long int ") + typeString;
                 handleQualifiers( zeroType );
         }
@@ -220 +233 @@
         void GenType::visit( OneType *oneType ) {
                 // ideally these wouldn't hit codegen at all, but should be safe to make them ints
-                typeString = "long int " + typeString;
+                typeString = (pretty ? "one_t " : "long int ") + typeString;
                 handleQualifiers( oneType );
         }

src/CodeGen/GenType.h

@@ -21 +21 @@
 
 namespace CodeGen {
-        std::string genType( Type *type, const std::string &baseString, bool mangle = true );
+        std::string genType( Type *type, const std::string &baseString, bool pretty = false );
+  std::string genPrettyType( Type * type, const std::string & baseString );
 } // namespace CodeGen
 

src/CodeGen/Generate.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Generate.cc -- 
+// Generate.cc --
 //
 // Author           : Richard C. Bilson
@@ -26 +26 @@
 
 namespace CodeGen {
-        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics ) {
-                CodeGen::CodeGenerator cgv( os );
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty ) {
+                CodeGen::CodeGenerator cgv( os, pretty );
 
                 for ( std::list<Declaration *>::iterator i = translationUnit.begin(); i != translationUnit.end();  i++ ) {

src/CodeGen/Generate.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Generate.h -- 
+// Generate.h --
 //
 // Author           : Richard C. Bilson
@@ -24 +24 @@
 namespace CodeGen {
         /// Generates code
-        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics );
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty );
 } // namespace CodeGen