Changeset 8d182b1 for src/CodeGen/FixMain.cc

Timestamp:

Nov 14, 2023, 12:19:09 PM (23 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (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

File:

• src/CodeGen/FixMain.cc (modified) (6 diffs)

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
@@ -25 +25 @@
 #include "AST/Type.hpp"
 #include "AST/Vector.hpp"
-#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "CodeGen/GenType.h"       // for GenType
-#include "SynTree/Declaration.h"   // for FunctionDecl, operator<<
-#include "SynTree/Type.h"          // for FunctionType
 #include "SymTab/Mangler.h"
 
@@ -36 +33 @@
 namespace {
 
-struct FindMainCore {
-        FunctionDecl * main_signature = nullptr;
-
-        void previsit( FunctionDecl * decl ) {
-                if ( FixMain::isMain( decl ) ) {
-                        if ( main_signature ) {
-                                SemanticError( decl, "Multiple definition of main routine\n" );
-                        }
-                        main_signature = decl;
-                }
-        }
-};
-
-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" );
@@ -65 +49 @@
         return genType( types[at], "", Options( false, false, false, false ) );
 }
-
-}
-
-        template<typename container>
-        std::string genTypeAt(const container& p, size_t idx) {
-                return genType((*std::next(p.begin(), idx))->get_type(), "");
-        }
-
-        void FixMain::fix( std::list< Declaration * > & translationUnit,
-                        std::ostream &os, const char* bootloader_filename ) {
-                PassVisitor< FindMainCore > main_finder;
-                acceptAll( translationUnit, main_finder );
-                FunctionDecl * main_signature = main_finder.pass.main_signature;
-
-                if( main_signature ) {
-                        os << "static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return ";
-                        main_signature->mangleName = SymTab::Mangler::mangle(main_signature);
-
-                        os << main_signature->get_scopedMangleName() << "(";
-                        const auto& params = main_signature->get_functionType()->get_parameters();
-                        switch(params.size()) {
-                                case 3: os << "(" << genTypeAt(params, 0) << ")argc, (" << genTypeAt(params, 1) << ")argv, (" << genTypeAt(params, 2) << ")envp"; break;
-                                case 2: os << "(" << genTypeAt(params, 0) << ")argc, (" << genTypeAt(params, 1) << ")argv"; break;
-                                case 0: break;
-                                default : assert(false);
-                        }
-                        os << "); }\n";
-
-                        std::ifstream bootloader(bootloader_filename, std::ios::in);
-                        assertf( bootloader.is_open(), "cannot open bootloader.c\n" );
-                        os << bootloader.rdbuf();
-                }
-        }
-
-namespace {
 
 ast::ObjectDecl * makeIntObj(){
@@ -157 +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( FunctionDecl * decl ) {
-        if ( std::string("main") != decl->name ) {
-                return false;
-        }
-        return is_main( SymTab::Mangler::mangle( decl, true, true ) );
-}
-
-bool FixMain::isMain( const ast::FunctionDecl * decl ) {
+bool isMain( const ast::FunctionDecl * decl ) {
         if ( std::string("main") != decl->name ) {
                 return false;
@@ -173 +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;