Changeset 8e48fca4

Timestamp:

Oct 29, 2021, 4:47:16 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

e58e423

Parents:

0c577f7

Message:

Combined the code in FixMain? so it is all done with one pass.

Location:

src

Files:

• CodeGen/FixMain.cc (modified) (4 diffs)
• CodeGen/FixMain.h (modified) (2 diffs)
• main.cc (modified) (2 diffs)

src/CodeGen/FixMain.cc

@@ -32 +32 @@
 
 namespace CodeGen {
+
+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;
+                }
+        }
+};
+
+}
+
         bool FixMain::replace_main = false;
-        std::unique_ptr<FunctionDecl> FixMain::main_signature = nullptr;
 
         template<typename container>
@@ -40 +57 @@
         }
 
-        void FixMain::registerMain(FunctionDecl* functionDecl)
-        {
-                if(main_signature) {
-                        SemanticError(functionDecl, "Multiple definition of main routine\n");
-                }
-                main_signature.reset( functionDecl->clone() );
-        }
+        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;
 
-        void FixMain::fix(std::ostream &os, const char* bootloader_filename) {
                 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.get());
+                        main_signature->mangleName = SymTab::Mangler::mangle(main_signature);
 
                         os << main_signature->get_scopedMangleName() << "(";
@@ -121 +135 @@
 }
 
-struct FindMainCore {
-        void previsit( FunctionDecl * decl ) {
-                if ( FixMain::isMain( decl ) ) {
-                        FixMain::registerMain( decl );
-                }
-        }
-};
-
 } // namespace
 
@@ -145 +151 @@
 }
 
-void FixMain::findMain( std::list< Declaration * > & translationUnit ) {
-        PassVisitor< FindMainCore > mainFinder;
-        acceptAll( translationUnit, mainFinder );
-}
-
 };

src/CodeGen/FixMain.h

@@ -10 +10 @@
 // Created On       : Thr Jan 12 14:11:09 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct 29 14:49:00 2021
-// Update Count     : 7
+// Last Modified On : Fri Oct 29 16:20:00 2021
+// Update Count     : 8
 //
 
@@ -29 +29 @@
 
 namespace CodeGen {
-        class FixMain {
-          public :
-                static inline LinkageSpec::Spec mainLinkage() {
-                        return replace_main ? LinkageSpec::Cforall : LinkageSpec::C;
-                }
 
-                static inline void setReplaceMain(bool val) {
-                        replace_main = val;
-                }
+class FixMain {
+public :
+        static inline LinkageSpec::Spec mainLinkage() {
+                return replace_main ? LinkageSpec::Cforall : LinkageSpec::C;
+        }
 
-                static void registerMain(FunctionDecl* val);
-                static bool isMain(FunctionDecl* decl);
-                static bool isMain(const ast::FunctionDecl * decl);
+        static inline void setReplaceMain(bool val) {
+                replace_main = val;
+        }
 
-                static void fix(std::ostream &os, const char* bootloader_filename);
+        static bool isMain(FunctionDecl* decl);
+        static bool isMain(const ast::FunctionDecl * decl);
 
-                static void findMain( std::list< Declaration * > & decls );
+        static void fix( std::list< Declaration * > & decls,
+                        std::ostream &os, const char* bootloader_filename );
 
-          private:
-                static bool replace_main;
-                static std::unique_ptr<FunctionDecl> main_signature;
-        };
+private:
+        static bool replace_main;
+};
+
 } // namespace CodeGen

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct 29 10:10:00 2021
-// Update Count     : 654
+// Last Modified On : Fri Oct 29 16:34:00 2021
+// Update Count     : 655
 //
 
@@ -472 +472 @@
                 PASS( "Code Gen", CodeGen::generate( translationUnit, *output, ! genproto, prettycodegenp, true, linemarks ) );
 
-                CodeGen::FixMain::findMain( translationUnit );
-                CodeGen::FixMain::fix( *output, (PreludeDirector + "/bootloader.c").c_str() );
+                CodeGen::FixMain::fix( translationUnit, *output,
+                                (PreludeDirector + "/bootloader.c").c_str() );
                 if ( output != &cout ) {
                         delete output;