Changeset be8bd88 for src/CodeGen

Timestamp:

Mar 8, 2017, 3:22:50 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

031a2c95, 0e7ea335

Parents:

87c3bef (diff), 6363ad1 (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) (4 diffs)
• CodeGenerator.h (modified) (2 diffs)
• FixNames.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 14:56:29 2017
-// Update Count     : 418
+// Last Modified On : Sun Mar  5 17:13:33 2017
+// Update Count     : 475
 //
 
@@ -134 +134 @@
 
                 handleStorageClass( functionDecl );
-                if ( functionDecl->get_isInline() ) {
-                        output << "inline ";
-                } // if
-                if ( functionDecl->get_isNoreturn() ) {
-                        output << "_Noreturn ";
-                } // if
+                DeclarationNode::print_FuncSpec( output, functionDecl->get_funcSpec() );
+
                 output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), pretty );
 
@@ -835 +831 @@
         }
 
-
         void CodeGenerator::visit( ReturnStmt * returnStmt ) {
                 output << "return ";
@@ -899 +894 @@
         }
 
-        void CodeGenerator::handleStorageClass( Declaration * decl ) {
-                switch ( decl->get_storageClass() ) {
-                  case DeclarationNode::Extern:
-                        output << "extern ";
-                        break;
-                  case DeclarationNode::Static:
-                        output << "static ";
-                        break;
-                  case DeclarationNode::Auto:
-                        // silently drop storage class
-                        break;
-                  case DeclarationNode::Register:
-                        output << "register ";
-                        break;
-                  case DeclarationNode::Inline:
-                        output << "inline ";
-                        break;
-                  case DeclarationNode::Fortran:
-                        output << "fortran ";
-                        break;
-                  case DeclarationNode::Noreturn:
-                        output << "_Noreturn ";
-                        break;
-                  case DeclarationNode::Threadlocal:
-                        output << "_Thread_local ";
-                        break;
-                  case DeclarationNode::NoStorageClass:
-                        break;
-                } // switch
-        }
+        void CodeGenerator::handleStorageClass( DeclarationWithType * decl ) {
+                if ( decl->get_storageClasses().any() ) {
+                        DeclarationNode::print_StorageClass( output, decl->get_storageClasses() );
+                } // if
+        } // CodeGenerator::handleStorageClass
 
         std::string genName( DeclarationWithType * decl ) {

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 15:06:21 2017
-// Update Count     : 49
+// Last Modified On : Wed Mar  1 16:20:04 2017
+// Update Count     : 50
 //
 
@@ -123 +123 @@
 
                 void printDesignators( std::list< Expression * > & );
-                void handleStorageClass( Declaration *decl );
+                void handleStorageClass( DeclarationWithType *decl );
                 void handleAggregate( AggregateDecl *aggDecl );
                 void handleTypedef( NamedTypeDecl *namedType );

src/CodeGen/FixNames.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 11 15:38:10 2016
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Mar  6 23:32:08 2017
+// Update Count     : 15
 //
 
@@ -39 +39 @@
         std::string mangle_main() {
                 FunctionType* main_type;
-                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl(
-                        "main", 
-                        DeclarationNode::NoStorageClass, 
-                        LinkageSpec::Cforall, 
-                        main_type = new FunctionType( Type::Qualifiers(), true ), 
-                        nullptr, false, false
-                ) };
+                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", DeclarationNode::StorageClasses(), LinkageSpec::Cforall,
+                                                                                                                                   main_type = new FunctionType( Type::Qualifiers(), true ), nullptr )
+                                };
                 main_type->get_returnVals().push_back( 
-                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 
-                auto&& name = SymTab::Mangler::mangle( mainDecl.get() );
+                auto && name = SymTab::Mangler::mangle( mainDecl.get() );
                 // std::cerr << name << std::endl;
                 return name;
@@ -56 +52 @@
         std::string mangle_main_args() {
                 FunctionType* main_type;
-                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl(
-                        "main", 
-                        DeclarationNode::NoStorageClass, 
-                        LinkageSpec::Cforall, 
-                        main_type = new FunctionType( Type::Qualifiers(), false ), 
-                        nullptr, false, false
-                ) };
+                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 
+                                                                                                                                   main_type = new FunctionType( Type::Qualifiers(), false ), nullptr )
+                                };
                 main_type->get_returnVals().push_back( 
-                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 
                 mainDecl->get_functionType()->get_parameters().push_back( 
-                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 
                 mainDecl->get_functionType()->get_parameters().push_back( 
-                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, 
+                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, 
                         new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ), 
                         nullptr )