Changeset 3fe34ae

Timestamp:

Jan 12, 2017, 2:05:03 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:

7cc2c8d, 981bdc6

Parents:

0270824

Message:

Added bootloader.cf which contains the main that wraps the user main

Files:

• .gitignore (modified) (1 diff)
• src/SynTree/FunctionDecl.cc (modified) (2 diffs)
• src/main.cc (modified) (5 diffs)
• src/prelude/Makefile.am (modified) (2 diffs)
• src/prelude/Makefile.in (modified) (2 diffs)
• src/prelude/bootloader.cf (added)

.gitignore

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

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 ) {
@@ -30 +32 @@
         // because we want to replace the main even if it is inside an extern
         if ( name == "main" ) {
-                set_linkage( LinkageSpec::Cforall );
+                set_linkage( translation_unit_nomain ? LinkageSpec::C : LinkageSpec::Cforall );
         } // if
 }

src/main.cc

@@ -66 +66 @@
         nopreludep = false,
         noprotop = false,
+        nomainp = false,
         parsep = false,
         resolvep = false,                                                                       // used in AlternativeFinder
@@ -79 +80 @@
 static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
 
+bool translation_unit_nomain = true;
 std::unique_ptr<FunctionDecl> translation_unit_main_signature = nullptr;
 
@@ -157 +159 @@
 
         parse_cmdline( argc, argv, filename );                          // process command-line arguments
+        translation_unit_nomain = nomainp;
 
         try {
@@ -375 +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:
@@ -415 +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.