Changes in src/CodeGen/FixMain.cc [61efa42:bef4f1a]

File:

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

src/CodeGen/FixMain.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixMain.cc -- Tools to change a Cforall main into a C main.
+// FixMain.cc --
 //
 // 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"
 
@@ -33 +36 @@
 namespace {
 
-struct FindMainCore final {
+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 {
         ast::FunctionDecl const * main_declaration = nullptr;
 
         void previsit( ast::FunctionDecl const * decl ) {
-                if ( isMain( decl ) ) {
+                if ( FixMain::isMain( decl ) ) {
                         if ( main_declaration ) {
                                 SemanticError( decl, "Multiple definition of main routine\n" );
@@ -49 +65 @@
         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(){
@@ -106 +157 @@
 }
 
-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 isMain( const ast::FunctionDecl * decl ) {
+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 ) {
+        if ( std::string("main") != decl->name ) {
+                return false;
+        }
         return is_main( Mangle::mangle( decl, Mangle::Type ) );
 }
 
-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,
+void FixMain::fix( ast::TranslationUnit & translationUnit,
                 std::ostream &os, const char * bootloader_filename ) {
 
-        ast::Pass<FindMainCore> main_finder;
+        ast::Pass<FindMainCore_new> main_finder;
         ast::accept_all( translationUnit, main_finder );
         if ( nullptr == main_finder.core.main_declaration ) return;