Changeset 981bdc6
- Timestamp:
- Jan 12, 2017, 2:05:49 PM (8 years ago)
- 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. - Files:
-
- 1 added
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
.gitignore
r2298a7b8 r981bdc6 31 31 src/prelude/builtins.cf 32 32 src/prelude/extras.cf 33 src/prelude/bootloader.c 33 34 src/libcfa/libcfa-prelude.c 34 35 -
configure
r2298a7b8 r981bdc6 3214 3214 3215 3215 if test "$includedir" = '${prefix}/include'; then 3216 cfa_incdir="${cfa_prefix}/include "3216 cfa_incdir="${cfa_prefix}/include/cfa" 3217 3217 else 3218 3218 cfa_incdir=${includedir} -
configure.ac
r2298a7b8 r981bdc6 122 122 123 123 if test "$includedir" = '${prefix}/include'; then 124 cfa_incdir="${cfa_prefix}/include "124 cfa_incdir="${cfa_prefix}/include/cfa" 125 125 else 126 126 cfa_incdir=${includedir} -
src/CodeGen/FixNames.cc
r2298a7b8 r981bdc6 14 14 // 15 15 16 #include <memory> 17 16 18 #include "FixNames.h" 17 19 #include "SynTree/Declaration.h" … … 20 22 #include "SymTab/Mangler.h" 21 23 #include "OperatorTable.h" 24 25 extern std::unique_ptr<FunctionDecl> translation_unit_main_signature; 22 26 23 27 namespace CodeGen { … … 28 32 29 33 virtual void visit( CompoundStmt *compoundStmt ); 30 31 34 private: 32 35 int scopeLevel = 1; … … 34 37 void fixDWT( DeclarationWithType *dwt ); 35 38 }; 39 40 std::string mangle_main() { 41 FunctionType* main_type; 42 std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( 43 "main", 44 DeclarationNode::NoStorageClass, 45 LinkageSpec::Cforall, 46 main_type = new FunctionType( Type::Qualifiers(), true ), 47 nullptr, false, false 48 ) }; 49 main_type->get_returnVals().push_back( 50 new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr ) 51 ); 52 53 auto&& name = SymTab::Mangler::mangle( mainDecl.get() ); 54 // std::cerr << name << std::endl; 55 return name; 56 } 57 std::string mangle_main_args() { 58 FunctionType* main_type; 59 std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( 60 "main", 61 DeclarationNode::NoStorageClass, 62 LinkageSpec::Cforall, 63 main_type = new FunctionType( Type::Qualifiers(), false ), 64 nullptr, false, false 65 ) }; 66 main_type->get_returnVals().push_back( 67 new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr ) 68 ); 69 70 mainDecl->get_functionType()->get_parameters().push_back( 71 new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr ) 72 ); 73 74 mainDecl->get_functionType()->get_parameters().push_back( 75 new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, 76 new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ), 77 nullptr ) 78 ); 79 80 auto&& name = SymTab::Mangler::mangle( mainDecl.get() ); 81 // std::cerr << name << std::endl; 82 return name; 83 } 84 85 bool is_main(const std::string& name) { 86 static std::string mains[] = { 87 mangle_main(), 88 mangle_main_args() 89 }; 90 91 for(const auto& m : mains) { 92 if( name == m ) return true; 93 } 94 return false; 95 } 36 96 37 97 void fixNames( std::list< Declaration* > translationUnit ) { … … 57 117 Visitor::visit( functionDecl ); 58 118 fixDWT( functionDecl ); 119 120 if(is_main( SymTab::Mangler::mangle(functionDecl, true, true) )) { 121 if(translation_unit_main_signature) { 122 throw SemanticError("Multiple definition of main routine\n", functionDecl); 123 } 124 125 functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), "0") ) ) ); 126 translation_unit_main_signature.reset( functionDecl->clone() ); 127 } 59 128 } 60 129 -
src/GenPoly/InstantiateGeneric.cc
r2298a7b8 r981bdc6 152 152 class EnvFinder final : public GenPoly::PolyMutator { 153 153 public: 154 using GenPoly::PolyMutator::mutate; 154 155 virtual Type * mutate( TypeInstType * inst ) override { 155 156 if ( env ) envMap[inst] = env; -
src/SymTab/Mangler.h
r2298a7b8 r981bdc6 27 27 /// Mangle syntax tree object; primary interface to clients 28 28 template< typename SynTreeClass > 29 static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true );29 static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true, bool typeMode = false ); 30 30 /// Mangle a type name; secondary interface 31 31 static std::string mangleType( Type* ty ); … … 70 70 71 71 template< typename SynTreeClass > 72 std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable ) {73 Mangler mangler( mangleOverridable, false );72 std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable, bool typeMode ) { 73 Mangler mangler( mangleOverridable, typeMode ); 74 74 maybeAccept( decl, mangler ); 75 75 return mangler.get_mangleName(); -
src/SynTree/FunctionDecl.cc
r2298a7b8 r981bdc6 23 23 #include "InitTweak/InitTweak.h" 24 24 25 extern bool translation_unit_nomain; 26 25 27 FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes ) 26 28 : Parent( name, sc, linkage, attributes ), type( type ), statements( statements ) { 27 29 set_isInline( isInline ); 28 30 set_isNoreturn( isNoreturn ); 29 // this is a brazen hack to force the function "main" to have C linkage 31 // this is a brazen hack to force the function "main" to have Cforall linkage 32 // because we want to replace the main even if it is inside an extern 30 33 if ( name == "main" ) { 31 set_linkage( LinkageSpec::C);34 set_linkage( translation_unit_nomain ? LinkageSpec::C : LinkageSpec::Cforall ); 32 35 } // if 33 36 } -
src/driver/cfa.cc
r2298a7b8 r981bdc6 246 246 if ( link ) { 247 247 #if ! defined(HAVE_LIBCFA_RELEASE) 248 if( !debug ) { 248 if( !debug ) { 249 249 cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl; 250 250 exit( EXIT_FAILURE ); … … 252 252 #endif 253 253 #if ! defined(HAVE_LIBCFA_DEBUG) 254 if( debug ) { 254 if( debug ) { 255 255 cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl; 256 256 exit( EXIT_FAILURE ); -
src/libcfa/Makefile.am
r2298a7b8 r981bdc6 65 65 stdhdr = ${shell echo stdhdr/*} 66 66 67 nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h 67 cfa_includedir = $(includedir)/cfa 68 nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h 68 69 69 70 CLEANFILES = libcfa-prelude.c -
src/libcfa/Makefile.in
r2298a7b8 r981bdc6 42 42 @BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a 43 43 subdir = src/libcfa 44 DIST_COMMON = $(nobase_ include_HEADERS) $(srcdir)/Makefile.am \44 DIST_COMMON = $(nobase_cfa_include_HEADERS) $(srcdir)/Makefile.am \ 45 45 $(srcdir)/Makefile.in 46 46 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 79 79 $(am__cd) "$$dir" && rm -f $$files; }; \ 80 80 } 81 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$( includedir)"81 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)" 82 82 LIBRARIES = $(lib_LIBRARIES) 83 83 AR = ar … … 144 144 SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES) 145 145 DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES) 146 HEADERS = $(nobase_ include_HEADERS)146 HEADERS = $(nobase_cfa_include_HEADERS) 147 147 ETAGS = etags 148 148 CTAGS = ctags … … 281 281 libcfa_d_a_CFLAGS = -debug -O0 282 282 stdhdr = ${shell echo stdhdr/*} 283 nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h 283 cfa_includedir = $(includedir)/cfa 284 nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h 284 285 CLEANFILES = libcfa-prelude.c 285 286 all: all-am … … 761 762 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 762 763 @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` 763 install-nobase_ includeHEADERS: $(nobase_include_HEADERS)764 install-nobase_cfa_includeHEADERS: $(nobase_cfa_include_HEADERS) 764 765 @$(NORMAL_INSTALL) 765 test -z "$( includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"766 @list='$(nobase_ include_HEADERS)'; test -n "$(includedir)" || list=; \766 test -z "$(cfa_includedir)" || $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)" 767 @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \ 767 768 $(am__nobase_list) | while read dir files; do \ 768 769 xfiles=; for file in $$files; do \ … … 771 772 test -z "$$xfiles" || { \ 772 773 test "x$$dir" = x. || { \ 773 echo "$(MKDIR_P) '$(DESTDIR)$( includedir)/$$dir'"; \774 $(MKDIR_P) "$(DESTDIR)$( includedir)/$$dir"; }; \775 echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$( includedir)/$$dir'"; \776 $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$( includedir)/$$dir" || exit $$?; }; \774 echo "$(MKDIR_P) '$(DESTDIR)$(cfa_includedir)/$$dir'"; \ 775 $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)/$$dir"; }; \ 776 echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(cfa_includedir)/$$dir'"; \ 777 $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(cfa_includedir)/$$dir" || exit $$?; }; \ 777 778 done 778 779 779 uninstall-nobase_ includeHEADERS:780 uninstall-nobase_cfa_includeHEADERS: 780 781 @$(NORMAL_UNINSTALL) 781 @list='$(nobase_ include_HEADERS)'; test -n "$(includedir)" || list=; \782 @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \ 782 783 $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ 783 dir='$(DESTDIR)$( includedir)'; $(am__uninstall_files_from_dir)784 dir='$(DESTDIR)$(cfa_includedir)'; $(am__uninstall_files_from_dir) 784 785 785 786 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) … … 869 870 all-am: Makefile $(LIBRARIES) $(HEADERS) 870 871 installdirs: 871 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$( includedir)"; do \872 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"; do \ 872 873 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 873 874 done … … 929 930 info-am: 930 931 931 install-data-am: install-nobase_ includeHEADERS932 install-data-am: install-nobase_cfa_includeHEADERS 932 933 933 934 install-dvi: install-dvi-am … … 975 976 ps-am: 976 977 977 uninstall-am: uninstall-libLIBRARIES uninstall-nobase_includeHEADERS 978 uninstall-am: uninstall-libLIBRARIES \ 979 uninstall-nobase_cfa_includeHEADERS 978 980 979 981 .MAKE: install-am install-strip … … 986 988 install-exec-am install-html install-html-am install-info \ 987 989 install-info-am install-libLIBRARIES install-man \ 988 install-nobase_ includeHEADERS install-pdf install-pdf-am \990 install-nobase_cfa_includeHEADERS install-pdf install-pdf-am \ 989 991 install-ps install-ps-am install-strip installcheck \ 990 992 installcheck-am installdirs maintainer-clean \ … … 992 994 mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ 993 995 tags uninstall uninstall-am uninstall-libLIBRARIES \ 994 uninstall-nobase_ includeHEADERS996 uninstall-nobase_cfa_includeHEADERS 995 997 996 998 -
src/libcfa/concurrency/threads
r2298a7b8 r981bdc6 14 14 // Update Count : 0 15 15 // 16 17 #ifdef __CFORALL__18 16 19 17 #ifndef THREADS_H … … 75 73 coroutine* src = this_coroutine(); // optimization 76 74 77 assertf( src->last != 0, 75 assertf( src->last != 0, 78 76 "Attempt to suspend coroutine %.256s (%p) that has never been resumed.\n" 79 77 "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.", 80 78 src->name, src ); 81 assertf( src->last->notHalted, 79 assertf( src->last->notHalted, 82 80 "Attempt by coroutine %.256s (%p) to suspend back to terminated coroutine %.256s (%p).\n" 83 81 "Possible cause is terminated coroutine's main routine has already returned.", … … 100 98 // not resuming self ? 101 99 if ( src != dst ) { 102 assertf( dst->notHalted , 100 assertf( dst->notHalted , 103 101 "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n" 104 102 "Possible cause is terminated coroutine's main routine has already returned.", … … 115 113 #endif //THREADS_H 116 114 117 #else118 #include_next <thread>119 #endif //__CFORALL__120 121 115 // Local Variables: // 122 116 // mode: c // -
src/libcfa/containers/vector
r2298a7b8 r981bdc6 13 13 // Update Count : 2 14 14 // 15 16 #ifdef __CFORALL__17 15 18 16 #ifndef VECTOR_H … … 170 168 #endif // VECTOR_H 171 169 172 #else173 #include_next <vector>174 #endif //__CFORALL__175 176 170 // Local Variables: // 177 171 // mode: c // -
src/libcfa/fstream
r2298a7b8 r981bdc6 5 5 // file "LICENCE" distributed with Cforall. 6 6 // 7 // fstream -- 7 // fstream -- 8 8 // 9 9 // Author : Peter A. Buhr … … 13 13 // Update Count : 88 14 14 // 15 16 #ifdef __CFORALL__17 15 18 16 #ifndef __FSTREAM_H__ … … 64 62 #endif // __FSTREAM_H__ 65 63 66 #else67 #include_next <fstream>68 #endif //__CFORALL__69 70 64 // Local Variables: // 71 65 // mode: c // 72 66 // tab-width: 4 // 73 67 // End: // 74 -
src/libcfa/iostream
r2298a7b8 r981bdc6 5 5 // file "LICENCE" distributed with Cforall. 6 6 // 7 // iostream -- 7 // iostream -- 8 8 // 9 9 // Author : Peter A. Buhr … … 13 13 // Update Count : 93 14 14 // 15 16 #ifdef __CFORALL__17 15 18 16 #ifndef __IOSTREAM_H__ … … 28 26 void sepReset( ostype *, _Bool ); // set separator and default state 29 27 void sepSet( ostype *, const char * ); // set separator to string (15 character maximum) 30 const char * sepGet( ostype * ); // get separator string 28 const char * sepGet( ostype * ); // get separator string 31 29 _Bool sepDisable( ostype * ); // set default state to off, and return previous state 32 30 _Bool sepEnable( ostype * ); // set default state to on, and return previous state … … 128 126 #endif // __IOSTREAM_H 129 127 130 #else131 #include_next <iostream>132 #endif //__CFORALL__133 134 128 // Local Variables: // 135 129 // mode: c // -
src/libcfa/iterator
r2298a7b8 r981bdc6 5 5 // file "LICENCE" distributed with Cforall. 6 6 // 7 // iterator -- 7 // iterator -- 8 8 // 9 9 // Author : Richard C. Bilson … … 13 13 // Update Count : 9 14 14 // 15 16 #ifdef __CFORALL__17 15 18 16 #ifndef ITERATOR_H … … 48 46 #endif // ITERATOR_H 49 47 50 #else51 #include_next <iterator>52 #endif //__CFORALL__53 54 48 // Local Variables: // 55 49 // mode: c // -
src/libcfa/limits
r2298a7b8 r981bdc6 1 // 1 // 2 2 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo 3 3 // 4 4 // The contents of this file are covered under the licence agreement in the 5 5 // file "LICENCE" distributed with Cforall. 6 // 7 // limits -- 8 // 6 // 7 // limits -- 8 // 9 9 // Author : Peter A. Buhr 10 10 // Created On : Wed Apr 6 18:06:52 2016 … … 12 12 // Last Modified On : Wed Apr 6 21:08:16 2016 13 13 // Update Count : 6 14 // 15 16 #ifdef __CFORALL__ 14 // 17 15 18 16 #ifndef LIMITS_H … … 114 112 #endif // LIMITS_H 115 113 116 #else117 #include_next <limits>118 #endif //__CFORALL__119 120 114 // Local Variables: // 121 115 // mode: c // -
src/libcfa/math
r2298a7b8 r981bdc6 1 // 1 // 2 2 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo 3 3 // … … 5 5 // file "LICENCE" distributed with Cforall. 6 6 // 7 // math -- 8 // 7 // math -- 8 // 9 9 // Author : Peter A. Buhr 10 10 // Created On : Mon Apr 18 23:37:04 2016 … … 12 12 // Last Modified On : Sun Apr 24 12:45:02 2016 13 13 // Update Count : 59 14 // 15 16 #ifdef __CFORALL__ 14 // 17 15 18 16 #ifndef MATH_H … … 356 354 #endif // MATH_H 357 355 358 #else359 #include_next <math>360 #endif //__CFORALL__361 362 356 // Local Variables: // 363 357 // mode: c // -
src/libcfa/rational
r2298a7b8 r981bdc6 1 // 1 // 2 2 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo 3 3 // 4 4 // The contents of this file are covered under the licence agreement in the 5 5 // file "LICENCE" distributed with Cforall. 6 // 6 // 7 7 // rational -- Rational numbers are numbers written as a ratio, i.e., as a fraction, where the numerator (top number) 8 8 // and the denominator (bottom number) are whole numbers. When creating and computing with rational numbers, results 9 9 // are constantly reduced to keep the numerator and denominator as small as possible. 10 // 10 // 11 11 // Author : Peter A. Buhr 12 12 // Created On : Wed Apr 6 17:56:25 2016 … … 14 14 // Last Modified On : Wed May 4 14:11:45 2016 15 15 // Update Count : 16 16 // 17 #ifdef __CFORALL__ 18 16 // 19 17 #ifndef RATIONAL_H 20 18 #define RATIONAL_H … … 67 65 #endif // RATIONAL_H 68 66 69 #else70 #include_next <rational>71 #endif //__CFORALL__72 73 67 // Local Variables: // 74 68 // mode: c // -
src/libcfa/stdlib
r2298a7b8 r981bdc6 13 13 // Update Count : 99 14 14 // 15 16 #ifdef __CFORALL__17 15 18 16 #ifndef STDLIB_H … … 138 136 #endif // STDLIB_H 139 137 140 #else141 #include_next <stdlib>142 #endif //__CFORALL__143 144 138 // Local Variables: // 145 139 // mode: c // -
src/main.cc
r2298a7b8 r981bdc6 14 14 // 15 15 16 #include <memory> 16 17 #include <iostream> 17 18 #include <fstream> … … 65 66 nopreludep = false, 66 67 noprotop = false, 68 nomainp = false, 67 69 parsep = false, 68 70 resolvep = false, // used in AlternativeFinder … … 77 79 static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false ); 78 80 static void dump( list< Declaration * > & translationUnit, ostream & out = cout ); 81 82 bool translation_unit_nomain = true; 83 std::unique_ptr<FunctionDecl> translation_unit_main_signature = nullptr; 79 84 80 85 static void backtrace( int start ) { // skip first N stack frames … … 154 159 155 160 parse_cmdline( argc, argv, filename ); // process command-line arguments 161 translation_unit_nomain = nomainp; 156 162 157 163 try { … … 299 305 300 306 CodeGen::generate( translationUnit, *output, ! noprotop ); 307 308 if( translation_unit_main_signature ) { 309 *output << "int main(int argc, char** argv) { return "; 310 311 *output << translation_unit_main_signature->get_scopedMangleName() << "("; 312 if(translation_unit_main_signature->get_functionType()->get_parameters().size() != 0){ 313 *output << "argc, argv"; 314 } 315 *output << ");"; 316 317 *output << " }\n"; 318 } 301 319 302 320 if ( output != &cout ) { … … 360 378 361 379 int c; 362 while ( (c = getopt_long( argc, argv, "abBcefgl npqrstTvyzD:F:", long_opts, &long_index )) != -1 ) {380 while ( (c = getopt_long( argc, argv, "abBcefglmnpqrstTvyzD:F:", long_opts, &long_index )) != -1 ) { 363 381 switch ( c ) { 364 382 case Ast: … … 400 418 case 'p': // generate prototypes for preamble functions 401 419 noprotop = true; 420 break; 421 case 'm': // don't replace the main 422 nomainp = true; 402 423 break; 403 424 case Parse: -
src/prelude/Makefile.am
r2298a7b8 r981bdc6 20 20 # put into lib for now 21 21 cfalibdir = ${libdir} 22 cfalib_DATA = builtins.cf extras.cf prelude.cf 22 cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c 23 23 noinst_DATA = ../libcfa/libcfa-prelude.c 24 24 … … 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 46 46 47 bootloader.c : bootloader.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp 48 ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@ # use src/cfa-cpp as not in lib until after install 47 49 48 MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}50 MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} -
src/prelude/Makefile.in
r2298a7b8 r981bdc6 210 210 # put into lib for now 211 211 cfalibdir = ${libdir} 212 cfalib_DATA = builtins.cf extras.cf prelude.cf 212 cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c 213 213 noinst_DATA = ../libcfa/libcfa-prelude.c 214 MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}214 MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} 215 215 all: all-am 216 216 … … 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 442 442 443 bootloader.c : bootloader.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp 444 ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@ # use src/cfa-cpp as not in lib until after install 445 443 446 # Tell versions [3.59,3.63) of GNU make to not export all variables. 444 447 # Otherwise a system limit (for SysV at least) may be exceeded. -
src/tests/.expect/32/declarationSpecifier.txt
r2298a7b8 r981bdc6 621 621 static inline volatile const short __f47__FCVs___1(); 622 622 static inline volatile const short __f48__FCVs___1(); 623 int main(int __argc__i_1, const char **__argv__PPCc_1){623 int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){ 624 624 int ___retval_main__i_1; 625 625 ((void)(___retval_main__i_1=((int )0)) /* ?{} */); 626 626 return ((int )___retval_main__i_1); 627 } 627 ((void)(___retval_main__i_1=0) /* ?{} */); 628 return ((int )___retval_main__i_1); 629 } 630 int main(int argc, char** argv) { return __main__Fi_iPPCc__1(argc, argv); } 631 -
src/tests/.expect/32/gccExtensions.txt
r2298a7b8 r981bdc6 6 6 extern int printf(const char *__restrict __format, ...); 7 7 extern int __x__i_1 asm ( "xx" ); 8 int main(int __argc__i_1, const char **__argv__PPCc_1){8 int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){ 9 9 int ___retval_main__i_1; 10 10 asm ( "nop" : : : ); … … 162 162 ((void)(___retval_main__i_1=((int )0)) /* ?{} */); 163 163 return ((int )___retval_main__i_1); 164 ((void)(___retval_main__i_1=0) /* ?{} */); 165 return ((int )___retval_main__i_1); 164 166 } 167 int main(int argc, char** argv) { return __main__Fi_iPPCc__1(argc, argv); } -
src/tests/.expect/64/declarationSpecifier.txt
r2298a7b8 r981bdc6 621 621 static inline volatile const short __f47__FCVs___1(); 622 622 static inline volatile const short __f48__FCVs___1(); 623 int main(int __argc__i_1, const char **__argv__PPCc_1){623 int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){ 624 624 int ___retval_main__i_1; 625 625 ((void)(___retval_main__i_1=((int )0)) /* ?{} */); 626 626 return ((int )___retval_main__i_1); 627 } 627 ((void)(___retval_main__i_1=0) /* ?{} */); 628 return ((int )___retval_main__i_1); 629 } 630 int main(int argc, char** argv) { return __main__Fi_iPPCc__1(argc, argv); } -
src/tests/.expect/64/gccExtensions.txt
r2298a7b8 r981bdc6 6 6 extern int printf(const char *__restrict __format, ...); 7 7 extern int __x__i_1 asm ( "xx" ); 8 int main(int __argc__i_1, const char **__argv__PPCc_1){8 int __main__Fi_iPPCc__1(int __argc__i_1, const char **__argv__PPCc_1){ 9 9 int ___retval_main__i_1; 10 10 asm ( "nop" : : : ); … … 162 162 ((void)(___retval_main__i_1=((int )0)) /* ?{} */); 163 163 return ((int )___retval_main__i_1); 164 ((void)(___retval_main__i_1=0) /* ?{} */); 165 return ((int )___retval_main__i_1); 164 166 } 167 int main(int argc, char** argv) { return __main__Fi_iPPCc__1(argc, argv); }
Note: See TracChangeset
for help on using the changeset viewer.