Changeset ffec1bf for src/CodeGen

Timestamp:

Jul 25, 2022, 2:23:28 PM (3 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

4c48be0, 5cf1228, def751f

Parents:

9e23b446 (diff), 1f950c3b (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) (5 diffs)
• CodeGenerator.h (modified) (3 diffs)
• FixNames.cc (modified) (4 diffs)
• FixNames.h (modified) (2 diffs)
• GenType.cc (modified) (1 diff)

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 : Wed Feb  2 20:30:30 2022
-// Update Count     : 541
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 29 14:34:00 2022
+// Update Count     : 542
 //
 #include "CodeGenerator.h"
@@ -18 +18 @@
 #include <list>                      // for _List_iterator, list, list<>::it...
 
+#include "AST/Decl.hpp"              // for DeclWithType
 #include "Common/UniqueName.h"       // for UniqueName
 #include "Common/utility.h"          // for CodeLocation, toString
@@ -294 +295 @@
                                 } else {
                                         if ( obj->get_init() ) {
-                                                obj->get_init()->accept( *visitor ); 
+                                                obj->get_init()->accept( *visitor );
                                         } else {
                                                 // Should not reach here!
@@ -683 +684 @@
                 extension( variableExpr );
                 const OperatorInfo * opInfo;
-                if ( variableExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && (opInfo = operatorLookup( variableExpr->get_var()->get_name() )) && opInfo->type == OT_CONSTANT ) {
+                if( dynamic_cast<ZeroType*>( variableExpr->get_var()->get_type() ) ) {
+                        output << "0";
+                } else if ( variableExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && (opInfo = operatorLookup( variableExpr->get_var()->get_name() )) && opInfo->type == OT_CONSTANT ) {
                         output << opInfo->symbol;
                 } else {
-                        // if (dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type()) 
+                        // if (dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())
                         // && dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base) {
                         //      output << '(' <<genType(dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base, "", options) << ')';
@@ -1236 +1239 @@
                 } // if
         }
+
+std::string genName( ast::DeclWithType const * decl ) {
+        if ( const OperatorInfo * opInfo = operatorLookup( decl->name ) ) {
+                return opInfo->outputName;
+        } else {
+                return decl->name;
+        }
+}
+
 } // namespace CodeGen
 

src/CodeGen/CodeGenerator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 09:23:21 2022
-// Update Count     : 64
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 29 14:32:00 2022
+// Update Count     : 65
 //
 
@@ -26 +26 @@
 #include "SynTree/Visitor.h"      // for Visitor
 #include "SynTree/SynTree.h"      // for Visitor Nodes
+
+namespace ast {
+        class DeclWithType;
+}
 
 namespace CodeGen {
@@ -182 +186 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
+        std::string genName( ast::DeclWithType const * decl );
 
         inline std::ostream & operator<<( std::ostream & os, const CodeGenerator::LineEnder & endl ) {

src/CodeGen/FixNames.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixNames.cc --
+// FixNames.cc -- Adjustments to typed declarations.
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct 29 15:49:00 2021
-// Update Count     : 23
+// Last Modified On : Wed Jul 20 11:49:00 2022
+// Update Count     : 24
 //
 
@@ -87 +87 @@
 
 /// Does work with the main function and scopeLevels.
-class FixNames_new : public ast::WithGuards {
+class FixNames_new final {
         int scopeLevel = 1;
 
@@ -103 +103 @@
 
         const ast::FunctionDecl *postvisit( const ast::FunctionDecl *functionDecl ) {
-                // This store is used to ensure a maximum of one call to mutate.
-                ast::FunctionDecl * mutDecl = nullptr;
+                if ( FixMain::isMain( functionDecl ) ) {
+                        auto mutDecl = ast::mutate( functionDecl );
 
-                if ( shouldSetScopeLevel( functionDecl ) ) {
-                        mutDecl = ast::mutate( functionDecl );
-                        mutDecl->scopeLevel = scopeLevel;
-                }
-
-                if ( FixMain::isMain( functionDecl ) ) {
-                        if ( !mutDecl ) { mutDecl = ast::mutate( functionDecl ); }
+                        if ( shouldSetScopeLevel( mutDecl ) ) {
+                                mutDecl->scopeLevel = scopeLevel;
+                        }
 
                         int nargs = mutDecl->params.size();
@@ -124 +120 @@
                                 )
                         );
+
+                        return mutDecl;
+                } else if ( shouldSetScopeLevel( functionDecl ) ) {
+                        return ast::mutate_field( functionDecl, &ast::FunctionDecl::scopeLevel, scopeLevel );
+                } else {
+                        return functionDecl;
                 }
-                return mutDecl ? mutDecl : functionDecl;
         }
 
         void previsit( const ast::CompoundStmt * ) {
-                GuardValue( scopeLevel ) += 1;
+                scopeLevel += 1;
+        }
+
+        void postvisit( const ast::CompoundStmt * ) {
+                scopeLevel -= 1;
         }
 };

src/CodeGen/FixNames.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixNames.h --
+// FixNames.h -- Adjustments to typed declarations.
 //
 // Author           : Richard C. Bilson
@@ -26 +26 @@
         /// mangles object and function names
         void fixNames( std::list< Declaration* > & translationUnit );
-        void fixNames( ast::TranslationUnit & translationUnit );
+/// Sets scope levels and fills in main's default return.
+void fixNames( ast::TranslationUnit & translationUnit );
 } // namespace CodeGen
 

src/CodeGen/GenType.cc

@@ -254 +254 @@
 
         void GenType::postvisit( EnumInstType * enumInst ) {
-                if ( enumInst->baseEnum->base ) {
+                if ( enumInst->baseEnum && enumInst->baseEnum->base ) {
                         typeString = genType(enumInst->baseEnum->base, "", options) + typeString;
                 } else {