Changeset 2174191

Timestamp:

Nov 11, 2023, 7:43:14 AM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

fc12f05

Parents:

2da12ae (diff), 61efa42 (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

Files:

• AST/Decl.cpp (modified) (3 diffs)
• AST/Type.hpp (modified) (1 diff)
• CodeGen/FixMain.cc (modified) (4 diffs)
• CodeGen/FixMain.h (modified) (3 diffs)
• CodeGen/FixMain2.cc (deleted)
• CodeGen/FixNames.cc (modified) (3 diffs)
• CodeGen/FixNames.h (modified) (2 diffs)
• CodeGen/module.mk (modified) (2 diffs)
• main.cc (modified) (3 diffs)

src/AST/Decl.cpp

@@ -20 +20 @@
 #include <unordered_map>
 
-#include "CodeGen/FixMain.h"   // for FixMain
 #include "Common/Eval.h"       // for eval
 
@@ -76 +75 @@
         }
         this->type = ftype;
-        // Hack forcing the function "main" to have Cforall linkage to replace
-        // main even if it is inside an extern "C", and also makes sure the
-        // replacing function is always a C function.
-        if ( name == "main" ) {
-                this->linkage = CodeGen::FixMain::getMainLinkage();
-        }
 }
 
@@ -108 +101 @@
         }
         this->type = type;
-        // See note above about this hack.
-        if ( name == "main" ) {
-                this->linkage = CodeGen::FixMain::getMainLinkage();
-        }
 }
 

src/AST/Type.hpp

