Changeset 13de47bc for src/main.cc

Timestamp:

Jan 12, 2017, 3:28:29 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

aaa1a99a

Parents:

7cc2c8d

Message:

Proper bootloader boilerplate implemented

File:

• src/main.cc (modified) (6 diffs)

src/main.cc

@@ -14 +14 @@
 //
 
-#include <memory>
 #include <iostream>
 #include <fstream>
@@ -35 +34 @@
 #include "CodeGen/Generate.h"
 #include "CodeGen/FixNames.h"
+#include "CodeGen/FixMain.h"
 #include "ControlStruct/Mutate.h"
 #include "SymTab/Validate.h"
@@ -80 +80 @@
 static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
 
-bool translation_unit_nomain = true;
-std::unique_ptr<FunctionDecl> translation_unit_main_signature = nullptr;
-
 static void backtrace( int start ) {                                    // skip first N stack frames
         enum { Frames = 50 };
@@ -159 +156 @@
 
         parse_cmdline( argc, argv, filename );                          // process command-line arguments
-        translation_unit_nomain = nomainp;
+        CodeGen::FixMain::setReplaceMain( !nomainp );
 
         try {
@@ -178 +175 @@
                 } // if
 
-                if ( optind < argc ) {                                                  // any commands after the flags and input file ? => output file name
-                        output = new ofstream( argv[ optind ] );
-                } // if
-
                 // read in the builtins, extras, and the prelude
                 if ( ! nopreludep ) {                                                   // include gcc builtins
@@ -304 +297 @@
                 } // if
 
+                if ( optind < argc ) {                                                  // any commands after the flags and input file ? => output file name
+                        output = new ofstream( argv[ optind ] );
+                } // if
+
                 CodeGen::generate( translationUnit, *output, ! noprotop );
 
-                if( translation_unit_main_signature ) {
-                        *output << "int main(int argc, char** argv) { return ";
-
-                        *output << translation_unit_main_signature->get_scopedMangleName() << "(";
-                        if(translation_unit_main_signature->get_functionType()->get_parameters().size() != 0){
-                                *output << "argc, argv";
-                        }
-                        *output << ");";
-
-                        *output << " }\n";
-                }
+                CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
 
                 if ( output != &cout ) {