Changeset 981bdc6

Timestamp:

Jan 12, 2017, 2:05:49 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f3b0a07

Parents:

2298a7b8 (diff), 3fe34ae (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:/u/cforall/software/cfa/cfa-cc

Files:

• .gitignore (modified) (1 diff)
• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/CodeGen/FixNames.cc (modified) (5 diffs)
• src/GenPoly/InstantiateGeneric.cc (modified) (1 diff)
• src/SymTab/Mangler.h (modified) (2 diffs)
• src/SynTree/FunctionDecl.cc (modified) (1 diff)
• src/driver/cfa.cc (modified) (2 diffs)
• src/libcfa/Makefile.am (modified) (1 diff)
• src/libcfa/Makefile.in (modified) (11 diffs)
• src/libcfa/concurrency/threads (modified) (4 diffs)
• src/libcfa/containers/vector (modified) (2 diffs)
• src/libcfa/fstream (modified) (3 diffs)
• src/libcfa/iostream (modified) (4 diffs)
• src/libcfa/iterator (modified) (3 diffs)
• src/libcfa/limits (modified) (3 diffs)
• src/libcfa/math (modified) (4 diffs)
• src/libcfa/rational (modified) (3 diffs)
• src/libcfa/stdlib (modified) (2 diffs)
• src/main.cc (modified) (7 diffs)
• src/prelude/Makefile.am (modified) (2 diffs)
• src/prelude/Makefile.in (modified) (2 diffs)
• src/prelude/bootloader.cf (added)
• src/tests/.expect/32/declarationSpecifier.txt (modified) (1 diff)
• src/tests/.expect/32/gccExtensions.txt (modified) (2 diffs)
• src/tests/.expect/64/declarationSpecifier.txt (modified) (1 diff)
• src/tests/.expect/64/gccExtensions.txt (modified) (2 diffs)

.gitignore

@@ -31 +31 @@
 src/prelude/builtins.cf
 src/prelude/extras.cf
+src/prelude/bootloader.c
 src/libcfa/libcfa-prelude.c
 

configure

@@ -3214 +3214 @@
 
 if test "$includedir" = '${prefix}/include'; then
-        cfa_incdir="${cfa_prefix}/include"
+        cfa_incdir="${cfa_prefix}/include/cfa"
 else
         cfa_incdir=${includedir}

configure.ac

@@ -122 +122 @@
 
 if test "$includedir" = '${prefix}/include'; then
-        cfa_incdir="${cfa_prefix}/include"
+        cfa_incdir="${cfa_prefix}/include/cfa"
 else
         cfa_incdir=${includedir}

src/CodeGen/FixNames.cc

@@ -14 +14 @@
 //
 
+#include <memory>
+
 #include "FixNames.h"
 #include "SynTree/Declaration.h"
@@ -20 +22 @@
 #include "SymTab/Mangler.h"
 #include "OperatorTable.h"
+
+extern std::unique_ptr<FunctionDecl> translation_unit_main_signature;
 
 namespace CodeGen {
@@ -28 +32 @@
 
                 virtual void visit( CompoundStmt *compoundStmt );
-
           private:
                 int scopeLevel = 1;
@@ -34 +37 @@
                 void fixDWT( DeclarationWithType *dwt );
         };
+
+        std::string mangle_main() {
+                FunctionType* main_type;
+                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl(
+                        "main", 
+                        DeclarationNode::NoStorageClass, 
+                        LinkageSpec::Cforall, 
+                        main_type = new FunctionType( Type::Qualifiers(), true ), 
+                        nullptr, false, false
+                ) };
+                main_type->get_returnVals().push_back( 
+                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                );
+
+                auto&& name = SymTab::Mangler::mangle( mainDecl.get() );
+                // std::cerr << name << std::endl;
+                return name;
+        }
+        std::string mangle_main_args() {
+                FunctionType* main_type;
+                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl(
+                        "main", 
+                        DeclarationNode::NoStorageClass, 
+                        LinkageSpec::Cforall, 
+                        main_type = new FunctionType( Type::Qualifiers(), false ), 
+                        nullptr, false, false
+                ) };
+                main_type->get_returnVals().push_back( 
+                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                );
+
+                mainDecl->get_functionType()->get_parameters().push_back( 
+                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                );
+
+                mainDecl->get_functionType()->get_parameters().push_back( 
+                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, 
+                        new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ), 
+                        nullptr )
+                );
+
+                auto&& name = SymTab::Mangler::mangle( mainDecl.get() );
+                // std::cerr << name << std::endl;
+                return name;
+        }
+
+        bool is_main(const std::string& name) {
+                static std::string mains[] = { 
+                        mangle_main(), 
+                        mangle_main_args()
+                };
+
+                for(const auto& m : mains) {
+                        if( name == m ) return true;
+                }
+                return false;
+        }
 
         void fixNames( std::list< Declaration* > translationUnit ) {
@@ -57 +117 @@
                 Visitor::visit( functionDecl );
                 fixDWT( functionDecl );
+
+                if(is_main( SymTab::Mangler::mangle(functionDecl, true, true) )) {
+                        if(translation_unit_main_signature) { 
+                                throw SemanticError("Multiple definition of main routine\n", functionDecl); 
+                        }
+
+                        functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), "0") ) ) );
+                        translation_unit_main_signature.reset( functionDecl->clone() );
+                }
         }
 