@@ -34 +34 @@
 
 namespace ast {
-
-template< typename T > class Pass;
 
 class Type : public Node {

src/CodeGen/FixMain.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixMain.cc --
+// FixMain.cc -- Tools to change a Cforall main into a C main.
 //
 // Author           : Thierry Delisle
@@ -33 +33 @@
 namespace {
 
-struct FindMainCore_new {
+struct FindMainCore final {
         ast::FunctionDecl const * main_declaration = nullptr;
 
         void previsit( ast::FunctionDecl const * decl ) {
-                if ( FixMain::isMain( decl ) ) {
+                if ( isMain( decl ) ) {
                         if ( main_declaration ) {
                                 SemanticError( decl, "Multiple definition of main routine\n" );
@@ -106 +106 @@
 }
 
+struct FixLinkageCore final {
+        ast::Linkage::Spec const spec;
+        FixLinkageCore( ast::Linkage::Spec spec ) : spec( spec ) {}
+
+        ast::FunctionDecl const * previsit( ast::FunctionDecl const * decl ) {
+                if ( decl->name != "main" ) return decl;
+                return ast::mutate_field( decl, &ast::FunctionDecl::linkage, spec );
+        }
+};
+
 } // namespace
 
-bool FixMain::isMain( const ast::FunctionDecl * decl ) {
+bool isMain( const ast::FunctionDecl * decl ) {
         if ( std::string("main") != decl->name ) {
                 return false;
@@ -115 +125 @@
 }
 
-void FixMain::fix( ast::TranslationUnit & translationUnit,
+void fixMainLinkage( ast::TranslationUnit & translationUnit,
+                bool replace_main ) {
+        ast::Linkage::Spec const spec =
+                ( replace_main ) ? ast::Linkage::Cforall : ast::Linkage::C;
+        ast::Pass<FixLinkageCore>::run( translationUnit, spec );
+}
+
+void fixMainInvoke( ast::TranslationUnit & translationUnit,
                 std::ostream &os, const char * bootloader_filename ) {
 
-        ast::Pass<FindMainCore_new> main_finder;
+        ast::Pass<FindMainCore> main_finder;
         ast::accept_all( translationUnit, main_finder );
         if ( nullptr == main_finder.core.main_declaration ) return;

src/CodeGen/FixMain.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixMain.h -- 
+// FixMain.h -- Tools to change a Cforall main into a C main.
 //
 // Author           : Thierry Delisle
@@ -17 +17 @@
 
 #include <iosfwd>
-#include <memory>
-#include <list>
-
-#include "AST/LinkageSpec.hpp"
 
 namespace ast {
@@ -29 +25 @@
 namespace CodeGen {
 
-class FixMain {
-public :
-        static inline ast::Linkage::Spec getMainLinkage() {
-                return replace_main ? ast::Linkage::Cforall : ast::Linkage::C;
-        }
+/// Is this function a program main function?
+bool isMain( const ast::FunctionDecl * decl );
 
-        static inline void setReplaceMain(bool val) {
-                replace_main = val;
-        }
+/// Adjust the linkage of main functions.
+void fixMainLinkage( ast::TranslationUnit & transUnit, bool replaceMain );
 
-        static bool isMain(const ast::FunctionDecl * decl);
-
-        static void fix( ast::TranslationUnit & translationUnit,
-                        std::ostream &os, const char * bootloader_filename );
-
-private:
-        static bool replace_main;
-};
+/// Add a wrapper around to run the Cforall main.
+void fixMainInvoke( ast::TranslationUnit & transUnit,
+                std::ostream & os, const char * bootloaderFilename );
 
 } // namespace CodeGen

src/CodeGen/FixNames.cc

@@ -28 +28 @@
 
 namespace CodeGen {
+
+namespace {
+
 /// Does work with the main function and scopeLevels.
-class FixNames_new final {
+class FixNames final {
         int scopeLevel = 1;
 
@@ -45 +48 @@
 
         const ast::FunctionDecl *postvisit( const ast::FunctionDecl *functionDecl ) {
-                if ( FixMain::isMain( functionDecl ) ) {
+                if ( isMain( functionDecl ) ) {
                         auto mutDecl = ast::mutate( functionDecl );
 
@@ -80 +83 @@
 };
 
+} // namespace
+
 void fixNames( ast::TranslationUnit & translationUnit ) {
-        ast::Pass<FixNames_new>::run( translationUnit );
+        ast::Pass<FixNames>::run( translationUnit );
 }
 

src/CodeGen/FixNames.h

@@ -16 +16 @@
 #pragma once
 
-#include <list>  // for list
-
-class Declaration;
 namespace ast {
         class TranslationUnit;
@@ -24 +21 @@
 
 namespace CodeGen {
-        /// mangles object and function names
-        void fixNames( std::list< Declaration* > & translationUnit );
+
 /// Sets scope levels and fills in main's default return.
 void fixNames( ast::TranslationUnit & translationUnit );
+
 } // namespace CodeGen
 

src/CodeGen/module.mk

@@ -18 +18 @@
         CodeGen/CodeGeneratorNew.cpp \
         CodeGen/CodeGeneratorNew.hpp \
-        CodeGen/FixMain2.cc \
-        CodeGen/FixMain.h \
         CodeGen/GenType.cc \
         CodeGen/GenType.h \
@@ -29 +27 @@
         CodeGen/Generate.h \
         CodeGen/FixMain.cc \
+        CodeGen/FixMain.h \
         CodeGen/FixNames.cc \
         CodeGen/FixNames.h \

src/main.cc

@@ -250 +250 @@
 
         parse_cmdline( argc, argv );                                            // process command-line arguments
-        CodeGen::FixMain::setReplaceMain( !nomainp );
 
         if ( waiting_for_gdb ) {
@@ -394 +393 @@
                 PASS( "Translate Tries", ControlStruct::translateTries, transUnit );
                 PASS( "Gen Waitfor", Concurrency::generateWaitFor, transUnit );
+                PASS( "Fix Main Linkage", CodeGen::fixMainLinkage, transUnit, !nomainp );
 
                 // Needs to happen before tuple types are expanded.
@@ -421 +421 @@
 
                 PASS( "Code Gen", CodeGen::generate, transUnit, *output, !genproto, prettycodegenp, true, linemarks, false );
-
-                CodeGen::FixMain::fix( transUnit, *output, (PreludeDirector + "/bootloader.c").c_str() );
+                CodeGen::fixMainInvoke( transUnit, *output, (PreludeDirector + "/bootloader.c").c_str() );
+
                 if ( output != &cout ) {
                         delete output;