Changeset 34a6b2e


Ignore:
Timestamp:
Sep 25, 2018, 5:33:02 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
9ad5ee1
Parents:
461eed2 (diff), a32346b (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 plg2:software/cfa/cfa-cc

Files:
5 added
28 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r461eed2 r34a6b2e  
    3838libcfa/prelude/gcc-builtins.cf
    3939libcfa/prelude/gcc-builtins.c
    40 libcfa/prelude/prelude.cf
     40libcfa/prelude/prelude.cfa
    4141libcfa/x64-debug/
    4242libcfa/x64-nodebug/

  • Jenkinsfile

    r461eed2 r34a6b2e  
    128128                        //Run the tests from the tests directory
    129129                        if ( Settings.RunAllTests ) {
    130                                 sh 'make --no-print-directory -C tests all-tests debug=yes'
    131                                 sh 'make --no-print-directory -C tests all-tests debug=no '
     130                                sh 'make --no-print-directory -C tests timeouts="--timeout=600" all-tests debug=yes'
     131                                sh 'make --no-print-directory -C tests timeouts="--timeout=600" all-tests debug=no '
    132132                        }
    133133                        else {

  • benchmark/Makefile.am

    r461eed2 r34a6b2e  
    3333TIME_FORMAT = "%E"
    3434PRINT_FORMAT = %20s: #Comments needed for spacing
    35 
    36 LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
    3735
    3836.NOTPARALLEL:
    … …  
    111109
    112110## =========================================================================================================
    113 ctxswitch$(EXEEXT): \
     111CTXSWITCH_DEPEND  =                \
    114112        loop.run                                \
    115113        function.run                    \
    … …  
    121119        ctxswitch-upp_coroutine.run     \
    122120        ctxswitch-upp_thread.run        \
    123         -ctxswitch-kos_fibre.run        \
    124         -ctxswitch-kos_fibre2.run       \
    125121        ctxswitch-goroutine.run         \
    126122        ctxswitch-java_thread.run
    127123
     124if WITH_LIBFIBRE
     125CTXSWITCH_DEPEND  +=           \
     126        ctxswitch-kos_fibre.run  \
     127        ctxswitch-kos_fibre2.run
     128
     129
     130ctxswitch-kos_fibre$(EXEEXT):
     131        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     132
     133ctxswitch-kos_fibre2$(EXEEXT):
     134        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     135endif
     136
     137ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
     138
    128139ctxswitch-pthread$(EXEEXT):
    129140        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    … …  
    143154ctxswitch-upp_thread$(EXEEXT):
    144155        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    145 
    146 ctxswitch-kos_fibre$(EXEEXT):
    147         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    148 
    149 ctxswitch-kos_fibre2$(EXEEXT):
    150         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    151156
    152157ctxswitch-goroutine$(EXEEXT):

  • benchmark/Makefile.in

    r461eed2 r34a6b2e  
    9393host_triplet = @host@
    9494noinst_PROGRAMS =
     95@WITH_LIBFIBRE_TRUE@am__append_1 = \
     96@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre.run  \
     97@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre2.run
     98
    9599subdir = benchmark
    96100ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    273277TIME_FORMAT = "%E"
    274278PRINT_FORMAT = %20s: #Comments needed for spacing
     279CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
     280        ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
     281        ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
     282        ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
     283        ctxswitch-goroutine.run ctxswitch-java_thread.run \
     284        $(am__append_1)
    275285testdir = $(top_srcdir)/tests
    276286all: all-am
    … …  
    465475
    466476
    467 .cfa.o: $(CFACC) $(CFACPP)
     477.cfa.o:
    468478        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    469479        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    470480        $(am__mv) $$depbase.Tpo $$depbase.Po
    471 
    472 LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
    473481
    474482.NOTPARALLEL:
    … …  
    541549        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    542550
    543 ctxswitch$(EXEEXT): \
    544         loop.run                                \
    545         function.run                    \
    546         fetch_add.run                   \
    547         ctxswitch-pthread.run           \
    548         ctxswitch-cfa_coroutine.run     \
    549         ctxswitch-cfa_thread.run        \
    550         ctxswitch-cfa_thread2.run       \
    551         ctxswitch-upp_coroutine.run     \
    552         ctxswitch-upp_thread.run        \
    553         -ctxswitch-kos_fibre.run        \
    554         -ctxswitch-kos_fibre2.run       \
    555         ctxswitch-goroutine.run         \
    556         ctxswitch-java_thread.run
     551@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
     552@WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     553
     554@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
     555@WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     556
     557ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    557558
    558559ctxswitch-pthread$(EXEEXT):
    … …  
    573574ctxswitch-upp_thread$(EXEEXT):
    574575        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    575 
    576 ctxswitch-kos_fibre$(EXEEXT):
    577         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    578 
    579 ctxswitch-kos_fibre2$(EXEEXT):
    580         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    581576
    582577ctxswitch-goroutine$(EXEEXT):

  • configure

    r461eed2 r34a6b2e  
    630630GREP
    631631CPP
     632WITH_LIBFIBRE_FALSE
     633WITH_LIBFIBRE_TRUE
    632634RANLIB
    633635LEXLIB
    … …  
    54395441
    54405442# Checks for libraries.
     5443{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fibre::yield in -lfibre" >&5
     5444$as_echo_n "checking for Fibre::yield in -lfibre... " >&6; }
     5445if ${ac_cv_lib_fibre_Fibre__yield+:} false; then :
     5446  $as_echo_n "(cached) " >&6
     5447else
     5448  ac_check_lib_save_LIBS=$LIBS
     5449LIBS="-lfibre  $LIBS"
     5450cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     5451/* end confdefs.h.  */
     5452
     5453/* Override any GCC internal prototype to avoid an error.
     5454   Use char because int might match the return type of a GCC
     5455   builtin and then its argument prototype would still apply.  */
     5456#ifdef __cplusplus
     5457extern "C"
     5458#endif
     5459char Fibre::yield ();
     5460int
     5461main ()
     5462{
     5463return Fibre::yield ();
     5464  ;
     5465  return 0;
     5466}
     5467_ACEOF
     5468if ac_fn_c_try_link "$LINENO"; then :
     5469  ac_cv_lib_fibre_Fibre__yield=yes
     5470else
     5471  ac_cv_lib_fibre_Fibre__yield=no
     5472fi
     5473rm -f core conftest.err conftest.$ac_objext \
     5474    conftest$ac_exeext conftest.$ac_ext
     5475LIBS=$ac_check_lib_save_LIBS
     5476fi
     5477{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fibre_Fibre__yield" >&5
     5478$as_echo "$ac_cv_lib_fibre_Fibre__yield" >&6; }
     5479if test "x$ac_cv_lib_fibre_Fibre__yield" = xyes; then :
     5480  HAVE_LIBFIBRE=1
     5481else
     5482  HAVE_LIBFIBRE=0
     5483fi
     5484
     5485 if test "$HAVE_LIBFIBRE" -eq 1; then
     5486  WITH_LIBFIBRE_TRUE=
     5487  WITH_LIBFIBRE_FALSE='#'
     5488else
     5489  WITH_LIBFIBRE_TRUE='#'
     5490  WITH_LIBFIBRE_FALSE=
     5491fi
     5492
    54415493
    54425494# Checks for header files.
    … …  
    64786530if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
    64796531  as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
     6532Usually this means the macro was only invoked conditionally." "$LINENO" 5
     6533fi
     6534if test -z "${WITH_LIBFIBRE_TRUE}" && test -z "${WITH_LIBFIBRE_FALSE}"; then
     6535  as_fn_error $? "conditional \"WITH_LIBFIBRE\" was never defined.
    64806536Usually this means the macro was only invoked conditionally." "$LINENO" 5
    64816537fi

  • configure.ac

    r461eed2 r34a6b2e  
    204204
    205205# Checks for libraries.
     206AC_CHECK_LIB([fibre], [Fibre::yield], [HAVE_LIBFIBRE=1], [HAVE_LIBFIBRE=0])
     207AM_CONDITIONAL([WITH_LIBFIBRE], [test "$HAVE_LIBFIBRE" -eq 1])
    206208
    207209# Checks for header files.

  • doc/proposals/virtual.txt

    r461eed2 r34a6b2e  
    8787first polymorphic parameter).
    8888
    89 Once a function in a trait has been marked as virtual it defines a new
    90 function that takes in that trait's reference and then dynamically calls the
    91 underlying type implementation. Hence a trait reference becomes a kind of
    92 abstract type, cannot be directly instantiated but can still be used.
     89Instances of a trait are created by wrapping an existing instance of a type
     90that implements that trait. This wrapper includes all the function pointers
     91and other values required to preform the dynamic look-up. These are chosen by
     92the normal look-up rules at the point of abstraction.
    9393
    9494One of the limitations of this design is that it does not support double
    … …  
    9898is also restricted, initially forbidden, see extension.
    9999
     100Ownership of the underlying structure is also a bit of a trick. Considering
     101the use cases for trait object, it is probably best to have the underlying
     102object be heap allocated and owned by the trait object.
     103
    100104Extension: Multi-parameter Virtual Traits:
    101105
    … …  
    157161context, for instance if the cast occurs on the right hand side of an
    158162assignment.
     163
     164Function look-up follows the same rules as relaxed (behavioural) inheritance.
     165Traits can be upcast and down cast without losing information unless the
     166trait is cast down to a structure. Here there are two options.
     167
     168  Abstraction Time Binding: The more efficient and consistant with other parts
     169of CFA. Only the trait types use dynamic look-up, if converveted back into a
     170structure the normal static look-up rules find the function at compile time.
     171Casting down to a structure type can then result in the loss of a set of
     172bindings.
     173  Construction Time Binding: For more consistant handling of the virtual
     174structs, they are always considered wrapped. Functions are bound to the
     175instance the moment it is constructed and remain unchanged throughout its
     176lifetime, so down casting does not lose information.
     177
     178(We will have to decide between one of these two.)
    159179
    160180Extension: Multiple Parents
    … …  
    205225
    206226We have so far been silent on how the vtable is created, stored and accessed.
    207 
    208 Creation happens at compile time. Function pointers are found by using the
    209 same best match rules as elsewhere (additional rules for defaults from the
    210 parent may or may not be required). For strict virtual this must happen at the
    211 global scope and forbidding static functions, to ensure that a single unique
    212 vtable is created. Similarly, there may have to be stricter matching rules
    213 for the functions that go into the vtable, possibly requiring an exact match.
    214 Relaxed virtual could relax both restrictions, if we allow different vtable
    215 at different conversion (struct to trait reference) sites. If it is allowed
    216 local functions being bound to a vtable could cause issues when they go out
    217 of scope, however this should follow the lifetime rules most C programs
    218 already follow implicitly.
    219 
    220 Most vtables should be stored statically, the only exception being some of
    221 the relaxed vtables that could have local function pointers. These may be able
    222 to be stack allocated. All vtables should be immutable and require no manual
    223 cleanup.
     227The vtables for the two types might be handled slightly differently and then
     228there is also the hierarchy data for virtual casts.
     229
     230The hierarchy data is simple conceptually. A single (exactly one copy) pointer
     231for each type can act as the identity for it. The value of the pointer is
     232its parent type, with the root pointer being NULL. Additional meta-data
     233can accompany the parent pointer, such as a string name or the vtable fields.
     234
     235They types of each vtable can be constructed from the definitions of the
     236traits (or internal nodes). The stand alone/base vtable is the same for both
     237kinds of inheritance. It may be argumented differently however (include parent
     238/this pointer in hierachal inheritance).
     239
     240Creation of the actual vtable is tricky. For classical single implementation
     241semantics we would assemble the functions and create one vtable at compile
     242time. However, not only does this not give CFA-like behaviour, it is
     243impossible generally because types can satify assertions in different ways at
     244different times and stop satifying them. A special set of harder rules could
     245be used, instead we have decided to try creating multiple vtables for each
     246type. The different vtables will all implement the same type but not always
     247in the same way.
     248
     249Storage has some issues from creation. If the contents of every vtable could
     250be determained at compile time they could all be created and stored
     251statically. However since thunks can be constructed on the stack and become
     252the best match, that isn't always possible. Those will have to be stored in
     253dynamic memory. Which means that all vtables must be stored dynamically or
     254there must be a way to determain which ones to free when the trait object is
     255destroyed.
    224256
    225257Access has two main options:

  • doc/theses/aaron_moss_PhD/phd/.gitignore

    r461eed2 r34a6b2e  
    11templates/
     2code/a.out
    23thesis.pdf
    34thesis.aux

  • doc/theses/aaron_moss_PhD/phd/Makefile

    r461eed2 r34a6b2e  
    1717introduction \
    1818background \
     19generic-types \
    1920type-environment \
    2021resolution-heuristics \

  • doc/theses/aaron_moss_PhD/phd/cfa-macros.tex

    r461eed2 r34a6b2e  
    4343tabsize=5,                                                                                              % N space tabbing
    4444xleftmargin=\parindentlnth,                                                             % indent code to paragraph indentation
    45 %mathescape=true,                                                                               % LaTeX math escape in CFA code $...$
    4645escapechar=\$,                                                                                  % LaTeX escape in CFA code
    4746keepspaces=true,                                                                                %

  • doc/theses/aaron_moss_PhD/phd/frontpgs.tex

    r461eed2 r34a6b2e  
    160160% L I S T   O F   F I G U R E S
    161161% -----------------------------
    162 % \addcontentsline{toc}{chapter}{List of Figures}
    163 % \listoffigures
    164 % \cleardoublepage
    165 % \phantomsection               % allows hyperref to link to the correct page
     162\addcontentsline{toc}{chapter}{List of Figures}
     163\listoffigures
     164\cleardoublepage
     165\phantomsection         % allows hyperref to link to the correct page
    166166
    167167% GLOSSARIES (Lists of definitions, abbreviations, symbols, etc. provided by the glossaries-extra package)

  • doc/theses/aaron_moss_PhD/phd/generic-types.tex

    r461eed2 r34a6b2e  
    22\label{generic-chap}
    33
    4 Talk about generic types. Pull from Moss~\etal\cite{Moss18}.
     4A significant shortcoming in standard C is the lack of reusable type-safe abstractions for generic data structures and algorithms.
     5Broadly speaking, there are three approaches to implement abstract data structures in C.
     6One approach is to write bespoke data structures for each context in which they are needed.
     7While this approach is flexible and supports integration with the C type checker and tooling, it is also tedious and error prone, especially for more complex data structures.
     8A second approach is to use !void*!-based polymorphism, \eg{} the C standard library functions !bsearch! and !qsort!, which allow for the reuse of common functionality.
     9However, basing all polymorphism on !void*! eliminates the type checker's ability to ensure that argument types are properly matched, often requiring a number of extra function parameters, pointer indirection, and dynamic allocation that is otherwise not needed.
     10A third approach to generic code is to use preprocessor macros, which does allow the generated code to be both generic and type checked, but errors in such code may be difficult to locate and debug.
     11Furthermore, writing and using preprocessor macros is unnatural and inflexible.
     12Figure~\ref{bespoke-generic-fig} demonstrates the bespoke approach for a simple linked list with !insert! and !head! operations, while Figure~\ref{void-generic-fig} and Figure~\ref{macro-generic-fig} show the same example using !void*!- and !#define!-based polymorphism, respectively.
     13
     14\begin{figure}
     15        \begin{cfa}
     16                struct int_list { int value; struct int_list* next; };
     17
     18                void int_list_insert( struct int_list** ls, int x ) {
     19                        struct int_list* node = malloc(sizeof(struct int_list));
     20                        node->value = x; node->next = *ls;
     21                        *ls = node;
     22                }
     23
     24                int int_list_head( const struct int_list* ls ) { return ls->value; }
     25
     26                $\C[\textwidth]{// all code must be duplicated for every generic instantiation}$
     27
     28                struct string_list { const char* value; struct string_list* next; };
     29
     30                void string_list_insert( struct string_list** ls, const char* x ) {
     31                        struct string_list* node = malloc(sizeof(struct string_list));
     32                        node->value = x; node->next = *ls;
     33                        *ls = node;
     34                }
     35
     36                const char* string_list_head( const struct string_list* ls )
     37                        { return ls->value; }
     38
     39                $\C[\textwidth]{// use is efficient and idiomatic}$
     40
     41                int main() {
     42                        struct int_list* il = NULL;
     43                        int_list_insert( &il, 42 );
     44                        printf("%d\n", int_list_head(il));
     45                       
     46                        struct string_list* sl = NULL;
     47                        string_list_insert( &sl, "hello" );
     48                        printf("%s\n", string_list_head(sl));
     49                }
     50        \end{cfa}
     51
     52        \caption{Bespoke code for linked list implementation.} \label{bespoke-generic-fig}
     53\end{figure}
     54
     55\begin{figure}
     56        \begin{cfa}
     57                // single code implementation
     58
     59                struct list { void* value; struct list* next; };
     60
     61                $\C[\textwidth]{// internal memory management requires helper functions}$
     62
     63                void list_insert( struct list** ls, void* x, void* (*copy)(void*) ) {
     64                        struct list* node = malloc(sizeof(struct list));
     65                        node->value = copy(x); node->next = *ls;
     66                        *ls = node;
     67                }
     68
     69                void* list_head( const struct list* ls ) { return ls->value; }
     70
     71                $\C[\textwidth]{// helpers duplicated per type}$
     72
     73                void* int_copy(void* x) {
     74                        int* n = malloc(sizeof(int));
     75                        *n = *(int*)x;
     76                        return n;
     77                }
     78
     79                void* string_copy(void* x) { return strdup((const char*)x); }
     80
     81                int main() {
     82                        struct list* il = NULL;
     83                        int i = 42;
     84                        list_insert( &il, &i, int_copy );
     85                        printf("%d\n", *(int*)list_head(il));  $\C[2in]{// unsafe type cast}$
     86                       
     87                        struct list* sl = NULL;
     88                        list_insert( &sl, "hello", string_copy );
     89                        printf("%s\n", (char*)list_head(sl));  $\C[2in]{// unsafe type cast}$
     90                }
     91        \end{cfa}
     92
     93        \caption{\lstinline{void*}-polymorphic code for linked list implementation.} \label{void-generic-fig}
     94\end{figure}
     95
     96\begin{figure}
     97        \begin{cfa}
     98                $\C[\textwidth]{// code is nested in macros}$
     99
     100                #define list(N) N ## _list
     101
     102                #define list_insert(N) N ## _list_insert
     103
     104                #define list_head(N) N ## _list_head
     105
     106                #define define_list(N, T) $\C[0.25in]{ \textbackslash }$
     107                        struct list(N) { T value; struct list(N)* next; }; $\C[0.25in]{ \textbackslash }$
     108                        $\C[0.25in]{ \textbackslash }$
     109                        void list_insert(N)( struct list(N)** ls, T x ) { $\C[0.25in]{ \textbackslash }$
     110                                struct list(N)* node = malloc(sizeof(struct list(N))); $\C[0.25in]{ \textbackslash }$
     111                                node->value = x; node->next = *ls; $\C[0.25in]{ \textbackslash }$
     112                                *ls = node; $\C[0.25in]{ \textbackslash }$
     113                        } $\C[0.25in]{ \textbackslash }$
     114                        $\C[0.25in]{ \textbackslash }$
     115                        T list_head(N)( const struct list(N)* ls ) { return ls->value; }
     116
     117                define_list(int, int); $\C[3in]{// defines int\_list}$
     118                define_list(string, const char*); $\C[3in]{// defines string\_list}$
     119
     120                $\C[\textwidth]{// use is efficient, but syntactically idiosyncratic}$
     121
     122                int main() {
     123                        struct list(int)* il = NULL; $\C[3in]{// does not match compiler-visible name}$
     124                        list_insert(int)( &il, 42 );
     125                        printf("%d\n", list_head(int)(il));
     126                       
     127                        struct list(string)* sl = NULL;
     128                        list_insert(string)( &sl, "hello" );
     129                        printf("%s\n", list_head(string)(sl));
     130                }
     131        \end{cfa}
     132
     133        \caption{Macros for generic linked list implementation.} \label{macro-generic-fig}
     134\end{figure}
     135
     136\CC{}, Java, and other languages use \emph{generic types} to produce type-safe abstract data types.
     137Design and implementation of generic types for \CFA{} is the first major contribution of this thesis, a summary of which is published in \cite{Moss18}.
     138\CFA{} generic types integrate efficiently and naturally with the existing polymorphic functions in \CFA{}, while retaining backward compatibility with C in layout and support for separate compilation.
     139A generic type can be declared in \CFA{} by placing a !forall! specifier on a !struct! or !union! declaration, and instantiated using a parenthesized list of types after the generic name.
     140An example comparable to the C polymorphism examples in Figures~\ref{bespoke-generic-fig}, \ref{void-generic-fig}, and \ref{macro-generic-fig} can be seen in Figure~\ref{cfa-generic-fig} \TODO{test this code}.
     141
     142\begin{figure}
     143        \begin{cfa}
     144                forall(otype T) struct list { T value; list(T)* next; };
     145
     146                $\C[\textwidth]{// single polymorphic implementation of each function}$
     147                $\C[\textwidth]{// overloading reduces need for namespace prefixes}$
     148
     149                forall(otype T) void insert( list(T)** ls, T x ) {
     150                        list(T)* node = alloc();  $\C{// type-inferring alloc}$
     151                        (*node){ x, *ls };  $\C{// concise constructor syntax}$
     152                        *ls = node;
     153                }
     154
     155                forall(otype T) T head( const list(T)* ls ) { return ls->value; }
     156
     157                $\C[\textwidth]{// use is clear and efficient}$
     158
     159                int main() {
     160                        list(int)* il = 0;
     161                        insert( &il, 42 );  $\C{// inferred polymorphic T}$
     162                        printf("%d\n", head(il));
     163                       
     164                        list(const char*)* sl = 0;
     165                        insert( &sl, "hello" );
     166                        printf("%s\n", head(sl));
     167                }
     168        \end{cfa}
     169
     170        \caption{\CFA{} generic linked list implementation.} \label{cfa-generic-fig}
     171\end{figure}
     172
     173\section{Design}
     174
     175Though a number of languages have some implementation of generic types, backward compatibility with both C and existing \CFA{} polymorphism presented some unique design constraints for this project.
     176The guiding principle was to maintain an unsurprising language model for C programmers without compromising runtime efficiency.
     177A key insight for this design was that C already possesses a handful of built-in generic types (\emph{compound types} in the language of the standard\cit{}), notably pointer (!T*!) and array (!T[]!), and that user-definable generics should act similarly.
     178
     179\subsection{Related Work}
     180
     181One approach to the design of generic types is that taken by \CC{} templates\cit{}.
     182The template approach is closely related to the macro-expansion approach to C polymorphism demonstrated in Figure~\ref{macro-generic-fig}, but where the macro-expansion syntax has been given first-class language support.
     183Template expansion has the benefit of generating code with near-optimal runtime efficiency, as distinct optimizations can be applied for each instantiation of the template.
     184On the other hand, template expansion can also lead to significant code bloat, exponential in the worst case\cit{}, and the costs of increased instruction cache pressure at runtime and wasted developer time when compiling cannot be discounted.
     185The most significant restriction of the \CC{} template model is that it breaks separate compilation and C's translation-unit-based encapsulation mechanisms.
     186Because a \CC{} template is not actually code, but rather a sort of ``recipe'' to generate code, template code must be visible at its call site to be used.
     187C code, by contrast, only needs a !struct! or function declaration to call that function or use (by-pointer) values of that type, a desirable property to maintain for \CFA{}.
     188
     189Java\cit{} has another prominent implementation for generic types, based on a significantly different approach than \CC{}.
     190The Java approach has much more in common with the !void*!-polymorphism shown in Figure~\ref{void-generic-fig}; since in Java nearly all data is stored by reference, the Java approach to polymorphic data is to store pointers to arbitrary data and insert type-checked implicit casts at compile-time.
     191This process of \emph{type erasure} has the benefit of allowing a single instantiation of polymorphic code, but relies heavily on Java's object model and garbage collector.
     192To use this model, a more C-like language such as \CFA{} would be required to dynamically allocate internal storage for variables, track their lifetime, and properly clean them up afterward.
     193
     194\TODO{Talk about Go, maybe Rust, Swift, etc. as well; specifically mention ``fat pointer'' polymorphism}
     195
     196\TODO{Talk about Cyclone as well, and why my generics are more powerful}
     197
     198\subsection{\CFA{} Generics}
     199
     200The generic types design in \CFA{} draws inspiration from both \CC{} and Java generics, capturing the better aspects of each.
     201Like \CC{} template types, generic !struct!s and !union!s in \CFA{} have macro-expanded storage layouts, but, like Java generics, \CFA{} generic types can be used with separately-compiled polymorphic functions without requiring either the type or function definition to be visible to the other.
     202The fact that the storage layout of any instantiation of a \CFA{} generic type is identical to that of the monomorphic type produced by simple macro replacement of the generic type parameters is important to provide consistent and predictable runtime performance, and to not impose any undue abstraction penalty on generic code.
     203As an example, consider the following generic type and function \TODO{test this}:
     204
     205\begin{cfa}
     206forall( otype R, otype S ) struct pair { R first; S second; };
     207
     208pair(const char*, int) with_len( const char* s ) {
     209        return (pair(const char*), int){ s, strlen(s) };
     210}
     211\end{cfa}
     212
     213In this example, !with_len! is defined at the same scope as !pair!, but it could be called from any context that can see the definition of !pair! and a declaration of !with_len!.
     214If its return type was !pair(const char*, int)*!, callers of !with_len! would only need the declaration !forall(otype R, otype S) struct pair;! to call it, in accordance with the usual C rules for opaque types.
     215
     216!with_len! is itself a monomorphic function, returning a type that is structurally identical to !struct { const char* first; int second; }!, and as such could be called from C given an appropriate redeclaration and demangling flags.
     217However, the definition of !with_len! depends on a polymorphic function call to the !pair! constructor, which only needs to be written once (in this case, implicitly by the compiler according to the usual \CFA{} constructor generation\cite{Moss18}) and can be re-used for a wide variety of !pair! instantiations.
     218Since the parameters to this polymorphic constructor call are all statically known, compiler inlining can eliminate any runtime overhead of this polymorphic call.
     219
     220\CFA{} deliberately does not support \CC{}-style partial specializations of generic types.
     221A particularly infamous example in the \CC{} standard library is !vector<bool>!, which is represented as a bitstring rather than the array representation of the other !vector! instantiations.
     222Complications from this inconsistency (chiefly the fact that a single bit is not addressable, unlike an array element) make the \CC{} !vector! unpleasant to use in generic contexts due to the break in its public interface.
     223Rather than attempting to plug leaks in the template specialization abstraction with a detailed method interface, \CFA{} takes the more principled position that two types with an unrelated data layout are in fact unrelated types, and should be handled with different code.
     224Of course, to the degree that distinct types are similar enough to share an interface, the \CFA{} !trait! system allows one to be defined, and objects of types implementing that !trait! to be operated on in the same polymorphic functions.
     225
     226Since \CFA{} polymorphic functions can operate over polymorphic generic types, functions over such types can be partially or completely specialized using the usual overload selection rules.
     227As an example, the !with_len! function above could be an optimization of the following more general function:
     228
     229\begin{cfa}
     230forall(otype T, otype I | { I len(T); })
     231pair(T, I) with_len( T s ) {
     232        return (pair(T,I)){ s, len(s) };
     233}
     234\end{cfa}
     235
     236\section{Implementation}
     237
     238% forall constraints on struct/union constrain default constructor (TODO check with Rob)
    5239
    6240% TODO discuss layout function algorithm, application to separate compilation
    7 % TODO put a static const field in for _n_fields for each generic, describe utility for separate compilation
    8 
    9 % TODO mention impetus for zero_t design
    10 
    11 % TODO mention use in tuple-type implementation
     241% TODO put a static const field in for _n_fields for each generic, describe utility for separate compilation (actually no, you need to be able to see the type for it to be sized)
     242
     243% mention that tuples are implemented on top of a per-arity generic type
     244
     245\section{Performance Experiments}
    12246
    13247% TODO pull benchmarks from Moss et al.
     248
     249\section{Future Work}
     250
     251% mention future work adding non-type generic parameters, like ints
     252
     253% taking advantage of generic layout functions to provide field assertions in forall qualifiers
     254
     255% mention packed generic layouts (significantly more complex layout function, but possible)

  • driver/cfa.cc

    r461eed2 r34a6b2e  
    357357
    358358        string arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
    359         if ( ! m32 && ! m64 && arch == "x86" ) {                        // no override and 32-bit architecture
    360                 args[nargs] = "-m32";
    361                 nargs += 1;
     359        if ( ! m32 && ! m64 ) {
     360                if ( arch == "x86" ) {
     361                        args[nargs] = "-m32";
     362                        nargs += 1;
     363                } else if ( arch == "x64" ) {
     364                        args[nargs] = "-m64";
     365                        nargs += 1;
     366                }  // if
    362367        } // if
    363368        const char * config = debug ? "debug": "nodebug";

  • libcfa/Makefile.in

    r461eed2 r34a6b2e  
    229229CFLAGS = @CFLAGS@
    230230CONFIGURATION = @CONFIGURATION@
     231CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    231232CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    232233CONFIG_CFLAGS = @CONFIG_CFLAGS@

  • libcfa/configure

    r461eed2 r34a6b2e  
    623623CFA_PREFIX
    624624CFA_NAME
     625BUILDLIB_FALSE
     626BUILDLIB_TRUE
     627CONFIG_BUILDLIB
    625628CONFIG_CFAFLAGS
    626629CONFIG_CFLAGS
    … …  
    25312534                CONFIG_CFLAGS="-O0 -g"
    25322535                CONFIG_CFAFLAGS="-debug"
     2536                CONFIG_BUILDLIB="yes"
    25332537        ;;
    25342538        "nodebug" )
    25352539                CONFIG_CFLAGS="-O2 -s"
    25362540                CONFIG_CFAFLAGS="-nodebug"
     2541                CONFIG_BUILDLIB="yes"
    25372542        ;;
    25382543        "nolib"   )
    2539                 CONFIG_CFLAGS=""
    2540                 CONFIG_CFAFLAGS=""
     2544                CONFIG_CFLAGS="-O2 -s"
     2545                CONFIG_CFAFLAGS="-nodebug"
     2546                CONFIG_BUILDLIB="no"
    25412547        ;;
    25422548esac
    25432549
    25442550
     2551
     2552
     2553
     2554 if test "x${CONFIG_BUILDLIB}" = "xyes"; then
     2555  BUILDLIB_TRUE=
     2556  BUILDLIB_FALSE='#'
     2557else
     2558  BUILDLIB_TRUE='#'
     2559  BUILDLIB_FALSE=
     2560fi
    25452561
    25462562
    … …  
    44784494fi
    44794495
     4496if test -z "${BUILDLIB_TRUE}" && test -z "${BUILDLIB_FALSE}"; then
     4497  as_fn_error $? "conditional \"BUILDLIB\" was never defined.
     4498Usually this means the macro was only invoked conditionally." "$LINENO" 5
     4499fi
    44804500if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    44814501  as_fn_error $? "conditional \"AMDEP\" was never defined.

  • libcfa/configure.ac

    r461eed2 r34a6b2e  
    4141                CONFIG_CFLAGS="-O0 -g"
    4242                CONFIG_CFAFLAGS="-debug"
     43                CONFIG_BUILDLIB="yes"
    4344        ;;
    4445        "nodebug" )
    4546                CONFIG_CFLAGS="-O2 -s"
    4647                CONFIG_CFAFLAGS="-nodebug"
     48                CONFIG_BUILDLIB="yes"
    4749        ;;
    4850        "nolib"   )
    49                 CONFIG_CFLAGS=""
    50                 CONFIG_CFAFLAGS=""
     51                CONFIG_CFLAGS="-O2 -s"
     52                CONFIG_CFAFLAGS="-nodebug"
     53                CONFIG_BUILDLIB="no"
    5154        ;;
    5255esac
    … …  
    5457AC_SUBST(CONFIG_CFLAGS)
    5558AC_SUBST(CONFIG_CFAFLAGS)
     59AC_SUBST(CONFIG_BUILDLIB)
     60
     61AM_CONDITIONAL([BUILDLIB], [test "x${CONFIG_BUILDLIB}" = "xyes"])
    5662
    5763#==============================================================================

  • libcfa/prelude/Makefile.am

    r461eed2 r34a6b2e  
    2020# put into lib for now
    2121cfalibdir = ${CFA_LIBDIR}
    22 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    23 noinst_DATA = ../src/prelude.c
     22cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    2423
    2524CC = @CFACC@
    … …  
    4443        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    4544
    46 prelude.cf : prelude-gen.cc
     45prelude.cfa : prelude-gen.cc
    4746        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    4847        @./prelude-gen > $@
    … …  
    6059include $(DEPDIR)/builtins.Po
    6160
    62 ../src/prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    63         ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    64 
    65 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     61bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    6662        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6763
    … …  
    6965        rm -rf $(DEPDIR)
    7066
    71 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     67MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    7268MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}

  • libcfa/prelude/Makefile.in

    r461eed2 r34a6b2e  
    147147  }
    148148am__installdirs = "$(DESTDIR)$(cfalibdir)"
    149 DATA = $(cfalib_DATA) $(noinst_DATA)
     149DATA = $(cfalib_DATA)
    150150am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    151151am__DIST_COMMON = $(srcdir)/Makefile.in
    … …  
    174174CFLAGS = @CFLAGS@
    175175CONFIGURATION = @CONFIGURATION@
     176CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    176177CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    177178CONFIG_CFLAGS = @CONFIG_CFLAGS@
    … …  
    263264# put into lib for now
    264265cfalibdir = ${CFA_LIBDIR}
    265 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    266 noinst_DATA = ../src/prelude.c
     266cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    267267AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    268268AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    269 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     269MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    270270MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    271271all: all-am
    … …  
    499499        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    500500
    501 prelude.cf : prelude-gen.cc
     501prelude.cfa : prelude-gen.cc
    502502        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    503503        @./prelude-gen > $@
    … …  
    515515include $(DEPDIR)/builtins.Po
    516516
    517 ../src/prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    518         ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    519 
    520 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     517bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    521518        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    522519

  • libcfa/prelude/prelude-gen.cc

    r461eed2 r34a6b2e  
    142142
    143143int main() {
    144         cout << "# 2 \"prelude.cf\"  // needed for error messages from this file" << endl;
     144        cout << "# 2 \"prelude.cfa\"  // needed for error messages from this file" << endl;
    145145        cout << "trait sized(dtype T) {};" << endl;
    146146

  • libcfa/src/Makefile.am

    r461eed2 r34a6b2e  
    1616
    1717# create object files in directory with source files
    18 AUTOMAKE_OPTIONS = subdir-objects
     18AUTOMAKE_OPTIONS = foreign subdir-objects
    1919ARFLAGS = cr
    2020
    … …  
    2424lib_LIBRARIES =  libcfa.a
    2525
     26VPATH += :../prelude
     27
    2628# AM_CFLAGS for all cfa source
    2729# AM_CFAFLAGS for only cfa source
    2830# use -no-include-stdhdr to prevent rebuild cycles
    2931# The built sources must not depend on the installed headers
    30 AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     32AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    3133AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    3234AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    … …  
    3436
    3537#----------------------------------------------------------------------------------------------------------------
     38if BUILDLIB
    3639headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    3740          containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
     41
     42headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
    3843
    3944# not all platforms support concurrency, add option do disable it
    4045headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
    4146
    42 libobjs = ${headers:.hfa=.o}
    43 libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
    44         ${headers:.hfa=.cfa}
     47headers_nosrc += concurrency/invoke.h
     48
     49libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
    4550
    4651# not all platforms support concurrency, add option do disable it
    4752libsrc += concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
     53else
     54headers =
     55headers_nosrc =
     56libsrc =
     57endif
     58
    4859
    4960#----------------------------------------------------------------------------------------------------------------
    5061# add dependency to cfa-cpp so all libraries are rebuilt with new translator
    51 ${libobjs} : ${cfalib_DATA}
     62#@CFACC@ @CFACPP@ prelude.cfa
    5263
    53 libcfa_a_SOURCES = ${libsrc}
     64# add dependency of cfa files
     65libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
     66$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     67
     68
     69# .deps inclusion is not done automatically by automake for new languages
     70libdeps = $(join \
     71        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
     72        $(notdir ${libobjs:.o=.Po}) \
     73)
     74
     75-include $(libdeps)
     76
     77prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     78        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
     79
     80
     81
     82#----------------------------------------------------------------------------------------------------------------
     83libcfa_a_SOURCES = prelude.cfa ${libsrc}
    5484
    5585stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
    5686
    5787cfa_includedir = $(CFA_INCDIR)
    58 nobase_cfa_include_HEADERS = \
    59         ${headers}             \
    60         ${stdhdr}              \
    61         math.hfa               \
    62         gmp.hfa                \
    63         time_t.hfa             \
    64         bits/align.hfa         \
    65         bits/containers.hfa    \
    66         bits/defs.hfa          \
    67         bits/debug.hfa         \
    68         bits/locks.hfa         \
    69         concurrency/invoke.h
    70 
    71 MOSTLYCLEANFILES = prelude.c
     88nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
    7289
    7390#----------------------------------------------------------------------------------------------------------------
    7491maintainer-clean-local:
    7592        -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
     93
     94
     95# $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     96#       $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     97#       $(am__mv) $$depbase.Tpo $$depbase.Po

  • libcfa/src/Makefile.in

    r461eed2 r34a6b2e  
    1919
    2020
    21 VPATH = @srcdir@
    2221am__is_gnu_make = { \
    2322  if test -z '$(MAKELEVEL)'; then \
    … …  
    9796am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    9897        $(ACLOCAL_M4)
    99 DIST_COMMON = $(srcdir)/Makefile.am $(nobase_cfa_include_HEADERS) \
    100         $(am__DIST_COMMON)
     98DIST_COMMON = $(srcdir)/Makefile.am \
     99        $(am__nobase_cfa_include_HEADERS_DIST) $(am__DIST_COMMON)
    101100mkinstalldirs = $(install_sh) -d
    102101CONFIG_CLEAN_FILES =
    … …  
    138137libcfa_a_AR = $(AR) $(ARFLAGS)
    139138libcfa_a_LIBADD =
     139am__libcfa_a_SOURCES_DIST = prelude.cfa startup.cfa interpose.cfa \
     140        bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
     141        fstream.cfa iostream.cfa iterator.cfa limits.cfa rational.cfa \
     142        time.cfa stdlib.cfa common.cfa containers/maybe.cfa \
     143        containers/pair.cfa containers/result.cfa \
     144        containers/vector.cfa concurrency/coroutine.cfa \
     145        concurrency/thread.cfa concurrency/kernel.cfa \
     146        concurrency/monitor.cfa concurrency/mutex.cfa \
     147        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
     148        concurrency/invoke.c concurrency/preemption.cfa
    140149am__dirstamp = $(am__leading_dot)dirstamp
    141 am__objects_1 = fstream.$(OBJEXT) iostream.$(OBJEXT) \
    142         iterator.$(OBJEXT) limits.$(OBJEXT) rational.$(OBJEXT) \
    143         time.$(OBJEXT) stdlib.$(OBJEXT) common.$(OBJEXT) \
    144         containers/maybe.$(OBJEXT) containers/pair.$(OBJEXT) \
    145         containers/result.$(OBJEXT) containers/vector.$(OBJEXT) \
    146         concurrency/coroutine.$(OBJEXT) concurrency/thread.$(OBJEXT) \
    147         concurrency/kernel.$(OBJEXT) concurrency/monitor.$(OBJEXT) \
    148         concurrency/mutex.$(OBJEXT)
    149 am__objects_2 = prelude.$(OBJEXT) startup.$(OBJEXT) \
    150         interpose.$(OBJEXT) bits/debug.$(OBJEXT) assert.$(OBJEXT) \
    151         exception.$(OBJEXT) virtual.$(OBJEXT) heap.$(OBJEXT) \
    152         $(am__objects_1) \
    153         concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \
    154         concurrency/alarm.$(OBJEXT) concurrency/invoke.$(OBJEXT) \
    155         concurrency/preemption.$(OBJEXT)
    156 am_libcfa_a_OBJECTS = $(am__objects_2)
     150@BUILDLIB_TRUE@am__objects_1 = fstream.$(OBJEXT) iostream.$(OBJEXT) \
     151@BUILDLIB_TRUE@ iterator.$(OBJEXT) limits.$(OBJEXT) \
     152@BUILDLIB_TRUE@ rational.$(OBJEXT) time.$(OBJEXT) \
     153@BUILDLIB_TRUE@ stdlib.$(OBJEXT) common.$(OBJEXT) \
     154@BUILDLIB_TRUE@ containers/maybe.$(OBJEXT) \
     155@BUILDLIB_TRUE@ containers/pair.$(OBJEXT) \
     156@BUILDLIB_TRUE@ containers/result.$(OBJEXT) \
     157@BUILDLIB_TRUE@ containers/vector.$(OBJEXT) \
     158@BUILDLIB_TRUE@ concurrency/coroutine.$(OBJEXT) \
     159@BUILDLIB_TRUE@ concurrency/thread.$(OBJEXT) \
     160@BUILDLIB_TRUE@ concurrency/kernel.$(OBJEXT) \
     161@BUILDLIB_TRUE@ concurrency/monitor.$(OBJEXT) \
     162@BUILDLIB_TRUE@ concurrency/mutex.$(OBJEXT)
     163@BUILDLIB_TRUE@am__objects_2 = startup.$(OBJEXT) interpose.$(OBJEXT) \
     164@BUILDLIB_TRUE@ bits/debug.$(OBJEXT) assert.$(OBJEXT) \
     165@BUILDLIB_TRUE@ exception.$(OBJEXT) virtual.$(OBJEXT) \
     166@BUILDLIB_TRUE@ heap.$(OBJEXT) $(am__objects_1) \
     167@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \
     168@BUILDLIB_TRUE@ concurrency/alarm.$(OBJEXT) \
     169@BUILDLIB_TRUE@ concurrency/invoke.$(OBJEXT) \
     170@BUILDLIB_TRUE@ concurrency/preemption.$(OBJEXT)
     171am_libcfa_a_OBJECTS = prelude.$(OBJEXT) $(am__objects_2)
    157172libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    158173AM_V_P = $(am__v_P_@AM_V@)
    … …  
    191206am__v_CCLD_1 =
    192207SOURCES = $(libcfa_a_SOURCES)
    193 DIST_SOURCES = $(libcfa_a_SOURCES)
     208DIST_SOURCES = $(am__libcfa_a_SOURCES_DIST)
    194209am__can_run_installinfo = \
    195210  case $$AM_UPDATE_INFO_DIR in \
    … …  
    197212    *) (install-info --version) >/dev/null 2>&1;; \
    198213  esac
     214am__nobase_cfa_include_HEADERS_DIST = ${shell find ${srcdir}/stdhdr \
     215        -type f -printf "%p "} fstream.hfa iostream.hfa iterator.hfa \
     216        limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
     217        containers/maybe.hfa containers/pair.hfa containers/result.hfa \
     218        containers/vector.hfa concurrency/coroutine.hfa \
     219        concurrency/thread.hfa concurrency/kernel.hfa \
     220        concurrency/monitor.hfa concurrency/mutex.hfa math.hfa gmp.hfa \
     221        time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa \
     222        bits/debug.hfa bits/locks.hfa concurrency/invoke.h
    199223HEADERS = $(nobase_cfa_include_HEADERS)
    200224am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    … …  
    220244        $(top_srcdir)/./automake/depcomp
    221245DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
     246VPATH = @srcdir@ :../prelude
    222247ACLOCAL = @ACLOCAL@
    223248AMTAR = @AMTAR@
    … …  
    243268CFLAGS = @CFLAGS@
    244269CONFIGURATION = @CONFIGURATION@
     270CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    245271CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    246272CONFIG_CFLAGS = @CONFIG_CFLAGS@
    … …  
    328354
    329355# create object files in directory with source files
    330 AUTOMAKE_OPTIONS = subdir-objects
     356AUTOMAKE_OPTIONS = foreign subdir-objects
    331357ARFLAGS = cr
    332358CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
    … …  
    341367# use -no-include-stdhdr to prevent rebuild cycles
    342368# The built sources must not depend on the installed headers
    343 AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     369AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    344370AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    345371AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
     372@BUILDLIB_FALSE@headers =
    346373
    347374#----------------------------------------------------------------------------------------------------------------
    348375
    349376# not all platforms support concurrency, add option do disable it
    350 headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa \
    351         rational.hfa time.hfa stdlib.hfa common.hfa \
    352         containers/maybe.hfa containers/pair.hfa containers/result.hfa \
    353         containers/vector.hfa concurrency/coroutine.hfa \
    354         concurrency/thread.hfa concurrency/kernel.hfa \
    355         concurrency/monitor.hfa concurrency/mutex.hfa
    356 libobjs = ${headers:.hfa=.o}
     377@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa \
     378@BUILDLIB_TRUE@ limits.hfa rational.hfa time.hfa stdlib.hfa \
     379@BUILDLIB_TRUE@ common.hfa containers/maybe.hfa \
     380@BUILDLIB_TRUE@ containers/pair.hfa containers/result.hfa \
     381@BUILDLIB_TRUE@ containers/vector.hfa concurrency/coroutine.hfa \
     382@BUILDLIB_TRUE@ concurrency/thread.hfa concurrency/kernel.hfa \
     383@BUILDLIB_TRUE@ concurrency/monitor.hfa concurrency/mutex.hfa
     384@BUILDLIB_FALSE@headers_nosrc =
     385@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa \
     386@BUILDLIB_TRUE@ bits/align.hfa bits/containers.hfa \
     387@BUILDLIB_TRUE@ bits/defs.hfa bits/debug.hfa bits/locks.hfa \
     388@BUILDLIB_TRUE@ concurrency/invoke.h
     389@BUILDLIB_FALSE@libsrc =
    357390
    358391# not all platforms support concurrency, add option do disable it
    359 libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
    360         exception.c virtual.c heap.cfa ${headers:.hfa=.cfa} \
    361         concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
    362         concurrency/invoke.c concurrency/preemption.cfa
    363 libcfa_a_SOURCES = ${libsrc}
     392@BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa \
     393@BUILDLIB_TRUE@ assert.cfa exception.c virtual.c heap.cfa \
     394@BUILDLIB_TRUE@ ${headers:.hfa=.cfa} \
     395@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.S \
     396@BUILDLIB_TRUE@ concurrency/alarm.cfa concurrency/invoke.c \
     397@BUILDLIB_TRUE@ concurrency/preemption.cfa
     398
     399#----------------------------------------------------------------------------------------------------------------
     400# add dependency to cfa-cpp so all libraries are rebuilt with new translator
     401#@CFACC@ @CFACPP@ prelude.cfa
     402
     403# add dependency of cfa files
     404libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
     405
     406# .deps inclusion is not done automatically by automake for new languages
     407libdeps = $(join \
     408        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
     409        $(notdir ${libobjs:.o=.Po}) \
     410)
     411
     412
     413#----------------------------------------------------------------------------------------------------------------
     414libcfa_a_SOURCES = prelude.cfa ${libsrc}
    364415stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
    365416cfa_includedir = $(CFA_INCDIR)
    366 nobase_cfa_include_HEADERS = \
    367         ${headers}             \
    368         ${stdhdr}              \
    369         math.hfa               \
    370         gmp.hfa                \
    371         time_t.hfa             \
    372         bits/align.hfa         \
    373         bits/containers.hfa    \
    374         bits/defs.hfa          \
    375         bits/debug.hfa         \
    376         bits/locks.hfa         \
    377         concurrency/invoke.h
    378 
    379 MOSTLYCLEANFILES = prelude.c
     417nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
    380418all: all-am
    381419
    … …  
    506544
    507545@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Po@am__quote@
    508 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prelude.Po@am__quote@
    509546@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Po@am__quote@
    510547@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@ARCHITECTURE@.Po@am__quote@
    … …  
    676713        fi
    677714mostlyclean-generic:
    678         -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
    679715
    680716clean-generic:
    … …  
    784820
    785821
    786 .cfa.o: $(CFACC) $(CFACPP)
     822.cfa.o:
    787823        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    788824        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    789825        $(am__mv) $$depbase.Tpo $$depbase.Po
    790 
    791 #----------------------------------------------------------------------------------------------------------------
    792 # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    793 ${libobjs} : ${cfalib_DATA}
     826$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     827
     828-include $(libdeps)
     829
     830prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     831        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    794832
    795833#----------------------------------------------------------------------------------------------------------------
    … …  
    797835        -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
    798836
     837# $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     838#       $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     839#       $(am__mv) $$depbase.Tpo $$depbase.Po
     840
    799841# Tell versions [3.59,3.63) of GNU make to not export all variables.
    800842# Otherwise a system limit (for SysV at least) may be exceeded.

  • src/Makefile.am

    r461eed2 r34a6b2e  
    5050AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
    5151AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
     52ARFLAGS     = cr
    5253
    5354demangler_SOURCES = SymTab/demangler.cc

  • src/Makefile.in

    r461eed2 r34a6b2e  
    152152LIBRARIES = $(noinst_LIBRARIES)
    153153AR = ar
    154 ARFLAGS = cru
    155154AM_V_AR = $(am__v_AR_@AM_V@)
    156155am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
    … …  
    582581AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
    583582AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
     583ARFLAGS = cr
    584584demangler_SOURCES = SymTab/demangler.cc
    585585demangler_LDADD = libdemangle.a     # yywrap

  • src/SymTab/Demangle.cc

    r461eed2 r34a6b2e  
    392392                                parsers.emplace_back(Encoding::enum_t, [this](Type::Qualifiers tq) { return parseEnum(tq); });
    393393                                parsers.emplace_back(Encoding::type, [this](Type::Qualifiers tq) { return parseType(tq); });
    394                                 parsers.emplace_back(Encoding::zero, [this](Type::Qualifiers tq) { return new ZeroType(tq); });
    395                                 parsers.emplace_back(Encoding::one, [this](Type::Qualifiers tq) { return new OneType(tq); });
     394                                parsers.emplace_back(Encoding::zero, [](Type::Qualifiers tq) { return new ZeroType(tq); });
     395                                parsers.emplace_back(Encoding::one, [](Type::Qualifiers tq) { return new OneType(tq); });
    396396                        }
    397397

  • src/cfa.make

    r461eed2 r34a6b2e  
    66am__v_CFA_1 =
    77
    8 .cfa.o: $(CFACC) $(CFACPP)
     8.cfa.o:
    99        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    1010        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\

  • src/main.cc

    r461eed2 r34a6b2e  
    172172                        if ( filename == nullptr ) filename = argv[ optind ];
    173173                        // prelude filename comes in differently
    174                         if ( libcfap ) filename = "prelude.cf";
     174                        if ( libcfap ) filename = "prelude.cfa";
    175175                        optind += 1;
    176176                } else {                                                                                // no input file name
    … …  
    199199                        if ( ! libcfap ) {
    200200                                // read the prelude in, if not generating the cfa library
    201                                 FILE * prelude = fopen( (PreludeDirector + "/prelude.cf").c_str(), "r" );
    202                                 assertf( prelude, "cannot open prelude.cf\n" );
     201                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cfa").c_str(), "r" );
     202                                assertf( prelude, "cannot open prelude.cfa\n" );
    203203                                parse( prelude, LinkageSpec::Intrinsic );
    204204

  • tests/Makefile.am

    r461eed2 r34a6b2e  
    2323
    2424concurrent=
     25timeouts=
    2526
    2627TEST_PY = python ${builddir}/test.py
    … …  
    5051#----------------------------------------------------------------------------------------------------------------
    5152all-local :
    52         @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
     53        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
    5354
    5455all-tests :
    55         @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
     56        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
    5657
    5758clean-local :

  • tests/Makefile.in

    r461eed2 r34a6b2e  
    301301quick_test = avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
    302302concurrent =
     303timeouts =
    303304TEST_PY = python ${builddir}/test.py
    304305
    … …  
    616617#----------------------------------------------------------------------------------------------------------------
    617618all-local :
    618         @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
     619        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
    619620
    620621all-tests :
    621         @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
     622        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
    622623
    623624clean-local :
Note: See TracChangeset for help on using the changeset viewer.