src/GenPoly/InstantiateGeneric.cc

@@ -152 +152 @@
         class EnvFinder final : public GenPoly::PolyMutator {
         public:
+                using GenPoly::PolyMutator::mutate;
                 virtual Type * mutate( TypeInstType * inst ) override {
                         if ( env ) envMap[inst] = env;

src/SymTab/Mangler.h

@@ -27 +27 @@
                 /// Mangle syntax tree object; primary interface to clients
                 template< typename SynTreeClass >
-            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true );
+            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true, bool typeMode = false );
                 /// Mangle a type name; secondary interface
                 static std::string mangleType( Type* ty );
@@ -70 +70 @@
 
         template< typename SynTreeClass >
-        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable ) {
-                Mangler mangler( mangleOverridable, false );
+        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable, bool typeMode ) {
+                Mangler mangler( mangleOverridable, typeMode );
                 maybeAccept( decl, mangler );
                 return mangler.get_mangleName();

src/SynTree/FunctionDecl.cc

@@ -23 +23 @@
 #include "InitTweak/InitTweak.h"
 
+extern bool translation_unit_nomain;
+
 FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )
                 : Parent( name, sc, linkage, attributes ), type( type ), statements( statements ) {
         set_isInline( isInline );
         set_isNoreturn( isNoreturn );
-        // this is a brazen hack to force the function "main" to have C linkage
+        // this is a brazen hack to force the function "main" to have Cforall linkage
+        // because we want to replace the main even if it is inside an extern
         if ( name == "main" ) {
-                set_linkage( LinkageSpec::C );
+                set_linkage( translation_unit_nomain ? LinkageSpec::C : LinkageSpec::Cforall );
         } // if
 }

src/driver/cfa.cc

@@ -246 +246 @@
         if ( link ) {
                 #if ! defined(HAVE_LIBCFA_RELEASE)
-                        if( !debug ) { 
+                        if( !debug ) {
                                 cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
                                 exit( EXIT_FAILURE );
@@ -252 +252 @@
                 #endif
                 #if ! defined(HAVE_LIBCFA_DEBUG)
-                        if( debug ) { 
+                        if( debug ) {
                                 cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl;
                                 exit( EXIT_FAILURE );

src/libcfa/Makefile.am

@@ -65 +65 @@
 stdhdr = ${shell echo stdhdr/*}
 
-nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
+cfa_includedir = $(includedir)/cfa
+nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
 
 CLEANFILES = libcfa-prelude.c

src/libcfa/Makefile.in

@@ -42 +42 @@
 @BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a
 subdir = src/libcfa
-DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(nobase_cfa_include_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -79 +79 @@
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"
 LIBRARIES = $(lib_LIBRARIES)
 AR = ar
@@ -144 +144 @@
 SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
 DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
-HEADERS = $(nobase_include_HEADERS)
+HEADERS = $(nobase_cfa_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -281 +281 @@
 libcfa_d_a_CFLAGS = -debug -O0
 stdhdr = ${shell echo stdhdr/*}
-nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
+cfa_includedir = $(includedir)/cfa
+nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
 CLEANFILES = libcfa-prelude.c
 all: all-am
@@ -761 +762 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-invoke.obj `if test -f 'concurrency/invoke.c'; then $(CYGPATH_W) 'concurrency/invoke.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/invoke.c'; fi`
-install-nobase_includeHEADERS: $(nobase_include_HEADERS)
+install-nobase_cfa_includeHEADERS: $(nobase_cfa_include_HEADERS)
         @$(NORMAL_INSTALL)
-        test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+        test -z "$(cfa_includedir)" || $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)"
+        @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \
         $(am__nobase_list) | while read dir files; do \
           xfiles=; for file in $$files; do \
@@ -771 +772 @@
           test -z "$$xfiles" || { \
             test "x$$dir" = x. || { \
-              echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
-              $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
-            echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
-            $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
+              echo "$(MKDIR_P) '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
+              $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)/$$dir"; }; \
+            echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
+            $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(cfa_includedir)/$$dir" || exit $$?; }; \
         done
 
-uninstall-nobase_includeHEADERS:
+uninstall-nobase_cfa_includeHEADERS:
         @$(NORMAL_UNINSTALL)
-        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+        @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \
         $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-        dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+        dir='$(DESTDIR)$(cfa_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -869 +870 @@
 all-am: Makefile $(LIBRARIES) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"; do \
           test -z "$$dir" || $(MKDIR_P) "$$dir"; \
         done
@@ -929 +930 @@
 info-am:
 
-install-data-am: install-nobase_includeHEADERS
+install-data-am: install-nobase_cfa_includeHEADERS
 
 install-dvi: install-dvi-am
@@ -975 +976 @@
 ps-am:
 
-uninstall-am: uninstall-libLIBRARIES uninstall-nobase_includeHEADERS
+uninstall-am: uninstall-libLIBRARIES \
+        uninstall-nobase_cfa_includeHEADERS
 
 .MAKE: install-am install-strip
@@ -986 +988 @@
         install-exec-am install-html install-html-am install-info \
         install-info-am install-libLIBRARIES install-man \
-        install-nobase_includeHEADERS install-pdf install-pdf-am \
+        install-nobase_cfa_includeHEADERS install-pdf install-pdf-am \
         install-ps install-ps-am install-strip installcheck \
         installcheck-am installdirs maintainer-clean \
@@ -992 +994 @@
         mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
         tags uninstall uninstall-am uninstall-libLIBRARIES \
-        uninstall-nobase_includeHEADERS
+        uninstall-nobase_cfa_includeHEADERS
 
 

src/libcfa/concurrency/threads

@@ -14 +14 @@
 // Update Count     : 0
 //
-
-#ifdef __CFORALL__
 
 #ifndef THREADS_H
@@ -75 +73 @@
       coroutine* src = this_coroutine();                // optimization
 
-        assertf( src->last != 0, 
+        assertf( src->last != 0,
                 "Attempt to suspend coroutine %.256s (%p) that has never been resumed.\n"
                 "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
                 src->name, src );
-        assertf( src->last->notHalted, 
+        assertf( src->last->notHalted,
                 "Attempt by coroutine %.256s (%p) to suspend back to terminated coroutine %.256s (%p).\n"
                 "Possible cause is terminated coroutine's main routine has already returned.",
@@ -100 +98 @@
       // not resuming self ?
         if ( src != dst ) {
-                assertf( dst->notHalted , 
+                assertf( dst->notHalted ,
                         "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
                         "Possible cause is terminated coroutine's main routine has already returned.",
@@ -115 +113 @@
 #endif //THREADS_H
 
-#else
-#include_next <thread>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //

src/libcfa/containers/vector

@@ -13 +13 @@
 // Update Count     : 2
 //
-
-#ifdef __CFORALL__
 
 #ifndef VECTOR_H
@@ -170 +168 @@
 #endif // VECTOR_H
 
-#else
-#include_next <vector>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //

src/libcfa/fstream

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// fstream -- 
+// fstream --
 //
 // Author           : Peter A. Buhr
@@ -13 +13 @@
 // Update Count     : 88
 //
-
-#ifdef __CFORALL__
 
 #ifndef __FSTREAM_H__
@@ -64 +62 @@
 #endif // __FSTREAM_H__
 
-#else
-#include_next <fstream>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //
 // tab-width: 4 //
 // End: //
-

src/libcfa/iostream

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// iostream -- 
+// iostream --
 //
 // Author           : Peter A. Buhr
@@ -13 +13 @@
 // Update Count     : 93
 //
-
-#ifdef __CFORALL__
 
 #ifndef __IOSTREAM_H__
@@ -28 +26 @@
         void sepReset( ostype *, _Bool );                                       // set separator and default state
         void sepSet( ostype *, const char * );                          // set separator to string (15 character maximum)
-        const char * sepGet( ostype * );                                        // get separator string 
+        const char * sepGet( ostype * );                                        // get separator string
         _Bool sepDisable( ostype * );                                           // set default state to off, and return previous state
         _Bool sepEnable( ostype * );                                            // set default state to on, and return previous state
@@ -128 +126 @@
 #endif // __IOSTREAM_H
 
-#else
-#include_next <iostream>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //

src/libcfa/iterator

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// iterator -- 
+// iterator --
 //
 // Author           : Richard C. Bilson
@@ -13 +13 @@
 // Update Count     : 9
 //
-
-#ifdef __CFORALL__
 
 #ifndef ITERATOR_H
@@ -48 +46 @@
 #endif // ITERATOR_H
 
-#else
-#include_next <iterator>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //

src/libcfa/limits

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// limits -- 
-// 
+//
+// limits --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Apr  6 18:06:52 2016
@@ -12 +12 @@
 // Last Modified On : Wed Apr  6 21:08:16 2016
 // Update Count     : 6
-// 
-
-#ifdef __CFORALL__
+//
 
 #ifndef LIMITS_H
@@ -114 +112 @@
 #endif // LIMITS_H
 
-#else
-#include_next <limits>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //

src/libcfa/math

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// math -- 
-// 
+// math --
+//
 // Author           : Peter A. Buhr
 // Created On       : Mon Apr 18 23:37:04 2016
@@ -12 +12 @@
 // Last Modified On : Sun Apr 24 12:45:02 2016
 // Update Count     : 59
-// 
-
-#ifdef __CFORALL__
+//
 
 #ifndef MATH_H
@@ -356 +354 @@
 #endif // MATH_H
 
-#else
-#include_next <math>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //

src/libcfa/rational

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
+//
 // rational -- Rational numbers are numbers written as a ratio, i.e., as a fraction, where the numerator (top number)
 //     and the denominator (bottom number) are whole numbers. When creating and computing with rational numbers, results
 //     are constantly reduced to keep the numerator and denominator as small as possible.
-// 
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Apr  6 17:56:25 2016
@@ -14 +14 @@
 // Last Modified On : Wed May  4 14:11:45 2016
 // Update Count     : 16
-// 
-#ifdef __CFORALL__
-
+//
 #ifndef RATIONAL_H
 #define RATIONAL_H
@@ -67 +65 @@
 #endif // RATIONAL_H
 
-#else
-#include_next <rational>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //

src/libcfa/stdlib

@@ -13 +13 @@
 // Update Count     : 99
 //
-
-#ifdef __CFORALL__
 
 #ifndef STDLIB_H
@@ -138 +136 @@
 #endif // STDLIB_H
 
-#else
-#include_next <stdlib>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //

src/main.cc

@@ -14 +14 @@
 //
 
+#include <memory>
 #include <iostream>
 #include <fstream>
@@ -65 +66 @@
         nopreludep = false,
         noprotop = false,
+        nomainp = false,
         parsep = false,
         resolvep = false,                                                                       // used in AlternativeFinder
@@ -77 +79 @@
 static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
 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
@@ -154 +159 @@
 
         parse_cmdline( argc, argv, filename );                          // process command-line arguments
+        translation_unit_nomain = nomainp;
 
         try {
@@ -299 +305 @@
 
                 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";
+                }
 
                 if ( output != &cout ) {
@@ -360 +378 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcefglnpqrstTvyzD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcefglmnpqrstTvyzD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -400 +418 @@
                   case 'p':                                                                             // generate prototypes for preamble functions
                         noprotop = true;
+                        break;
+                  case 'm':                                                                             // don't replace the main
+                        nomainp = true;
                         break;
                   case Parse:

src/prelude/Makefile.am

@@ -20 +20 @@
 # put into lib for now
 cfalibdir = ${libdir}
-cfalib_DATA = builtins.cf extras.cf prelude.cf
+cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c
 noinst_DATA = ../libcfa/libcfa-prelude.c
 
@@ -45 +45 @@
         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
 
+bootloader.c : bootloader.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
+        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
-MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
+MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}

src/prelude/Makefile.in

@@ -210 +210 @@
 # put into lib for now
 cfalibdir = ${libdir}
-cfalib_DATA = builtins.cf extras.cf prelude.cf
+cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c
 noinst_DATA = ../libcfa/libcfa-prelude.c
-MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
+MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
 all: all-am
 
@@ -441 +441 @@
         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
 
+bootloader.c : bootloader.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
+        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

src/tests/.expect/32/declarationSpecifier.txt

@@ -621 +621 @@
 static inline volatile const short __f47__FCVs___1();
 static inline volatile const short __f48__FCVs___1();
-int main(int __argc__i_1, const char **__argv__PPCc_1){
+int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){
     int ___retval_main__i_1;
     ((void)(___retval_main__i_1=((int )0)) /* ?{} */);
     return ((int )___retval_main__i_1);
-}
+    ((void)(___retval_main__i_1=0) /* ?{} */);
+    return ((int )___retval_main__i_1);
+}
+int main(int argc, char** argv) { return __main__Fi_iPPCc__1(argc, argv); }
+

src/tests/.expect/32/gccExtensions.txt

@@ -6 +6 @@
 extern int printf(const char *__restrict __format, ...);
 extern int __x__i_1 asm ( "xx" );
-int main(int __argc__i_1, const char **__argv__PPCc_1){
+int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){
     int ___retval_main__i_1;
     asm ( "nop" :  :  :  );
@@ -162 +162 @@
     ((void)(___retval_main__i_1=((int )0)) /* ?{} */);
     return ((int )___retval_main__i_1);
+    ((void)(___retval_main__i_1=0) /* ?{} */);
+    return ((int )___retval_main__i_1);
 }
+int main(int argc, char** argv) { return __main__Fi_iPPCc__1(argc, argv); }

src/tests/.expect/64/declarationSpecifier.txt

@@ -621 +621 @@
 static inline volatile const short __f47__FCVs___1();
 static inline volatile const short __f48__FCVs___1();
-int main(int __argc__i_1, const char **__argv__PPCc_1){
+int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){
     int ___retval_main__i_1;
     ((void)(___retval_main__i_1=((int )0)) /* ?{} */);
     return ((int )___retval_main__i_1);
-}
+    ((void)(___retval_main__i_1=0) /* ?{} */);
+    return ((int )___retval_main__i_1);
+}
+int main(int argc, char** argv) { return __main__Fi_iPPCc__1(argc, argv); }

src/tests/.expect/64/gccExtensions.txt

@@ -6 +6 @@
 extern int printf(const char *__restrict __format, ...);
 extern int __x__i_1 asm ( "xx" );
-int main(int __argc__i_1, const char **__argv__PPCc_1){
+int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){
     int ___retval_main__i_1;
     asm ( "nop" :  :  :  );
@@ -162 +162 @@
     ((void)(___retval_main__i_1=((int )0)) /* ?{} */);
     return ((int )___retval_main__i_1);
+    ((void)(___retval_main__i_1=0) /* ?{} */);
+    return ((int )___retval_main__i_1);
 }
+int main(int argc, char** argv) { return __main__Fi_iPPCc__1(argc, argv); }