Diff [3d4b23fa9ef416e3543e652102009137f340d4e5:55a68c3dc9290e2bb34da101039e435d02bc9dea] for / – Cforall

doc/LaTeXmacros/common.tex

-              r3d4b23fa
+              r55a68c3
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Thu Jul 13 11:44:59 2017
 %% Update Count     : 335
+%% Last Modified On : Sun Jun 18 20:32:32 2017
+%% Update Count     : 319
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 % Names used in the document.
 \newcommand{\CFAIcon}{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name
+\newcommand{\CFAIcon}{\textrm{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name
 \newcommand{\CFA}{\protect\CFAIcon} % safe for section/caption
 \newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall symbolic name
 …
 \setlength{\parindentlnth}{\parindent}
-\newcommand{\LstKeywordStyle}[1]{{\lst@basicstyle{\lst@keywordstyle{#1}}}}
-\newcommand{\LstCommentStyle}[1]{{\lst@basicstyle{\lst@commentstyle{#1}}}}
 \newlength{\gcolumnposn}                                % temporary hack because lstlisting does not handle tabs correctly
 \newlength{\columnposn}
 \setlength{\gcolumnposn}{2.5in}
 \setlength{\columnposn}{\gcolumnposn}
 \newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@basicstyle{\LstCommentStyle{#2}}}}
+\newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@commentstyle{#2}}}
 \newcommand{\CRT}{\global\columnposn=\gcolumnposn}
 …
 basicstyle=\linespread{0.9}\sf,                                                 % reduce line spacing and use sanserif font
 stringstyle=\tt,                                                                                % use typewriter font
 tabsize=6,                                                                                              % N space tabbing
+tabsize=4,                                                                                              % 4 space tabbing
 xleftmargin=\parindentlnth,                                                             % indent code to paragraph indentation
 extendedchars=true,                                                                             % allow ASCII characters in the range 128-255

doc/LaTeXmacros/lstlang.sty

-              r3d4b23fa
+              r55a68c3
 %% Created On       : Sat May 13 16:34:42 2017
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Wed Jul 12 22:42:09 2017
 %% Update Count     : 12
+%% Last Modified On : Thu Jun 22 07:40:31 2017
+%% Update Count     : 10
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
                 finally, forall, ftype, _Generic, _Imaginary, inline, __label__, lvalue, _Noreturn, one_t,
                 otype, restrict, _Static_assert, throw, throwResume, trait, try, ttype, typeof, __typeof,
                 __typeof__, with, zero_t},
+                __typeof__, zero_t},
         morekeywords=[2]{
                 _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex,
 …
         moredirectives={defined,include_next}%
+}
-% C++ programming language
-\lstdefinelanguage{C++}[ANSI]{C++}{}
 % uC++ programming language, based on ANSI C++

doc/bibliography/cfa.bib

-              r3d4b23fa
+              r55a68c3
 @manual{JavaScript,
     keywords    = {JavaScript},
     contributer = {pabuhr@plg},
+    contributer = {pabuhr},
     title       = {ECMAScript 2015 Language Specification {JavaScript}},
     organization= {ECAM International},
 …
 @manual{Erlang,
     keywords    = {Erlang},
     contributer = {pabuhr@plg},
+    contributer = {pabuhr},
     title       = {Erlang Reference Manual User's Guide, Vertion 7.0},
     organization= {Erlang/OTP System Documentation},
 …
     publisher   = {ACM},
     address     = {New York, NY, USA},
+}
-@article{Yang95,
-    keywords    = {software solutions, N-thread, mutual exclusions},
-    contributer = {pabuhr@plg},
-    author      = {Jae-Heon Yang and James H. Anderson},
-    title       = {A Fast, Scalable Mutual Exclusion Algorithm},
-    journal     = {Distributed Computing},
-    publisher   = {Springer-Verlag},
-    volume      = {9},
-    number      = {1},
-    year        = {1995},
-    pages       = {51-60},
+}
 …
     contributer = {pabuhr@plg},
     author      = {Kathleen Jensen and Niklaus Wirth},
     title       = {{P}ascal User Manual and Report, ISO Pascal Standard},
+    title       = {{P}ascal User Manual and Report},
     publisher   = {Springer--Verlag},
     year        = 1991,
     edition     = {4th},
     note        = {Revised by Andrew B. Mickel and James F. Miner}
+    year        = 1985,
+    edition     = {3rd},
+    note        = {Revised by Andrew B. Mickel and James F. Miner, ISO Pascal Standard}
+}

doc/proposals/tagged-struct.txt

-              r3d4b23fa
+              r55a68c3
 should be possible to do during linking.
-If a generic/polymorphic type is tagged its tagged would then be shared
-between all applications of that generic. Internal tags could be used to
-seperate these structures again, however it seems in most cases simply using
-the existing type parameters should provide the needed information.
 Traits:
 …
 To allow for growth each option would have to be a structure itself.
 Which brings us to "tagged struct union", ie. a union of tagged structures
+Which brings us to "tagget struct union", ie. a union of tagged structures
 as opposed to tagging the union itself. This extention acts as a constraint.
 If unions are declared tagged instead of creating a new tagged type, all
+possible values of the union must be of that tagged type or a child type. If
+the tagged type is omitted then they must all be tagged but of any tagged
+type.
+As a short cut union_instance->type might get the type object of the loaded
+value. It should always be the same operation regardless so it saves
+abritarly picking a branch of the union to get the type object.
+possible values of the union must be of that tagged type or a child type.
 Type Objects Fields (Extention):
+Custom Type Objects (Extention):
+Adding fields to the type object allows data to be shared between instances
+of the same type. Such behaviour could be mimiced by creating a lookup
+function on the type object pointer, but this may be cleaner and more
+efficient.
+Some method to define type objects used within a tree of types. One option is
+to allow the tree's type object to be specified by the tree root. It would
+then have to be filled in for each type in the tree, including the root.
+The type object fields follow similar rules to the fields on the tagged
+objects themselves, they must be additive. So any fields present on a
+type object will be present (and in the same place) on all of its children.
+The only required field is the parent field, a pointer to the type object's
+type. (This is also the only required field on the tagged structure itself.)
+This does mean that many type object structure types will have to be auto
+generated, and traversing up the tree might get a little wierd. That could
+be symplified by only allowing the root type to specify fields on the type
+object, so that the type object is consistant throughout that particular tree.
+And hence the type_object pointers would also be consistant as the type they
+point to would never change.
+struct Example tagged {
+        tagged char const * const type_name = "Example";
+        int data;
+};
+Creates a tagged structure that has no parent, stores an integer and the type
+object also has an extra field that stores a string on the type object.
+This can be accessed by using member access on the type object, as a regular
+structure.
+Type object fields will have to allow initialization on their declaration,
+and declarations of children as well, as they are not assotiated with the
+later instances of the tagged structure.
+        ...
+        tagged void (*dtor)(tagged Example * this);
+        ...
+Sub-Extention, not sure how it would work but some way to have a "dynamic"
+field that is considered the type of the current tagged struct might be useful
+for things like specifying a deconstructor. In this case, the following code
+will clean up any child type of Example:
+Example * ex = get_some_example();
+ex->type->dtor(ex);
+A further extention could allow expanding type objects, so child types could
+append fields to their parent's feild list. They might need their own type
+objects at that point, or maybe static checks will be enough to see the
+minimum field list.

doc/user/Makefile

r3d4b23fa	r55a68c3
1	1	## Define the appropriate configuration variables.
2	2
3		TeXLIB = .:../LaTeXmacros:../bibliography/:
	3	TeXLIB = .:../LaTeXmacros:../LaTeXmacros/listings:../LaTeXmacros/enumitem:../bibliography/:
4	4	LaTeX = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
5	5	BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex

doc/user/user.tex

-              r3d4b23fa
+              r55a68c3
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Thu Jul 13 11:44:57 2017
 %% Update Count     : 2690
+%% Last Modified On : Sun Jul  2 09:49:56 2017
+%% Update Count     : 2503
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \CFAStyle                                                                                               % use default CFA format-style
-\lstnewenvironment{C++}[1][]
-{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{®}{®}#1}}
-{}
 % inline code ©...© (copyright symbol) emacs: C-q M-)
 % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
 …
 \CFA{}\index{cforall@\CFA}\footnote{Pronounced ``\Index*{C-for-all}'', and written \CFA, CFA, or \CFL.} is a modern general-purpose programming-language, designed as an evolutionary step forward for the C programming language.
 The syntax of \CFA builds from C and should look immediately familiar to C/\Index*[C++]{\CC{}} programmers.
+The syntax of the \CFA language builds from C, and should look immediately familiar to C/\Index*[C++]{\CC{}} programmers.
 % Any language feature that is not described here can be assumed to be using the standard \Celeven syntax.
 \CFA adds many modern programming-language features that directly lead to increased \emph{\Index{safety}} and \emph{\Index{productivity}}, while maintaining interoperability with existing C programs and achieving similar performance.
 Like C, \CFA is a statically typed, procedural (non-\Index{object-oriented}) language with a low-overhead runtime, meaning there is no global \Index{garbage-collection}, but \Index{regional garbage-collection}\index{garbage-collection!regional} is possible.
+\CFA adds many modern programming-language features that directly lead to increased \emph{\Index{safety}} and \emph{\Index{productivity}}, while maintaining interoperability with existing C programs and achieving C performance.
+Like C, \CFA is a statically typed, procedural language with a low-overhead runtime, meaning there is no global \Index{garbage-collection}, but \Index{regional garbage-collection}\index{garbage-collection!regional} is possible.
 The primary new features include parametric-polymorphic routines and types, exceptions, concurrency, and modules.
+One of the main design philosophies of \CFA is to ``\Index{describe not prescribe}'', which means \CFA tries to provide a pathway from low-level C programming to high-level \CFA programming, but it does not force programmers to ``do the right thing''.
+Programmers can cautiously add \CFA extensions to their C programs in any order and at any time to incrementally move towards safer, higher-level programming.
+A programmer is always free to reach back to C from \CFA, for any reason, and in many cases, new \CFA features can be locally switched back to there C counterpart.
+There is no notion or requirement for \emph{rewriting} a legacy C program in \CFA;
+instead, a programmer evolves a legacy program into \CFA by incrementally incorporating \CFA features.
+As well, new programs can be written in \CFA using a combination of C and \CFA features.
+\Index*[C++]{\CC{}} had a similar goal 30 years ago, allowing object-oriented programming to be incrementally added to C.
+However, \CC currently has the disadvantages of a strong object-oriented bias, multiple legacy design-choices that cannot be updated, and active divergence of the language model from C, all of which requires significant effort and training to incrementally add \CC to a C-based project.
+One of the main design philosophies of \CFA is to ``describe not prescribe'', which means \CFA tries to provide a pathway from low-level C programming to high-level \CFA programming, but it does not force programmers to ``do the right thing''.
+Programmers can cautiously add \CFA extensions to their C programs in any order and at any time to incrementally move towards safer, higher-level programming features.
+A programmer is always free to reach back to C from \CFA for any reason, and in many cases, new \CFA features have a fallback to a C mechanism.
+There is no notion or requirement for rewriting a legacy C program in \CFA;
+instead, a programmer evolves an existing C program into \CFA by incrementally incorporating \CFA features.
+New programs can be written in \CFA using a combination of C and \CFA features.
+\Index*[C++]{\CC{}} had a similar goal 30 years ago, but currently has the disadvantages of multiple legacy design-choices that cannot be updated and active divergence of the language model from C, requiring significant effort and training to incrementally add \CC to a C-based project.
 In contrast, \CFA has 30 years of hindsight and a clean starting point.
 …
 \begin{quote2}
 \begin{tabular}{@{}l@{\hspace{1.5em}}l@{\hspace{1.5em}}l@{}}
+\multicolumn{1}{c@{\hspace{1.5em}}}{\textbf{C}} & \multicolumn{1}{c}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{\CC}}      \\
+\begin{cfa}
+\multicolumn{1}{c@{\hspace{1.5em}}}{\textbf{\CFA}}      & \multicolumn{1}{c}{\textbf{C}}        & \multicolumn{1}{c}{\textbf{\CC}}      \\
+\begin{cfa}
+#include <fstream>§\indexc{fstream}§
+int main( void ) {
+        int x = 0, y = 1, z = 2;
+        ®sout | x | y | z | endl;®
+}
+\end{cfa}
+&
+\begin{lstlisting}
 #include <stdio.h>§\indexc{stdio.h}§
 …
         ®printf( "%d %d %d\n", x, y, z );®
+}
 \end{cfa}
+\end{lstlisting}
+&
+\begin{cfa}
+#include <fstream>§\indexc{fstream}§
+int main( void ) {
+        int x = 0, y = 1, z = 2;
+        ®sout | x | y | z | endl;®§\indexc{sout}§
+}
+\end{cfa}
+&
+\begin{cfa}
+\begin{lstlisting}
 #include <iostream>§\indexc{iostream}§
 using namespace std;
 …
         ®cout<<x<<" "<<y<<" "<<z<<endl;®
+}
 \end{cfa}
+\end{lstlisting}
 \end{tabular}
 \end{quote2}
 While the \CFA I/O looks similar to the \Index*[C++]{\CC{}} output style, there are important differences, such as automatic spacing between variables as in \Index*{Python} (see~\VRef{s:IOLibrary}).
-\subsection{Background}
 This document is a programmer reference-manual for the \CFA programming language.
 The manual covers the core features of the language and runtime-system, with simple examples illustrating syntax and semantics of each feature.
 The manual does not teach programming, i.e., how to combine the new constructs to build complex programs.
 A reader should already have an intermediate knowledge of control flow, data structures, and concurrency issues to understand the ideas presented, as well as some experience programming in C/\CC.
 Implementers should refer to the \CFA Programming Language Specification for details about the language syntax and semantics.
+A reader should already have an intermediate knowledge of control flow, data structures, and concurrency issues to understand the ideas presented as well as some experience programming in C/\CC.
+Implementers may refer to the \CFA Programming Language Specification for details about the language syntax and semantics.
 Changes to the syntax and additional features are expected to be included in later revisions.
 …
 This installation base and the programmers producing it represent a massive software-engineering investment spanning decades and likely to continue for decades more.
 Even with all its problems, C continues to be popular because it allows writing software at virtually any level in a computer system without restriction.
 For system programming, where direct access to hardware, storage management, and real-time issues are a requirement, C is usually the only language of choice.
+For system programming, where direct access to hardware and dealing with real-time issues is a requirement, C is usually the language of choice.
 The TIOBE index~\cite{TIOBE} for March 2016 showed the following programming-language popularity: \Index*{Java} 20.5\%, C 14.5\%, \Index*[C++]{\CC{}} 6.7\%, \Csharp 4.3\%, \Index*{Python} 4.3\%, where the next 50 languages are less than 3\% each with a long tail.
 As well, for 30 years, C has been the number 1 and 2 most popular programming language:
 …
 \end{center}
 Hence, C is still an extremely important programming language, with double the usage of \Index*[C++]{\CC{}}; in many cases, \CC is often used solely as a better C.
 Love it or hate it, C has been an important and influential part of computer science for 40 years and its appeal is not diminishing.
 Unfortunately, C has many problems and omissions that make it an unacceptable programming language for modern needs.
 As stated, the goal of the \CFA project is to engineer modern language-features into C in an evolutionary rather than revolutionary way.
+Love it or hate it, C has been an important and influential part of computer science for 40 years and sit appeal is not diminishing.
+Unfortunately, C has too many problems and omissions to make it an acceptable programming language for modern needs.
+As stated, the goal of the \CFA project is to engineer modern language features into C in an evolutionary rather than revolutionary way.
 \CC~\cite{C++14,C++} is an example of a similar project;
 however, it largely extended the C language, and did not address most of C's existing problems.\footnote{%
+however, it largely extended the language, and did not address many existing problems.\footnote{%
 Two important existing problems addressed were changing the type of character literals from ©int© to ©char© and enumerator from ©int© to the type of its enumerators.}
 \Index*{Fortran}~\cite{Fortran08}, \Index*{Ada}~\cite{Ada12}, and \Index*{Cobol}~\cite{Cobol14} are examples of programming languages that took an evolutionary approach, where modern language-features (\eg objects, concurrency) are added and problems fixed within the framework of the existing language.
+\Index*{Fortran}~\cite{Fortran08}, \Index*{Ada}~\cite{Ada12}, and \Index*{Cobol}~\cite{Cobol14} are examples of programming languages that took an evolutionary approach, where modern language features (\eg objects, concurrency) are added and problems fixed within the framework of the existing language.
 \Index*{Java}~\cite{Java8}, \Index*{Go}~\cite{Go}, \Index*{Rust}~\cite{Rust} and \Index*{D}~\cite{D} are examples of the revolutionary approach for modernizing C/\CC, resulting in a new language rather than an extension of the descendent.
 These languages have different syntax and semantics from C, do not interoperate directly with C, and are not systems languages because of restrictive memory-management or garbage collection.
+These languages have different syntax and semantics from C, and do not interoperate directly with C, largely because of garbage collection.
 As a result, there is a significant learning curve to move to these languages, and C legacy-code must be rewritten.
 These costs can be prohibitive for many companies with a large software-base in C/\CC, and a significant number of programmers require retraining to the new programming language.
 The result of this project is a language that is largely backwards compatible with \Index*[C11]{\Celeven{}}~\cite{C11}, but fixes many of the well known C problems while containing modern language-features.
+These costs can be prohibitive for many companies with a large software base in C/\CC, and a significant number of programmers requiring retraining to a new programming language.
+The result of this project is a language that is largely backwards compatible with \Index*[C11]{\Celeven{}}~\cite{C11}, but fixing some of the well known C problems and containing many modern language features.
 Without significant extension to the C programming language, it is becoming unable to cope with the needs of modern programming problems and programmers;
 as a result, it will fade into disuse.
 Considering the large body of existing C code and programmers, there is significant impetus to ensure C is transformed into a modern programming language.
 While \Index*[C11]{\Celeven{}} made a few simple extensions to the language, nothing was added to address existing problems in the language or to augment the language with modern language-features.
 While some may argue that modern language-features may make C complex and inefficient, it is clear a language without modern capabilities is insufficient for the advanced programming problems existing today.
+While \Index*[C11]{\Celeven{}} made a few simple extensions to the language, nothing was added to address existing problems in the language or to augment the language with modern language features.
+While some may argue that modern language features may make C complex and inefficient, it is clear a language without modern capabilities is insufficient for the advanced programming problems existing today.
 \section{History}
 The \CFA project started with \Index*{K-W C}~\cite{Buhr94a,Till89}, which extended C with new declaration syntax, multiple return values from routines, and advanced assignment capabilities using the notion of tuples.
+The \CFA project started with \Index*{K-W C}~\cite{Buhr94a,Till89}, which extended C with new declaration syntax, multiple return values from routines, and extended assignment capabilities using the notion of tuples.
 (See~\cite{Werther96} for similar work in \Index*[C++]{\CC{}}.)
+The first \CFA implementation of these extensions was by Esteves~\cite{Esteves04}.
+The signature feature of \CFA is \Index{overload}able \Index{parametric-polymorphic} functions~\cite{forceone:impl,Cormack90,Duggan96} with functions generalized using a ©forall© clause (giving the language its name):
+A first \CFA implementation of these extensions was by Esteves~\cite{Esteves04}.
+The signature feature of \CFA is parametric-polymorphic functions~\cite{forceone:impl,Cormack90,Duggan96} with functions generalized using a ©forall© clause (giving the language its name):
 \begin{lstlisting}
 ®forall( otype T )® T identity( T val ) { return val; }
 …
 \CFA{}\hspace{1pt}'s polymorphism was originally formalized by Ditchfiled~\cite{Ditchfield92}, and first implemented by Bilson~\cite{Bilson03}.
 However, at that time, there was little interesting in extending C, so work did not continue.
 As the saying goes, ``\Index*{What goes around, comes around.}'', and there is now renewed interest in the C programming language because of legacy code-bases, so the \CFA project has been restarted.
+As the saying goes, ``What goes around, comes around.'', and there is now renewed interest in the C programming language because of legacy code-bases, so the \CFA project has been restarted.
 …
 \CFA is designed to integrate directly with existing C programs and libraries.
 The most important feature of \Index{interoperability} is using the same \Index{calling convention}s, so there is no complex interface or overhead to call existing C routines.
+The most important feature of \Index{interoperability} is using the same \Index{calling convention}s, so there is no overhead to call existing C routines.
 This feature allows \CFA programmers to take advantage of the existing panoply of C libraries to access thousands of external software features.
 Language developers often state that adequate \Index{library support} takes more work than designing and implementing the language itself.
 Fortunately, \CFA, like \Index*[C++]{\CC{}}, starts with immediate access to all exiting C libraries, and in many cases, can easily wrap library routines with simpler and safer interfaces, at very low cost.
 Hence, \CFA begins by leveraging the large repository of C libraries at little cost.
+Hence, \CFA begins by leveraging the large repository of C libraries with little cost.
 \begin{comment}
 …
 \end{comment}
 However, it is necessary to differentiate between C and \CFA code because of name \Index{overload}ing, as for \CC.
+However, it is necessary to differentiate between C and \CFA code because of name overloading, as for \CC.
 For example, the C math-library provides the following routines for computing the absolute value of the basic types: ©abs©, ©labs©, ©llabs©, ©fabs©, ©fabsf©, ©fabsl©, ©cabsf©, ©cabs©, and ©cabsl©.
 Whereas, \CFA wraps each of these routines into ones with the overloaded name ©abs©:
+Whereas, \CFA wraps each of these routines into ones with the common name ©abs©:
 \begin{cfa}
 char abs( char );
 …
 Hence, there is the same need as in \CC, to know if a name is a C or \CFA name, so it can be correctly formed.
 There is no way around this problem, other than C's approach of creating unique names for each pairing of operation and type.
 This example strongly illustrates a core idea in \CFA: \emph{the \Index{power of a name}}.
+This example strongly illustrates a core idea in \CFA: \emph{the power of a name}.
 The name ``©abs©'' evokes the notion of absolute value, and many mathematical types provide the notion of absolute value.
 Hence, knowing the name ©abs© is sufficient to apply it to any type where it is applicable.
 The time savings and safety of using one name uniformly versus $N$ unique names cannot be underestimated.
 \section[Compiling a CFA Program]{Compiling a \CFA Program}
+Hence, knowing the name ©abs© should be sufficient to apply it to any type where it is applicable.
+The time savings and safety of using one name uniformly versus $N$ unique names should not be underestimated.
+\section[Compiling CFA Program]{Compiling \CFA Program}
 The command ©cfa© is used to compile \CFA program(s), and is based on the GNU \Indexc{gcc} command, \eg:
 \begin{cfa}
 cfa§\indexc{cfa}\index{compilation!cfa@©cfa©}§ [ gcc-options ] C/§\CFA{}§-files [ assembler/loader-files ]
+cfa§\indexc{cfa}\index{compilation!cfa@©cfa©}§ [ gcc-options ] C/§\CFA§-files [ assembler/loader-files ]
 \end{cfa}
 \CFA programs having the following ©gcc© flags turned on:
 …
 \Indexc{-debug}\index{compilation option!-debug@©-debug©}
 The program is linked with the debugging version of the runtime system.
 The debug version performs runtime checks to help during the debugging phase of a \CFA program, but can substantially slow program execution.
+The debug version performs runtime checks to help during the debugging phase of a \CFA program, but substantially slows the execution of the program.
 The runtime checks should only be removed after the program is completely debugged.
 \textbf{This option is the default.}
 …
 \end{description}
 These preprocessor variables allow conditional compilation of programs that must work differently in these situations.
 For example, to toggle between C and \CFA extensions, use the following:
+For example, to toggle between C and \CFA extensions, using the following:
 \begin{cfa}
 #ifndef __CFORALL__
 …
 \section{Constant Underscores}
 Numeric constants are extended to allow \Index{underscore}s\index{constant!underscore}, \eg:
+\section{Constants Underscores}
+Numeric constants are extended to allow \Index{underscore}s within constants\index{constant!underscore}, \eg:
 \begin{cfa}
 ®_®147®_®483®_®648;                                    §\C{// decimal constant}§
 …
 L®_®§"\texttt{\textbackslash{x}}§®_®§\texttt{ff}§®_®§\texttt{ee}"§;     §\C{// wide character constant}§
 \end{cfa}
 The rules for placement of underscores are:
 \begin{enumerate}[topsep=5pt,itemsep=5pt,parsep=0pt]
+The rules for placement of underscores is as follows:
+\begin{enumerate}
 \item
 A sequence of underscores is disallowed, \eg ©12__34© is invalid.
 …
 \label{s:BackquoteIdentifiers}
+\CFA introduces in new keywords (see \VRef{s:CFAKeywords}) that can clash with existing C variable-names in legacy code.
+Keyword clashes are accommodated by syntactic transformations using the \CFA backquote escape-mechanism:
+\CFA accommodates keyword clashes with existing C variable-names by syntactic transformations using the \CFA backquote escape-mechanism:
 \begin{cfa}
 int ®`®otype®`® = 3;                    §\C{// make keyword an identifier}§
 …
 \section{\texorpdfstring{Labelled \LstKeywordStyle{continue} / \LstKeywordStyle{break}}{Labelled continue / break}}
+\section{Labelled Continue/Break}
 While C provides ©continue© and ©break© statements for altering control flow, both are restricted to one level of nesting for a particular control structure.
 Unfortunately, this restriction forces programmers to use \Indexc{goto} to achieve the equivalent control-flow for more than one level of nesting.
 To prevent having to switch to the ©goto©, \CFA extends the \Indexc{continue}\index{continue@\lstinline $continue$!labelled}\index{labelled!continue@©continue©} and \Indexc{break}\index{break@\lstinline $break$!labelled}\index{labelled!break@©break©} with a target label to support static multi-level exit\index{multi-level exit}\index{static multi-level exit}~\cite{Buhr85}.
+To prevent having to switch to the ©goto©, \CFA extends the \Indexc{continue}\index{continue@\lstinline $continue$!labelled}\index{labelled!continue@©continue©} and \Indexc{break}\index{break@\lstinline $break$!labelled}\index{labelled!break@©break©} with a target label to support static multi-level exit\index{multi-level exit}\index{static multi-level exit}~\cite{Buhr85,Java}.
 For both ©continue© and ©break©, the target label must be directly associated with a ©for©, ©while© or ©do© statement;
 for ©break©, the target label can also be associated with a ©switch©, ©if© or compound (©{}©) statement.
 \VRef[Figure]{f:MultiLevelResumeTermination} shows the labelled ©continue© and ©break©, specifying which control structure is the target for exit, and the corresponding C program using only ©goto©.
 The innermost loop has 7 exit points, which cause resumption or termination of one or more of the 7 \Index{nested control-structure}s.
-Java supports both labelled ©continue© and ©break© statements.
 \begin{figure}
 …
 \section{\texorpdfstring{\LstKeywordStyle{switch} Statement}{switch Statement}}
+\section{Switch Statement}
 C allows a number of questionable forms for the ©switch© statement:
 …
         ®// open input file
 ®} else if ( argc == 2 ) {
         ®// open input file (duplicate)
+        ®// open input file
 ®} else {
 …
 \begin{cfa}
 switch ( i ) {
   ®case 1: case 3: case 5:®     // odd values
         // odd action
+  case 1: case 3: case 5:       // odd values
+        // same action
         break;
   ®case 2: case 4: case 6:®     // even values
         // even action
+  case 2: case 4: case 6:       // even values
+        // same action
         break;
+}
 …
 However, this situation is handled in other languages without fall-through by allowing a list of case values.
 While fall-through itself is not a problem, the problem occurs when fall-through is the default, as this semantics is unintuitive to many programmers and is different from virtually all other programming languages with a ©switch© statement.
 Hence, default fall-through semantics results in a large number of programming errors as programmers often \emph{forget} the ©break© statement at the end of a ©case© clause, resulting in inadvertent fall-through.
+Hence, default fall-through semantics results in a large number of programming errors as programmers often forget the ©break© statement at the end of a ©case© clause, resulting in inadvertent fall-through.
 \item
 …
 and there is only a medium amount of fall-through from one ©case© clause to the next, and most of these result from a list of case values executing common code, rather than a sequence of case actions that compound.
 \end{itemize}
 These observations put into perspective the \CFA changes to the ©switch©.
+These observations help to put the \CFA changes to the ©switch© into perspective.
 \begin{enumerate}
 \item
 …
   case 7:
         ...
         ®break®                                         §\C{// redundant explicit end of switch}§
+        ®break®                                         §\C{// explicit end of switch}§
   default:
         j = 3;
 …
 \end{cfa}
 Like the ©switch© statement, the ©choose© statement retains the fall-through semantics for a list of ©case© clauses;
 An implicit ©break© is applied only at the end of the \emph{statements} following a ©case© clause.
 An explicit ©fallthru© is retained because it is a C-idiom most C programmers expect, and its absence might discourage programmers from using the ©choose© statement.
+the implicit ©break© is applied only at the end of the \emph{statements} following a ©case© clause.
+The explicit ©fallthru© is retained because it is a C-idiom most C programmers expect, and its absence might discourage programmers from using the ©choose© statement.
 As well, allowing an explicit ©break© from the ©choose© is a carry over from the ©switch© statement, and expected by C programmers.
 \item
 …
 \section{\texorpdfstring{\LstKeywordStyle{case} Clause}{case Clause}}
+\section{Case Clause}
 C restricts the ©case© clause of a ©switch© statement to a single value.
 …
 \begin{cfa}
 case ®1~5, 12~21, 35~42®:
-\end{cfa}
-\section{\texorpdfstring{\LstKeywordStyle{with} Clause / Statement}{with Clause / Statement}}
-\label{s:WithClauseStatement}
-In \Index{object-oriented} programming, there is an implicit first parameter, often names \textbf{©self©} or \textbf{©this©}, which is elided.
-\begin{C++}
-class C {
-        int i, j;
-        int mem() {              ®// implicit "this" parameter
-                i = 1;          ®// this->i
-®               j = 3;          ®// this->j
-®       }
+}
-\end{C++}
-Since CFA is non-object-oriented, the equivalent object-oriented program looks like:
-\begin{cfa}
-struct C {
-        int i, j;
-};
-int mem( C &this ) {    // explicit "this" parameter
-        ®this.®i = 1;                     // "this" is not elided
-        ®this.®j = 2;
+}
-\end{cfa}
-but it is cumbersome having to write "©this.©" many times in a member.
-\CFA provides a ©with© clause/statement to elided the "©this.©".
-\begin{cfa}
-int mem( C &this ) ®with this® {
-        i = 1;                  ®// this.i
-®       j = 2;                  ®// this.j
-®}
-\end{cfa}
-which extends to multiple routine parameters:
-\begin{cfa}
-struct D {
-        double m, n;
-};
-int mem2( C &this1, D &this2 ) ®with this1, this2® {
-        i = 1; j = 2;
-        m = 1.0; n = 2.0;
+}
-\end{cfa}
-The ©with© clause/statement comes from Pascal~\cite[\S~4.F]{Pascal}.
-The statement form is used within a block:
-\begin{cfa}
-int foo() {
-        struct S1 { ... } s1;
-        struct S2 { ... } s2;
-        ®with s1® {
-                // access fields of s1 without qualification
-                ®with s2® {  // nesting
-                        // access fields of s2 without qualification
+                }
+        }
-        ®with s1, s2® {
-                // access unambiguous fields of s1 and s2 without qualification
+        }
+}
-\end{cfa}
-Names clashes when opening multiple structures are ambiguous.
-\begin{cfa}
-struct A { int i; int j; } a, c;
-struct B { int i; int k; } b, c;
-®with a, b® {
-        j + k;                                          §\C{// unambiguous}§
-        i;                                                      §\C{// ambiguous}§
-        a.i + b.i;                                      §\C{// unambiguous}§
+}
-®with c® {                                              §\C{// ambiguous}§
-        // ...
+}
 \end{cfa}
 …
 \section{Pointer / Reference}
+\section{Pointer/Reference}
 C provides a \newterm{pointer type};
 …
 \end{cfa}
 \\
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 ® ®2® ®3
 \end{cfa}
+&
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 2 3
 \end{cfa}
 …
 The \CFA form has half the characters of the \CC form, and is similar to \Index*{Python} I/O with respect to implicit separators.
 Similar simplification occurs for \Index{tuple} I/O, which prints all tuple values separated by ``\lstinline[showspaces=true]@, @''.
 \begin{cfa}
 [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+[int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 3, [ 4, 5 ] ];
 sout | t1 | t2 | endl;                                  §\C{// print tuples}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 ®, ®2®, ®3 4®, ®5®, ®6
+\begin{cfa}[mathescape=off,showspaces=true,belowskip=0pt]
+®, ®2®, ®3 3®, ®4®, ®5
 \end{cfa}
 Finally, \CFA uses the logical-or operator for I/O as it is the lowest-priority overloadable operator, other than assignment.
 …
 \\
+&
 \begin{cfa}[showspaces=true,aboveskip=0pt]
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 3 12 0 3 1 2
 \end{cfa}
 …
 sout | 1 | 2 | 3 | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 2 3
 \end{cfa}
 …
 \subsection{Manipulator}
 The following \CC-style \Index{manipulator}s and routines control implicit seperation.
+The following routines and \CC-style \Index{manipulator}s control implicit seperation.
 \begin{enumerate}
 \item
 Routines \Indexc{sepSet}\index{manipulator!sepSet@©sepSet©} and \Indexc{sep}\index{manipulator!sep@©sep©}/\Indexc{sepGet}\index{manipulator!sepGet@©sepGet©} set and get the separator string.
+Routines \Indexc{sepSet}\index{manipulator!sepSet@©sepSet©} and \Indexc{sepGet}\index{manipulator!sepGet@©sepGet©} set and get the separator string.
 The separator string can be at most 16 characters including the ©'\0'© string terminator (15 printable characters).
 \begin{cfa}[mathescape=off,belowskip=0pt]
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
 sepSet( sout, ", $" );                                          §\C{// set separator from " " to ", \$"}§
 sout | 1 | 2 | 3 | " \"" | ®sep® | "\"" | endl;
+sout | 1 | 2 | 3 | " \"" | ®sepGet( sout )® | "\"" | endl;
 \end{cfa}
 %$
 …
 \end{cfa}
 %$
 \begin{cfa}[belowskip=0pt]
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
 sepSet( sout, " " );                                            §\C{// reset separator to " "}§
 sout | 1 | 2 | 3 | " \"" | ®sepGet( sout )® | "\"" | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt]
 ® ®2® ®3 ®" "®
 \end{cfa}
+©sepGet© can be used to store a separator and then restore it:
+\begin{cfa}[belowskip=0pt]
+char store[®sepSize®];                                          §\C{// sepSize is the maximum separator size}§
+strcpy( store, sepGet( sout ) );
+sepSet( sout, "_" );
+sout | 1 | 2 | 3 | endl;
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+®_®2®_®3
+\end{cfa}
+\begin{cfa}[belowskip=0pt]
+sepSet( sout, store );
+sout | 1 | 2 | 3 | endl;
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt]
+® ®2® ®3
+\end{cfa}
+\item
+Routine \Indexc{sepSetTuple}\index{manipulator!sepSetTuple@©sepSetTuple©} and \Indexc{sepTuple}\index{manipulator!sepTuple@©sepTuple©}/\Indexc{sepGetTuple}\index{manipulator!sepGetTuple@©sepGetTuple©} get and set the tuple separator-string.
+\item
+Routine \Indexc{sepSetTuple}\index{manipulator!sepSetTuple@©sepSetTuple©} and \Indexc{sepGetTuple}\index{manipulator!sepGetTuple@©sepGetTuple©} get and set the tuple separator-string.
 The tuple separator-string can be at most 16 characters including the ©'\0'© string terminator (15 printable characters).
 \begin{cfa}[belowskip=0pt]
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
 sepSetTuple( sout, " " );                                       §\C{// set tuple separator from ", " to " "}§
 sout | t1 | t2 | " \"" | ®sepTuple® | "\"" | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 2 3 4 5 6 ®" "®
 \end{cfa}
 \begin{cfa}[belowskip=0pt]
+sout | t1 | t2 | " \"" | ®sepGetTuple( sout )® | "\"" | endl;
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt]
+2 3 4 ®" "®
+\end{cfa}
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
 sepSetTuple( sout, ", " );                                      §\C{// reset tuple separator to ", "}§
 sout | t1 | t2 | " \"" | ®sepGetTuple( sout )® | "\"" | endl;
 \end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt]
+, 2, 3 4, 5, 6 ®", "®
+\end{cfa}
+As for ©sepGet©, ©sepGetTuple© can be use to store a tuple separator and then restore it.
+\item
+Manipulators \Indexc{sepDisable}\index{manipulator!sepDisable@©sepDisable©} and \Indexc{sepEnable}\index{manipulator!sepEnable@©sepEnable©} \emph{globally} toggle printing the separator, \ie the seperator is adjusted with respect to all subsequent printed items.
+\begin{cfa}[belowskip=0pt]
+sout | sepDisable | 1 | 2 | 3 | endl;           §\C{// globally turn off implicit separator}§
+\end{cfa}
+\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt]
+, 2, 3, 4 ®", "®
+\end{cfa}
+\item
+Manipulators \Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} \emph{locally} toggle printing the separator, \ie the seperator is adjusted only with respect to the next printed item.
+\begin{cfa}[mathescape=off,belowskip=0pt]
+sout | sepOn | 1 | 2 | 3 | sepOn | endl;        §\C{// separator at start/end of line}§
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+® ®1 2 3® ®
+\end{cfa}
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+sout | 1 | sepOff | 2 | 3 | endl;                       §\C{// locally turn off implicit separator}§
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+3
+\end{cfa}
+The tuple separator also responses to being turned on and off.
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+sout | sepOn | t1 | sepOff | t2 | endl;         §\C{// locally turn on/off implicit separation}§
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+, 1, 23, 4
+\end{cfa}
+Notice a tuple seperator starts the line because the next item is a tuple.
+\item
+Manipulators \Indexc{sepDisable}\index{manipulator!sepDisable@©sepDisable©} and \Indexc{sepEnable}\index{manipulator!sepEnable@©sepEnable©} \emph{globally} toggle printing the separator, \ie the seperator is adjusted with respect to all subsequent printed items, unless locally adjusted.
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+sout | sepDisable | 1 | 2 | 3 | endl;           §\C{// globally turn off implicit separation}§
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 \end{cfa}
+\begin{cfa}[belowskip=0pt]
+sout | sepEnable | 1 | 2 | 3 | endl;            §\C{// globally turn on implicit separator}§
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+sout | 1 | ®sepOn® | 2 | 3 | endl;                      §\C{// locally turn on implicit separator}§
+\end{cfa}
+\begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
+® ®23
+\end{cfa}
+\begin{cfa}[mathescape=off,aboveskip=0pt,belowskip=0pt]
+sout | sepEnable | 1 | 2 | 3 | endl;            §\C{// globally turn on implicit separation}§
 \end{cfa}
 \begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 2 3
 \end{cfa}
-\item
-Manipulators \Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} \emph{locally} toggle printing the separator, \ie the seperator is adjusted only with respect to the next printed item.
-\begin{cfa}[belowskip=0pt]
-sout | 1 | sepOff | 2 | 3 | endl;                       §\C{// locally turn off implicit separator}§
-\end{cfa}
-\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
-3
-\end{cfa}
-\begin{cfa}[belowskip=0pt]
-sout | sepDisable | 1 | sepOn | 2 | 3 | endl; §\C{// locally turn on implicit separator}§
-\end{cfa}
-\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
-23
-\end{cfa}
-The tuple separator also responses to being turned on and off.
-\begin{cfa}[belowskip=0pt]
-sout | t1 | sepOff | t2 | endl;                         §\C{// locally turn on/off implicit separator}§
-\end{cfa}
-\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
-, 2, 34, 5, 6
-\end{cfa}
-©sepOn© \emph{cannot} be used to start/end a line with a separator because separators do not appear at the start/end of a line;
-use ©sep© to accomplish this functionality.
-\begin{cfa}[belowskip=0pt]
-sout | sepOn | 1 | 2 | 3 | sepOn | endl ;       §\C{// sepOn does nothing at start/end of line}§
-\end{cfa}
-\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
-2 3
-\end{cfa}
-\begin{cfa}[belowskip=0pt]
-sout | sep | 1 | 2 | 3 | sep | endl ;           §\C{// use sep to print separator at start/end of line}§
-\end{cfa}
-\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
-® ®1 2 3® ®
-\end{cfa}
 \end{enumerate}
 \begin{comment}
 #include <fstream>
-#include <string.h>                                                                             // strcpy
 int main( void ) {
         int x = 1, y = 2, z = 3;
         sout | x | y | z | endl;
         [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
+        [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 3, [ 4, 5 ] ];
         sout | t1 | t2 | endl;                                          // print tuples
         sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl;
 …
         sepSet( sout, ", $" );                                          // set separator from " " to ", $"
         sout | 1 | 2 | 3 | " \"" | sep | "\"" | endl;
+        sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl;
         sepSet( sout, " " );                                            // reset separator to " "
         sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl;
         char store[sepSize];
         strcpy( store, sepGet( sout ) );
+        sepSet( sout, "_" );
         sout | 1 | 2 | 3 | endl;
         sepSet( sout, store );
         sout | 1 | 2 | 3 | endl;
+        sout | sepOn | 1 | 2 | 3 | sepOn | endl;        // separator at start of line
+        sout | 1 | sepOff | 2 | 3 | endl;                       // locally turn off implicit separator
+        sout | sepDisable | 1 | 2 | 3 | endl;           // globally turn off implicit separation
+        sout | 1 | sepOn | 2 | 3 | endl;                        // locally turn on implicit separator
+        sout | sepEnable | 1 | 2 | 3 | endl;            // globally turn on implicit separation
         sepSetTuple( sout, " " );                                       // set tuple separator from ", " to " "
         sout | t1 | t2 | " \"" | sepTuple | "\"" | endl;
+        sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
         sepSetTuple( sout, ", " );                                      // reset tuple separator to ", "
         sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
+        sout | sepDisable | 1 | 2 | 3 | endl;           // globally turn off implicit separator
+        sout | sepEnable | 1 | 2 | 3 | endl;            // globally turn on implicit separator
+        sout | 1 | sepOff | 2 | 3 | endl;                       // locally turn on implicit separator
+        sout | sepDisable | 1 | sepOn | 2 | 3 | endl; // globally turn off implicit separator
+        sout | sepEnable;
+        sout | t1 | sepOff | t2 | endl;                         // locally turn on/off implicit separator
+        sout | sepOn | 1 | 2 | 3 | sepOn | endl ;       // sepOn does nothing at start/end of line
+        sout | sep | 1 | 2 | 3 | sep | endl ;           // use sep to print separator at start/end of line
+        sout | t1 | t2 | endl;                                          // print tuple
+        sout | sepOn | t1 | sepOff | t2 | endl;         // locally turn on/off implicit separation
+}
 …
 \section{\texorpdfstring{\CFA Keywords}{Cforall Keywords}}
+\section{\CFA Keywords}
 \label{s:CFAKeywords}
-\CFA introduces the following new keywords.
 \begin{quote2}
 \begin{tabular}{lllll}
+\begin{tabular}{llll}
 \begin{tabular}{@{}l@{}}
 ©_At©                   \\
+©_AT©                   \\
 ©catch©                 \\
 ©catchResume©   \\
 ©choose©                \\
 ©coroutine©             \\
+©disable©               \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-©disable©               \\
 ©dtype©                 \\
 ©enable©                \\
 ©fallthrough©   \\
 ©fallthru©              \\
+©finally©               \\
+©forall©                \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-©finally©               \\
-©forall©                \\
 ©ftype©                 \\
 ©lvalue©                \\
 ©monitor©               \\
+©mutex©                 \\
+©one_t©                 \\
+©otype©                 \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-©mutex©                 \\
-©one_t©                 \\
-©otype©                 \\
 ©throw©                 \\
 ©throwResume©   \\
-\end{tabular}
+&
-\begin{tabular}{@{}l@{}}
 ©trait©                 \\
 ©try©                   \\
 ©ttype©                 \\
 ©zero_t©                \\
-                                \\
 \end{tabular}
 \end{tabular}
 …
 // C unsafe allocation
 extern "C" {
 void * malloc( size_t size );§\indexc{memset}§
+void * mallac( size_t size );§\indexc{memset}§
 void * calloc( size_t dim, size_t size );§\indexc{calloc}§
 void * realloc( void * ptr, size_t size );§\indexc{realloc}§

src/CodeGen/CodeGenerator.cc

-              r3d4b23fa
+              r55a68c3
 //
+#include <cassert>                   // for assert, assertf
+#include <list>                      // for _List_iterator, list, list<>::it...
+#include <algorithm>
+#include <iostream>
+#include <cassert>
+#include <list>
+#include "Parser/ParseNode.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Initializer.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
+#include "SynTree/Attribute.h"
+#include "Common/utility.h"
+#include "Common/UnimplementedError.h"
 #include "CodeGenerator.h"
+#include "Common/SemanticError.h"    // for SemanticError
+#include "Common/UniqueName.h"       // for UniqueName
+#include "Common/utility.h"          // for CodeLocation, toString
+#include "GenType.h"                 // for genType
+#include "InitTweak/InitTweak.h"     // for getPointerBase
+#include "OperatorTable.h"           // for OperatorInfo, operatorLookup
+#include "Parser/LinkageSpec.h"      // for Spec, Intrinsic
+#include "SynTree/Attribute.h"       // for Attribute
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "SynTree/Constant.h"        // for Constant
+#include "SynTree/Declaration.h"     // for DeclarationWithType, TypeDecl
+#include "SynTree/Expression.h"      // for Expression, UntypedExpr, Applica...
+#include "SynTree/Initializer.h"     // for Initializer, ListInit, Designation
+#include "SynTree/Label.h"           // for Label, operator<<
+#include "SynTree/Statement.h"       // for Statement, AsmStmt, BranchStmt
+#include "SynTree/Type.h"            // for Type, Type::StorageClasses, Func...
+#include "OperatorTable.h"
+#include "GenType.h"
+#include "InitTweak/InitTweak.h"
 using namespace std;

src/CodeGen/CodeGenerator.h

-              r3d4b23fa
+              r55a68c3
 #define CODEGENV_H
+#include <list>                   // for list
+#include <ostream>                // for ostream, operator<<
+#include <string>                 // for string
+#include <list>
+#include "SynTree/Declaration.h"  // for DeclarationWithType (ptr only), Fun...
+#include "SynTree/Visitor.h"      // for Visitor
+#include "SynTree/SynTree.h"      // for Visitor Nodes
+#include "SynTree/Declaration.h"
+#include "SynTree/SynTree.h"
+#include "SynTree/Visitor.h"
+#include "SymTab/Indexer.h"
+#include "Common/Indenter.h"
+#include "Common/utility.h"
 namespace CodeGen {

src/CodeGen/FixMain.cc

-              r3d4b23fa
+              r55a68c3
 // file "LICENCE" distributed with Cforall.
 //
 // FixMain.cc --
+// FixMain.cc --
 //
 // Author           : Thierry Delisle
 // Created On       : Thr Jan 12 14:11:09 2017
 // Last Modified By :
 // Last Modified On :
+// Last Modified By :
+// Last Modified On :
 // Update Count     : 0
 //
 #include "FixMain.h"
+#include "FixMain.h"
+#include <cassert>                 // for assert, assertf
+#include <fstream>                 // for operator<<, basic_ostream::operator<<
+#include <list>                    // for list
+#include <string>                  // for operator<<
+#include <fstream>
+#include <iostream>
+#include "Common/SemanticError.h"  // for SemanticError
+#include "SynTree/Declaration.h"   // for FunctionDecl, operator<<
+#include "SynTree/Type.h"          // for FunctionType
+#include "Common/SemanticError.h"
+#include "SynTree/Declaration.h"
 namespace CodeGen {
         bool FixMain::replace_main = false;
         std::unique_ptr<FunctionDecl> FixMain::main_signature = nullptr;
         void FixMain::registerMain(FunctionDecl* functionDecl)
+        void FixMain::registerMain(FunctionDecl* functionDecl)
+        {
                 if(main_signature) {
                         throw SemanticError("Multiple definition of main routine\n", functionDecl);
+                if(main_signature) {
+                        throw SemanticError("Multiple definition of main routine\n", functionDecl);
+                }
                 main_signature.reset( functionDecl->clone() );

src/CodeGen/FixNames.cc

-              r3d4b23fa
+              r55a68c3
 //
+#include <memory>
 #include "FixNames.h"
+#include <memory>                  // for unique_ptr
+#include <string>                  // for string, operator!=, operator==
+#include "Common/SemanticError.h"  // for SemanticError
+#include "FixMain.h"               // for FixMain
+#include "Parser/LinkageSpec.h"    // for Cforall, isMangled
+#include "SymTab/Mangler.h"        // for Mangler
+#include "SynTree/Constant.h"      // for Constant
+#include "SynTree/Declaration.h"   // for FunctionDecl, ObjectDecl, Declarat...
+#include "SynTree/Expression.h"    // for ConstantExpr
+#include "SynTree/Label.h"         // for Label, noLabels
+#include "SynTree/Statement.h"     // for ReturnStmt, CompoundStmt
+#include "SynTree/Type.h"          // for Type, BasicType, Type::Qualifiers
+#include "SynTree/Visitor.h"       // for Visitor, acceptAll
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Visitor.h"
+#include "SymTab/Mangler.h"
+#include "OperatorTable.h"
+#include "FixMain.h"
 namespace CodeGen {
 …
                                                                                                                                    main_type = new FunctionType( Type::Qualifiers(), true ), nullptr )
                                 };
                 main_type->get_returnVals().push_back(
+                main_type->get_returnVals().push_back(
                         new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 …
         std::string mangle_main_args() {
                 FunctionType* main_type;
                 std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", Type::StorageClasses(), LinkageSpec::Cforall,
+                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", Type::StorageClasses(), LinkageSpec::Cforall,
                                                                                                                                    main_type = new FunctionType( Type::Qualifiers(), false ), nullptr )
                                 };
                 main_type->get_returnVals().push_back(
+                main_type->get_returnVals().push_back(
                         new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
                 mainDecl->get_functionType()->get_parameters().push_back(
+                mainDecl->get_functionType()->get_parameters().push_back(
                         new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
                 mainDecl->get_functionType()->get_parameters().push_back(
                         new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0,
                         new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ),
+                mainDecl->get_functionType()->get_parameters().push_back(
+                        new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0,
+                        new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ),
                         nullptr )
                 );
 …
         bool is_main(const std::string& name) {
                 static std::string mains[] = {
                         mangle_main(),
+                static std::string mains[] = {
+                        mangle_main(),
                         mangle_main_args()
                 };
 …
                         int nargs = functionDecl->get_functionType()->get_parameters().size();
                         if( !(nargs == 0 || nargs == 2 || nargs == 3) ) {
                                 throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl);
+                                throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl);
+                        }
                         functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new ConstantExpr( Constant::from_int( 0 ) ) ) );

src/CodeGen/FixNames.h

-              r3d4b23fa
+              r55a68c3
 #define FIXNAMES_H
+#include <list>  // for list
+class Declaration;
+#include "SynTree/SynTree.h"
 namespace CodeGen {

src/CodeGen/GenType.cc

-              r3d4b23fa
+              r55a68c3
 //
+#include <cassert>                // for assert, assertf
+#include <list>                   // for _List_iterator, _List_const_iterator
+#include <sstream>                // for operator<<, ostringstream, basic_os...
+#include "CodeGenerator.h"        // for CodeGenerator
+#include <sstream>
+#include <cassert>
 #include "GenType.h"
+#include "SynTree/Declaration.h"  // for DeclarationWithType
+#include "SynTree/Expression.h"   // for Expression
+#include "SynTree/Type.h"         // for PointerType, Type, FunctionType
+#include "SynTree/Visitor.h"      // for Visitor
+#include "CodeGenerator.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Type.h"
+#include "SynTree/Visitor.h"
 namespace CodeGen {

src/CodeGen/GenType.h

-              r3d4b23fa
+              r55a68c3
 #define _GENTYPE_H
+#include <string>  // for string
+class Type;
+#include <string>
+#include "SynTree/SynTree.h"
 namespace CodeGen {

src/CodeGen/Generate.cc

-              r3d4b23fa
+              r55a68c3
 //
+#include <iostream>                  // for ostream, endl, operator<<
+#include <list>                      // for list
+#include <string>                    // for operator<<
+#include <algorithm>
+#include <iostream>
+#include <cassert>
+#include <list>
-#include "CodeGenerator.h"           // for CodeGenerator, doSemicolon, oper...
-#include "GenType.h"                 // for genPrettyType
 #include "Generate.h"
+#include "Parser/LinkageSpec.h"      // for isBuiltin, isGeneratable
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "SynTree/Declaration.h"     // for Declaration
+#include "SynTree/Type.h"            // for Type
+#include "SynTree/Declaration.h"
+#include "CodeGenerator.h"
+#include "GenType.h"
+#include "SynTree/SynTree.h"
+#include "SynTree/Type.h"
+#include "SynTree/BaseSyntaxNode.h"
+// #include "Tuples/Tuples.h"
 using namespace std;

src/CodeGen/Generate.h

-              r3d4b23fa
+              r55a68c3
 #define GENERATE_H
 #include <iostream>  // for ostream
 #include <list>      // for list
+#include <list>
+#include <iostream>
+class BaseSyntaxNode;
+class Declaration;
+#include "SynTree/SynTree.h"
 namespace CodeGen {

src/CodeGen/OperatorTable.cc

-              r3d4b23fa
+              r55a68c3
 //
+#include <map>      // for map, _Rb_tree_const_iterator, map<>::const_iterator
+#include <utility>  // for pair
+#include <map>
 #include "OperatorTable.h"

src/CodeTools/DeclStats.cc

-              r3d4b23fa
+              r55a68c3
 #include "DeclStats.h"
+#include <iostream>                // for operator<<, basic_ostream, cout
+#include <map>                     // for map
+#include <string>                  // for string, operator+, operator<<, cha...
+#include <unordered_map>           // for unordered_map
+#include <unordered_set>           // for unordered_set
+#include <utility>                 // for pair, make_pair
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/VectorMap.h"      // for VectorMap
+#include "GenPoly/GenPoly.h"       // for hasPolyBase
+#include "Parser/LinkageSpec.h"    // for ::NoOfSpecs, Spec
+#include "SynTree/Declaration.h"   // for FunctionDecl, TypeDecl, Declaration
+#include "SynTree/Expression.h"    // for UntypedExpr, Expression
+#include "SynTree/Statement.h"     // for CompoundStmt
+#include "SynTree/Type.h"          // for Type, FunctionType, PointerType
+#include "SynTree/Visitor.h"       // for maybeAccept, Visitor, acceptAll
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include "Common/VectorMap.h"
+#include "GenPoly/GenPoly.h"
+#include "Parser/LinkageSpec.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Visitor.h"
 namespace CodeTools {
         class DeclStats : public Visitor {
                 template<typename T>
 …
                                 sum(n_types, o.n_types);
                                 sum(p_new, o.p_new);
                                 return *this;
+                        }
                 };
                 struct Stats {
                         unsigned n_decls;     ///< Total number of declarations
 …
                         /// Stats for the return list
                         ArgPackStats returns;
                         /// Count of declarations with each number of assertions
                         std::map<unsigned, unsigned> n_assns;
 …
                         /// Stats for the assertions' return types
                         ArgPackStats assn_returns;
                         Stats() : n_decls(0), n_type_params(), by_name(), basic_type_names(), compound_type_names(), basic_type_decls(), compound_type_decls(), params(), returns(), n_assns(), assn_params(), assn_returns() {}
 …
                                 sum( assn_params, o.assn_params );
                                 sum( assn_returns, o.assn_returns );
                                 return *this;
+                        }
 …
                                 n += dt->size();
                                 std::stringstream ss;
                                 dt->print( ss );
 …
                         ++pstats.n_types.at( types.size() );
+                }
                 void analyzeFunc( FunctionType* fnTy, Stats& stats, ArgPackStats& params, ArgPackStats& returns ) {
                         std::unordered_set<std::string> seen;
 …
                         auto& args = expr->get_args();
                         unsigned fanout = args.size();
                         ++exprs_by_fanout_at_depth[ std::make_pair(depth, fanout) ];
                         for ( Expression* arg : args ) {
 …
                                 return;
+                        }
                         Stats& stats = for_linkage[ decl->get_linkage() ];
 …
+                }
                 void printPairMap( const std::string& name,
+                void printPairMap( const std::string& name,
                                    const std::map<std::pair<unsigned, unsigned>, unsigned>& map ) {
                         for ( const auto& entry : map ) {
                                 const auto& key = entry.first;
                                 std::cout << "\"" << name << "\"," << key.first << "," << key.second << ","
+                                std::cout << "\"" << name << "\"," << key.first << "," << key.second << ","
                                           << entry.second << std::endl;
+                        }
+                }
         public:
                 void print() {
 …
                 stats.print();
+        }
 } // namespace CodeTools

src/CodeTools/DeclStats.h

-              r3d4b23fa
+              r55a68c3
 #define DECLSTATS_H
+#include <list>  // for list
+class Declaration;
+#include "SynTree/SynTree.h"
 namespace CodeTools {

src/CodeTools/TrackLoc.cc

-              r3d4b23fa
+              r55a68c3
 #include "TrackLoc.h"
+#include <cstdlib>                    // for size_t, exit, EXIT_FAILURE
+#include <iostream>                   // for operator<<, ostream, basic_ostream
+#include <iterator>                   // for back_inserter, inserter
+#include <stack>                      // for stack
+#include <string>                     // for operator<<, string
+#include <typeindex>                  // for type_index
+#include <cstdlib>
+#include "Common/PassVisitor.h"       // for PassVisitor
+#include "Common/PassVisitor.impl.h"  // for acceptAll
+#include "Common/SemanticError.h"     // for SemanticError
+#include "Common/utility.h"           // for CodeLocation
+#include "SynTree/BaseSyntaxNode.h"   // for BaseSyntaxNode
+#include "SynTree/Mutator.h"          // for mutateAll
+#include "SynTree/Visitor.h"          // for acceptAll
+#include <iostream>
+#include <sstream>
+#include <stack>
+#include <string>
+#include <typeindex>
+class Declaration;
+#include "Common/utility.h"
+#include "Common/PassVisitor.h"
+#include "Common/VectorMap.h"
+#include "GenPoly/GenPoly.h"
+#include "Parser/LinkageSpec.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Initializer.h"
 namespace CodeTools {

src/CodeTools/TrackLoc.h

-              r3d4b23fa
+              r55a68c3
 #define TRACKLOC_H
+#include <cstddef>   // for size_t
+#include <list>      // for list
+class Declaration;
+#include "SynTree/SynTree.h"
 namespace CodeTools {

src/Common/Assert.cc

-              r3d4b23fa
+              r55a68c3
 //
+#include <cstdarg>  // for va_end, va_list, va_start
+#include <cstdio>   // for fprintf, stderr, vfprintf
+#include <cstdlib>  // for abort
+#include <assert.h>
+#include <cstdarg>                                                                              // varargs
+#include <cstdio>                                                                               // fprintf
+#include <cstdlib>                                                                              // abort
 extern const char * __progname;                                                 // global name of running executable (argv[0])

src/Common/SemanticError.cc

-              r3d4b23fa
+              r55a68c3
 //
 #include <cstdio>            // for fileno, stderr
 #include <unistd.h>          // for isatty
 #include <iostream>          // for basic_ostream, operator<<, ostream
 #include <list>              // for list, _List_iterator
 #include <string>            // for string, operator<<, operator+, to_string
+#include <iostream>
+#include <list>
+#include <string>
+#include <algorithm>
+#include <iterator>
-#include "Common/utility.h"  // for to_string, CodeLocation (ptr only)
 #include "SemanticError.h"
+#include <unistd.h>
 inline const std::string& error_str() {

src/Common/SemanticError.h

-              r3d4b23fa
+              r55a68c3
 #define SEMANTICERROR_H
+#include <exception>  // for exception
+#include <iostream>   // for ostream
+#include <list>       // for list
+#include <string>     // for string
+#include <exception>
+#include <string>
+#include <sstream>
+#include <list>
+#include <iostream>
 #include "utility.h"  // for CodeLocation, toString
+#include "utility.h"
 struct error {

src/Concurrency/Keywords.cc

-              r3d4b23fa
+              r55a68c3
 #include "Concurrency/Keywords.h"
+#include <cassert>                 // for assert
+#include <string>                  // for string, operator==
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/utility.h"        // for deleteAll, map_range
+#include "InitTweak/InitTweak.h"   // for isConstructor
+#include "Parser/LinkageSpec.h"    // for Cforall
+#include "SymTab/AddVisit.h"       // for acceptAndAdd
+#include "SynTree/Constant.h"      // for Constant
+#include "SynTree/Declaration.h"   // for StructDecl, FunctionDecl, ObjectDecl
+#include "SynTree/Expression.h"    // for VariableExpr, ConstantExpr, Untype...
+#include "SynTree/Initializer.h"   // for SingleInit, ListInit, Initializer ...
+#include "SynTree/Label.h"         // for Label
+#include "SynTree/Statement.h"     // for CompoundStmt, DeclStmt, ExprStmt
+#include "SynTree/Type.h"          // for StructInstType, Type, PointerType
+#include "SynTree/Visitor.h"       // for Visitor, acceptAll
+class Attribute;
+#include "InitTweak/InitTweak.h"
+#include "SymTab/AddVisit.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Initializer.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
+#include "SynTree/Visitor.h"
 namespace Concurrency {
 …
                 if( needs_main ) {
                         FunctionType * main_type = new FunctionType( noQualifiers, false );
                         main_type->get_parameters().push_back( this_decl->clone() );
 …
         void ConcurrentSueKeyword::addRoutines( ObjectDecl * field, FunctionDecl * func ) {
                 CompoundStmt * statement = new CompoundStmt( noLabels );
                 statement->push_back(
+                statement->push_back(
                         new ReturnStmt(
                                 noLabels,
 …
         //=============================================================================================
         void MutexKeyword::visit(FunctionDecl* decl) {
                 Visitor::visit(decl);
+                Visitor::visit(decl);
                 std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl );
 …
         void ThreadStarter::visit(FunctionDecl * decl) {
                 Visitor::visit(decl);
                 if( ! InitTweak::isConstructor(decl->get_name()) ) return;
 …
                 if( ! stmt ) return;
                 stmt->push_back(
+                stmt->push_back(
                         new ExprStmt(
                                 noLabels,

src/Concurrency/Keywords.h

-              r3d4b23fa
+              r55a68c3
 #define KEYWORDS_H
 #include <list>  // for list
+#include <list>
+class Declaration;
+#include "SynTree/Declaration.h"
 namespace Concurrency {

src/ControlStruct/ExceptTranslate.cc

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
 // Last Modified On : Wed Jul 12 15:07:00 2017
 // Update Count     : 3
+// Last Modified On : Fri Jun 30 13:30:00 2017
+// Update Count     : 1
 //
 …
         Statement * create_terminate_throw( ThrowStmt *throwStmt ) {
                 // { int NAME = EXPR; __throw_terminate( &NAME ); }
                 return create_given_throw( "__cfaehm__throw_terminate", throwStmt );
+                return create_given_throw( "__cfaehm__throw_termination", throwStmt );
+        }
         Statement * create_terminate_rethrow( ThrowStmt *throwStmt ) {
 …
                 Statement * result = new ExprStmt(
                         throwStmt->get_labels(),
                         new UntypedExpr( new NameExpr( "__cfaehm__rethrow_terminate" ) )
+                        new UntypedExpr( new NameExpr( "__cfaehm__rethrow_termination" ) )
                         );
                 delete throwStmt;
 …
         Statement * create_resume_throw( ThrowStmt *throwStmt ) {
                 // __throw_resume( EXPR );
                 return create_given_throw( "__cfaehm__throw_resume", throwStmt );
+                return create_given_throw( "__cfaehm__throw_resumption", throwStmt );
+        }
         Statement * create_resume_rethrow( ThrowStmt *throwStmt ) {
 …
                 PassVisitor<ExceptionMutatorCore> translator;
+                mutateAll( translationUnit, translator );
+                for ( Declaration * decl : translationUnit ) {
+                        decl->acceptMutator( translator );
+                }
+        }
+}

src/GenPoly/InstantiateGeneric.cc

r3d4b23fa	r55a68c3
171	171	Type* postmutate( UnionInstType *inst );
172	172
173		void premutate( ~~__attribute__((unused))~~ FunctionType * ftype ) {
	173	void premutate( FunctionType * ftype ) {
174	174	GuardValue( inFunctionType );
175	175	inFunctionType = true;

src/InitTweak/GenInit.cc

-              r3d4b23fa
+              r55a68c3
                 // that need to be constructed or destructed
                 void previsit( StructDecl *aggregateDecl );
+                void previsit( __attribute__((unused)) UnionDecl    * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) EnumDecl     * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) TraitDecl    * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) TypeDecl     * typeDecl )      { visit_children = false; }
+                void previsit( __attribute__((unused)) TypedefDecl  * typeDecl )      { visit_children = false; }
+                void previsit( __attribute__((unused)) FunctionType * funcType )      { visit_children = false; }
+                void previsit( UnionDecl *aggregateDecl ) { visit_children = false; }
+                void previsit( EnumDecl *aggregateDecl ) { visit_children = false; }
+                void previsit( TraitDecl *aggregateDecl ) { visit_children = false; }
+                void previsit( TypeDecl *typeDecl ) { visit_children = false; }
+                void previsit( TypedefDecl *typeDecl ) { visit_children = false; }
+                void previsit( FunctionType *funcType ) { visit_children = false; }
                 void previsit( CompoundStmt * compoundStmt );
 …
+        }
         void CtorDtor::previsit( __attribute__((unused)) CompoundStmt * compoundStmt ) {
+        void CtorDtor::previsit( CompoundStmt * compoundStmt ) {
                 GuardScope( managedTypes );
+        }

src/MakeLibCfa.cc

-              r3d4b23fa
+              r55a68c3
 #include "MakeLibCfa.h"
+#include <cassert>                 // for assert
+#include <string>                   // for operator==, string
+#include "CodeGen/OperatorTable.h"  // for OperatorInfo, operatorLookup, Ope...
+#include "Common/SemanticError.h"   // for SemanticError
+#include "Common/UniqueName.h"      // for UniqueName
+#include "Parser/LinkageSpec.h"     // for Spec, Intrinsic, C
+#include "SynTree/Declaration.h"    // for FunctionDecl, ObjectDecl, Declara...
+#include "SynTree/Expression.h"     // for NameExpr, UntypedExpr, VariableExpr
+#include "SynTree/Initializer.h"    // for SingleInit
+#include "SynTree/Label.h"          // for Label
+#include "SynTree/Statement.h"      // for CompoundStmt, ReturnStmt
+#include "SynTree/Type.h"           // for FunctionType
+#include "SynTree/Visitor.h"        // for acceptAll, Visitor
+#include "SynTree/Visitor.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Type.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Initializer.h"
+#include "CodeGen/OperatorTable.h"
+#include "Common/UniqueName.h"
 namespace LibCfa {

src/MakeLibCfa.h

-              r3d4b23fa
+              r55a68c3
 #define LIBCFA_MAKELIBCFA_H
+#include <list>  // for list
+class Declaration;
+#include <list>
+#include <SynTree/SynTree.h>
 namespace LibCfa {

src/Makefile.am

r3d4b23fa	r55a68c3
43	43	driver_cfa_cpp_SOURCES = ${SRC}
44	44	driver_cfa_cpp_LDADD = ${LEXLIB} -ldl # yywrap
45		driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -~~Wextra -~~DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
	45	driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
46	46	driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
47	47

src/Makefile.in

-              r3d4b23fa
+              r55a68c3
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = ${LEXLIB} -ldl                   # yywrap
 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
 driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
 all: $(BUILT_SOURCES)
 …
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/Makefile
+          $(AUTOMAKE) --gnu src/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \

src/Parser/LinkageSpec.cc

-              r3d4b23fa
+              r55a68c3
 // Created On       : Sat May 16 13:22:09 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul  7 11:11:00 2017
 // Update Count     : 25
+// Last Modified On : Wed Jun 28 11:51:00 2017
+// Update Count     : 24
 //
 …
 #include "Common/SemanticError.h"
+namespace LinkageSpec {
+Spec linkageCheck( const string * spec ) {
+        assert( spec );
+LinkageSpec::Spec LinkageSpec::linkageCheck( const string * spec ) {
         unique_ptr<const string> guard( spec ); // allocated by lexer
         if ( *spec == "\"Cforall\"" ) {
 …
+}
+Spec linkageUpdate( Spec old_spec, const string * cmd ) {
+        assert( cmd );
+        unique_ptr<const string> guard( cmd ); // allocated by lexer
+        if ( *cmd == "\"Cforall\"" ) {
+                old_spec.is_mangled = true;
+                return old_spec;
+        } else if ( *cmd == "\"C\"" ) {
+                old_spec.is_mangled = false;
+                return old_spec;
+        } else {
+                throw SemanticError( "Invalid linkage specifier " + *cmd );
+        } // if
+string LinkageSpec::linkageName( LinkageSpec::Spec linkage ) {
+        assert( 0 <= linkage && linkage < LinkageSpec::NoOfSpecs );
+        static const char *linkageKinds[LinkageSpec::NoOfSpecs] = {
+                "intrinsic", "Cforall", "C", "automatically generated", "compiler built-in", "cfa built-in", "c built-in",
+        };
+        return linkageKinds[linkage];
+}
+std::string linkageName( Spec linkage ) {
+    switch ( linkage ) {
+    case Intrinsic:
+        return "intrinsic";
+    case C:
+        return "C";
+    case Cforall:
+        return "Cforall";
+    case AutoGen:
+        return "autogenerated cfa";
+    case Compiler:
+        return "compiler built-in";
+    case BuiltinCFA:
+        return "cfa built-in";
+    case BuiltinC:
+        return "c built-in";
+    default:
+        return "<unnamed linkage spec>";
+    }
+bool LinkageSpec::isMangled( Spec spec ) {
+        assert( 0 <= spec && spec < LinkageSpec::NoOfSpecs );
+        static bool decoratable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler,
+                        true,           true,           false,  true,           false,
+                //      Builtin,        BuiltinC,
+                        true,           false,
+        };
+        return decoratable[spec];
+}
+} // LinkageSpec
+bool LinkageSpec::isGeneratable( Spec spec ) {
+        assert( 0 <= spec && spec < LinkageSpec::NoOfSpecs );
+        static bool generatable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler,
+                        true,           true,           true,   true,           false,
+                //      Builtin,        BuiltinC,
+                        true,           true,
+        };
+        return generatable[spec];
+}
+bool LinkageSpec::isOverridable( Spec spec ) {
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
+        static bool overridable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler,
+                        true,           false,          false,  true,           false,
+                //      Builtin,        BuiltinC,
+                        false,          false,
+        };
+        return overridable[spec];
+}
+bool LinkageSpec::isBuiltin( Spec spec ) {
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
+        static bool builtin[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler,
+                        true,           false,          false,  false,          true,
+                //      Builtin,        BuiltinC,
+                        true,           true,
+        };
+        return builtin[spec];
+}
 // Local Variables: //

src/Parser/LinkageSpec.h

-              r3d4b23fa
+              r55a68c3
 // file "LICENCE" distributed with Cforall.
 //
 // LinkageSpec.h --
+// LinkageSpec.h --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:24:28 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul  7 11:03:00 2017
 // Update Count     : 13
+// Last Modified On : Wed Jun 28 11:50:00 2017
+// Update Count     : 12
 //
 …
 #include <string>
+namespace LinkageSpec {
+        // All linkage specs are some combination of these flags:
+        enum {
+                Mangle = 1 << 0,
+                Generate = 1 << 1,
+                Overrideable = 1 << 2,
+                Builtin = 1 << 3,
+                NoOfSpecs = 1 << 4,
+struct LinkageSpec {
+        enum Spec {
+                Intrinsic,                                                                              // C built-in defined in prelude
+                Cforall,                                                                                // ordinary
+                C,                                                                                              // not overloadable, not mangled
+                AutoGen,                                                                                // built by translator (struct assignment)
+                Compiler,                                                                               // gcc internal
+                Builtin,                                                                                // mangled builtins
+                BuiltinC,                                                                               // non-mangled builtins
+                NoOfSpecs
         };
+        union Spec {
+                unsigned int val;
+                struct {
+                        bool is_mangled : 1;
+                        bool is_generatable : 1;
+                        bool is_overridable : 1;
+                        bool is_builtin : 1;
+                };
+                constexpr Spec( unsigned int val ) : val( val ) {}
+                constexpr Spec( Spec const &other ) : val( other.val ) {}
+                // Operators may go here.
+                // Supports == and !=
+                constexpr operator unsigned int () const { return val; }
+        };
+        Spec linkageCheck( const std::string * );
+        // Returns the Spec with the given name (limited to C, Cforall & BuiltinC)
+        Spec linkageUpdate( Spec old_spec, const std::string * cmd );
+        /* If cmd = "C" returns a Spec that is old_spec with is_mangled = false
+         * If cmd = "Cforall" returns old_spec Spec with is_mangled = true
+         */
+        std::string linkageName( Spec );
+        // To Update: LinkageSpec::isXyz( cur_spec ) -> cur_spec.is_xyz
+        inline bool isMangled( Spec spec ) { return spec.is_mangled; }
+        inline bool isGeneratable( Spec spec ) { return spec.is_generatable; }
+        inline bool isOverridable( Spec spec ) { return spec.is_overridable; }
+        inline bool isBuiltin( Spec spec ) { return spec.is_builtin; }
+        // Pre-defined flag combinations:
+        // C built-in defined in prelude
+        constexpr Spec const Intrinsic = { Mangle | Generate | Overrideable | Builtin };
+        // ordinary
+        constexpr Spec const Cforall = { Mangle | Generate };
+        // not overloadable, not mangled
+        constexpr Spec const C = { Generate };
+        // built by translator (struct assignment)
+        constexpr Spec const AutoGen = { Mangle | Generate | Overrideable };
+        // gcc internal
+        constexpr Spec const Compiler = { Builtin };
+        // mangled builtins
+        constexpr Spec const BuiltinCFA = { Mangle | Generate | Builtin };
+        // non-mangled builtins
+        constexpr Spec const BuiltinC = { Generate | Builtin };
+        static Spec linkageCheck( const std::string * );
+        static std::string linkageName( Spec );
+        static bool isMangled( Spec );
+        static bool isGeneratable( Spec );
+        static bool isOverridable( Spec );
+        static bool isBuiltin( Spec );
 };

src/Parser/StatementNode.cc

-              r3d4b23fa
+              r55a68c3
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Jul 11 21:23:15 2017
 // Update Count     : 331
+// Last Modified On : Wed Jun 28 21:08:37 2017
+// Update Count     : 330
 //
 …
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
         // branches.size() == 0 for switch (...) {}, i.e., no declaration or statements
+        assert( branches.size() >= 0 );                                         // size == 0 for switch (...) {}, i.e., no declaration or statements
         return new SwitchStmt( noLabels, maybeMoveBuild< Expression >(ctl), branches );
+}

src/Parser/lex.ll

-              r3d4b23fa
+              r55a68c3
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
  * Last Modified On : Wed Jul 12 18:04:44 2017
  * Update Count     : 535
+ * Last Modified On : Wed Jun 28 21:03:45 2017
+ * Update Count     : 529
  */
 …
+}
-// Stop warning due to incorrectly generated flex code.
-#pragma GCC diagnostic ignored "-Wsign-compare"
 %}
 …
 __volatile__    { KEYWORD_RETURN(VOLATILE); }                   // GCC
 while                   { KEYWORD_RETURN(WHILE); }
-with                    { KEYWORD_RETURN(WITH); }                               // CFA
 zero_t                  { NUMERIC_RETURN(ZERO_T); }                             // CFA

src/Parser/parser.yy

-              r3d4b23fa
+              r55a68c3
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jul 12 18:23:36 2017
 // Update Count     : 2426
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jun 30 15:38:00 2017
+// Update Count     : 2415
 //
 …
 %token ATTRIBUTE EXTENSION                                                              // GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
 %token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT WITH   // CFA
+%token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT        // CFA
 %token ASM                                                                                              // C99, extension ISO/IEC 9899:1999 Section J.5.10(1)
 %token ALIGNAS ALIGNOF GENERIC STATICASSERT                             // C11
 …
 // statements
 %type<sn> labeled_statement                             compound_statement                      expression_statement            selection_statement
+%type<sn> iteration_statement                   jump_statement
+%type<sn> with_statement                                exception_statement                     asm_statement
+%type<sn> iteration_statement                   jump_statement                          exception_statement                     asm_statement
 %type<sn> fall_through_opt                              fall_through
 %type<sn> statement                                             statement_list
 %type<sn> block_item_list                               block_item
 %type<sn> with_clause_opt
+%type<sn> case_clause
 %type<en> case_value
 %type<sn> case_clause                                   case_value_list                         case_label                                      case_label_list
+%type<sn> case_value_list                               case_label                                      case_label_list
 %type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
 %type<sn> /* handler_list */                    handler_clause                          finally_clause
 …
         | iteration_statement
         | jump_statement
-        | with_statement
         | exception_statement
         | asm_statement
 …
         | THROWRESUME assignment_expression_opt AT assignment_expression ';' // handles reresume
                 { $$ = new StatementNode( build_resume_at( $2, $4 ) ); }
+        ;
-with_statement:
-        WITH identifier_list compound_statement
-                { $$ = (StatementNode *)0; }                                    // FIX ME
+        ;
 …
+                {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
                         linkage = LinkageSpec::linkageUpdate( linkage, $2 );
+                        linkage = LinkageSpec::linkageCheck( $2 );
+                }
           '{' external_definition_list_opt '}'
 …
+        ;
-with_clause_opt:
-        // empty
-                { $$ = (StatementNode *)0; }                                    // FIX ME
-        | WITH identifier_list
-                { $$ = (StatementNode *)0; }                                    // FIX ME
+        ;
 function_definition:
         cfa_function_declaration with_clause_opt compound_statement     // CFA
+        cfa_function_declaration compound_statement                     // CFA
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $1->addFunctionBody( $3 );
+                }
         | declaration_specifier function_declarator with_clause_opt compound_statement
+                        $$ = $1->addFunctionBody( $2 );
+                }
+        | declaration_specifier function_declarator compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addFunctionBody( $4 )->addType( $1 );
+                }
         | type_qualifier_list function_declarator with_clause_opt compound_statement
+                        $$ = $2->addFunctionBody( $3 )->addType( $1 );
+                }
+        | type_qualifier_list function_declarator compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 );
+                }
         | declaration_qualifier_list function_declarator with_clause_opt compound_statement
+                        $$ = $2->addFunctionBody( $3 )->addQualifiers( $1 );
+                }
+        | declaration_qualifier_list function_declarator compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 );
+                }
         | declaration_qualifier_list type_qualifier_list function_declarator with_clause_opt compound_statement
+                        $$ = $2->addFunctionBody( $3 )->addQualifiers( $1 );
+                }
+        | declaration_qualifier_list type_qualifier_list function_declarator compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $3->addFunctionBody( $5 )->addQualifiers( $2 )->addQualifiers( $1 );
+                        $$ = $3->addFunctionBody( $4 )->addQualifiers( $2 )->addQualifiers( $1 );
+                }
                 // Old-style K&R function definition, OBSOLESCENT (see 4)
         | declaration_specifier KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+        | declaration_specifier KR_function_declarator push KR_declaration_list_opt compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addType( $1 );
+                }
         | type_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+                        $$ = $2->addOldDeclList( $4 )->addFunctionBody( $5 )->addType( $1 );
+                }
+        | type_qualifier_list KR_function_declarator push KR_declaration_list_opt compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $1 );
+                        $$ = $2->addOldDeclList( $4 )->addFunctionBody( $5 )->addQualifiers( $1 );
+                }
                 // Old-style K&R function definition with "implicit int" type_specifier, OBSOLESCENT (see 4)
         | declaration_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+        | declaration_qualifier_list KR_function_declarator push KR_declaration_list_opt compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $1 );
+                }
         | declaration_qualifier_list type_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+                        $$ = $2->addOldDeclList( $4 )->addFunctionBody( $5 )->addQualifiers( $1 );
+                }
+        | declaration_qualifier_list type_qualifier_list KR_function_declarator push KR_declaration_list_opt compound_statement
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
                         $$ = $3->addOldDeclList( $5 )->addFunctionBody( $7 )->addQualifiers( $2 )->addQualifiers( $1 );
+                        $$ = $3->addOldDeclList( $5 )->addFunctionBody( $6 )->addQualifiers( $2 )->addQualifiers( $1 );
+                }
+        ;
 …
         | TYPEGENname
         | CONST
                 { $$ = Token{ new string( "__const__" ), { nullptr, -1 } }; }
+                { $$ = Token{ new string( "__const__" ) }; }
+        ;

src/ResolvExpr/CurrentObject.cc

r3d4b23fa	r55a68c3
114	114	}
115	115
116		virtual void print( std::ostream & out, ~~__attribute__((unused))~~ Indenter indent ) const {
	116	virtual void print( std::ostream & out, Indenter indent ) const {
117	117	out << "SimpleIterator(" << type << ")";
118	118	}

src/benchmark/CorCtxSwitch.c

-              r3d4b23fa
+              r55a68c3
         StartTime = Time();
+        // for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
+        //      resume( this_coroutine() );
+        //      // resume( &s );
+        // }
         resumer( &s, NoOfTimes );
         EndTime = Time();

src/benchmark/Makefile.am

-              r3d4b23fa
+              r55a68c3
 CC = @CFA_BINDIR@/@CFA_NAME@
 noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) ctxswitch-thread$(EXEEXT) sched-int$(EXEEXT) monitor$(EXEEXT) csv-data$(EXEEXT)
+noinst_PROGRAMS = bench ctxswitch-coroutine ctxswitch-thread
 bench$(EXEEXT) :
+bench :
         @for ccflags in "-debug" "-nodebug"; do \
                 echo ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -lrt bench.c;\
 …
         rm -f ./a.out ;
 ctxswitch-coroutine$(EXEEXT):
+ctxswitch-coroutine:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 CorCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 ctxswitch-thread$(EXEEXT):
+ctxswitch-thread:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 sched-int$(EXEEXT):
+sched-int:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 SchedInt.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 monitor$(EXEEXT):
+monitor:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 Monitor.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 csv-data$(EXEEXT):
+csv-data:
         @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c
         @./a.out

src/benchmark/Makefile.in

-              r3d4b23fa
+              r55a68c3
 build_triplet = @build@
 host_triplet = @host@
+noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) \
+        ctxswitch-thread$(EXEEXT)
 subdir = src/benchmark
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 …
 bench_OBJECTS = bench.$(OBJEXT)
 bench_LDADD = $(LDADD)
-csv_data_SOURCES = csv-data.c
-csv_data_OBJECTS = csv-data.$(OBJEXT)
-csv_data_LDADD = $(LDADD)
 ctxswitch_coroutine_SOURCES = ctxswitch-coroutine.c
 ctxswitch_coroutine_OBJECTS = ctxswitch-coroutine.$(OBJEXT)
 …
 ctxswitch_thread_OBJECTS = ctxswitch-thread.$(OBJEXT)
 ctxswitch_thread_LDADD = $(LDADD)
-monitor_SOURCES = monitor.c
-monitor_OBJECTS = monitor.$(OBJEXT)
-monitor_LDADD = $(LDADD)
-sched_int_SOURCES = sched-int.c
-sched_int_OBJECTS = sched-int.$(OBJEXT)
-sched_int_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 …
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 =
+SOURCES = bench.c csv-data.c ctxswitch-coroutine.c ctxswitch-thread.c \
+        monitor.c sched-int.c
+DIST_SOURCES = bench.c csv-data.c ctxswitch-coroutine.c \
+        ctxswitch-thread.c monitor.c sched-int.c
+SOURCES = bench.c ctxswitch-coroutine.c ctxswitch-thread.c
+DIST_SOURCES = bench.c ctxswitch-coroutine.c ctxswitch-thread.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
 …
 top_srcdir = @top_srcdir@
 AM_CFLAGS = -g -Wall -Wno-unused-function -O2
-noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) ctxswitch-thread$(EXEEXT) sched-int$(EXEEXT) monitor$(EXEEXT) csv-data$(EXEEXT)
 all: all-am
 …
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/benchmark/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/benchmark/Makefile'; \
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/benchmark/Makefile
+          $(AUTOMAKE) --gnu src/benchmark/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bench.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csv-data.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctxswitch-coroutine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctxswitch-thread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/monitor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sched-int.Po@am__quote@
 .c.o:
 …
 bench$(EXEEXT) :
+bench :
         @for ccflags in "-debug" "-nodebug"; do \
                 echo ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -lrt bench.c;\
 …
         rm -f ./a.out ;
 ctxswitch-coroutine$(EXEEXT):
+ctxswitch-coroutine:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 CorCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 ctxswitch-thread$(EXEEXT):
+ctxswitch-thread:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 sched-int$(EXEEXT):
+sched-int:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 SchedInt.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 monitor$(EXEEXT):
+monitor:
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 Monitor.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
 …
         @rm -f ./a.out
 csv-data$(EXEEXT):
+csv-data:
         @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c
         @./a.out

src/benchmark/bench.h

r3d4b23fa	r55a68c3
26	26	#define N 10000000
27	27	#endif
28
29		~~unsigned int default_preemption() {~~
30		~~return 0;~~
31		}

src/benchmark/create_pthrd.c

-              r3d4b23fa
+              r55a68c3
         for (size_t i = 0; i < n; i++) {
                 pthread_t thread;
                 if (pthread_create(&thread, NULL, foo, NULL) < 0) {
+                pthread_attr_t attr;
+                if (pthread_attr_init(&attr) < 0) {
                         return 1;
+                }
+                if (pthread_join( thread, NULL) < 0) {
+                if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) < 0) {
+                        return 1;
+                }
+                pthread_t thread;
+                if (pthread_create(&thread, &attr, foo, NULL) < 0) {
                         return 1;
+                }

src/benchmark/csv-data.c

-              r3d4b23fa
+              r55a68c3
+}
+#ifndef N
+#define N 100000000
+#endif
 //-----------------------------------------------------------------------------
 // coroutine context switch
 …
         StartTime = Time();
+        // for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
+        //      resume( this_coroutine() );
+        //      // resume( &s );
+        // }
         resumer( &s, NoOfTimes );
         EndTime = Time();
 …
 mon_t mon1;
 condition cond1a;
+condition cond1a;
 condition cond1b;
 …
 mon_t mon2;
 condition cond2a;
+condition cond2a;
 condition cond2b;

src/driver/Makefile.in

-              r3d4b23fa
+              r55a68c3
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/driver/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/driver/Makefile'; \
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/driver/Makefile
+          $(AUTOMAKE) --gnu src/driver/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \

src/examples/Makefile.in

-              r3d4b23fa
+              r55a68c3
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/examples/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/examples/Makefile'; \
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/examples/Makefile
+          $(AUTOMAKE) --gnu src/examples/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \

src/include/assert.h

r3d4b23fa	r55a68c3
15	15
16	16	#pragma once
17		~~// Pragmas for header cleanup tool~~
18		~~// IWYU pragma: private, include <cassert>~~
19	17
20	18	#include_next <assert.h>

src/libcfa/Makefile.am

r3d4b23fa	r55a68c3
17	17	# create object files in directory with source files
18	18	AUTOMAKE_OPTIONS = subdir-objects
19		~~ARFLAGS = cr~~
20	19
21	20	libdir = ${CFA_LIBDIR}

src/libcfa/Makefile.in

-              r3d4b23fa
+              r55a68c3
 LIBRARIES = $(lib_LIBRARIES)
 AR = ar
+ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 …
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = subdir-objects
-ARFLAGS = cr
 lib_LIBRARIES = $(am__append_1) $(am__append_2)
 EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
 …
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libcfa/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libcfa/Makefile'; \
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/libcfa/Makefile
+          $(AUTOMAKE) --gnu src/libcfa/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \

src/libcfa/concurrency/CtxSwitch-i386.S

-              r3d4b23fa
+              r55a68c3
         ret
+.text
+        .align 2
+.globl  CtxGet
+CtxGet:
+        movl %esp,SP_OFFSET(%eax)
+        movl %ebp,FP_OFFSET(%eax)
+        ret
 // Local Variables: //
 // compile-command: "make install" //

src/libcfa/concurrency/CtxSwitch-x86_64.S

-              r3d4b23fa
+              r55a68c3
 //                               -*- Mode: Asm -*-
+//                               -*- Mode: Asm -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 …
 // Free Software  Foundation; either  version 2.1 of  the License, or  (at your
 // option) any later version.
 //
+//
 // This library is distributed in the  hope that it will be useful, but WITHOUT
 // ANY  WARRANTY;  without even  the  implied  warranty  of MERCHANTABILITY  or
 // FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
 // for more details.
 //
+//
 // You should  have received a  copy of the  GNU Lesser General  Public License
 // along  with this library.
 //
+//
 // This context switch routine depends on the fact that the stack of a new
 …
 .globl  CtxInvokeStub
 CtxInvokeStub:
         movq %rbx, %rdi
+        movq %rbx, %rdi
         jmp *%r12
+.text
+        .align 2
+.globl  CtxGet
+CtxGet:
+        movq %rsp,SP_OFFSET(%rdi)
+        movq %rbp,FP_OFFSET(%rdi)
+        ret
 // Local Variables: //

src/libcfa/concurrency/alarm.c

-              r3d4b23fa
+              r55a68c3
 extern "C" {
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
-#include <unistd.h>
 #include <sys/time.h>
+}
-#include "libhdr.h"
 #include "alarm.h"
 …
         timespec curr;
         clock_gettime( CLOCK_REALTIME, &curr );
+        __cfa_time_t curr_time = ((__cfa_time_t)curr.tv_sec * TIMEGRAN) + curr.tv_nsec;
+        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : current time is %lu\n", curr_time );
+        return curr_time;
+        return ((__cfa_time_t)curr.tv_sec * TIMEGRAN) + curr.tv_nsec;
+}
 void __kernel_set_timer( __cfa_time_t alarm ) {
-        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : set timer to %lu\n", (__cfa_time_t)alarm );
         itimerval val;
         val.it_value.tv_sec = alarm / TIMEGRAN;                 // seconds
 …
+}
-LIB_DEBUG_DO( bool validate( alarm_list_t * this ) {
-        alarm_node_t ** it = &this->head;
-        while( (*it) ) {
-                it = &(*it)->next;
+        }
-        return it == this->tail;
-})
 static inline void insert_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t p ) {
         verify( !n->next );
+        assert( !n->next );
         if( p == this->tail ) {
                 this->tail = &n->next;
 …
+        }
         *p = n;
-        verify( validate( this ) );
+}
 …
         insert_at( this, n, it );
-        verify( validate( this ) );
+}
 …
                 head->next = NULL;
+        }
-        verify( validate( this ) );
         return head;
+}
 …
 static inline void remove_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t it ) {
         verify( it );
         verify( (*it) == n );
+        verify( (*it)->next == n );
         (*it) = n->next;
+        (*it)->next = n->next;
         if( !n-> next ) {
                 this->tail = it;
+        }
         n->next = NULL;
-        verify( validate( this ) );
+}
 static inline void remove( alarm_list_t * this, alarm_node_t * n ) {
         alarm_node_t ** it = &this->head;
         while( (*it) && (*it) != n ) {
+        while( (*it) && (*it)->next != n ) {
                 it = &(*it)->next;
+        }
-        verify( validate( this ) );
         if( *it ) { remove_at( this, n, it ); }
-        verify( validate( this ) );
+}
 void register_self( alarm_node_t * this ) {
         disable_interrupts();
         verify( !systemProcessor->pending_alarm );
         lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
+        assert( !systemProcessor->pending_alarm );
+        lock( &systemProcessor->alarm_lock );
+        {
-                verify( validate( &systemProcessor->alarms ) );
-                bool first = !systemProcessor->alarms.head;
                 insert( &systemProcessor->alarms, this );
                 if( systemProcessor->pending_alarm ) {
                         tick_preemption();
+                }
-                if( first ) {
-                        __kernel_set_timer( systemProcessor->alarms.head->alarm - __kernel_get_time() );
+                }
+        }
         unlock( &systemProcessor->alarm_lock );
         this->set = true;
         enable_interrupts( DEBUG_CTX );
+        enable_interrupts();
+}
 void unregister_self( alarm_node_t * this ) {
-        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : unregister %p start\n", this );
         disable_interrupts();
+        lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
+        {
+                verify( validate( &systemProcessor->alarms ) );
+                remove( &systemProcessor->alarms, this );
+        }
+        lock( &systemProcessor->alarm_lock );
+        remove( &systemProcessor->alarms, this );
         unlock( &systemProcessor->alarm_lock );
         enable_interrupts( DEBUG_CTX );
+        disable_interrupts();
         this->set = false;
-        // LIB_DEBUG_PRINT_BUFFER_LOCAL( STDERR_FILENO, "Kernel : unregister %p end\n", this );
+}

src/libcfa/concurrency/coroutine

-              r3d4b23fa
+              r55a68c3
 // Get current coroutine
 extern volatile thread_local coroutine_desc * this_coroutine;
+coroutine_desc * this_coroutine(void);
 // Private wrappers for context switch and stack creation
 …
 // Suspend implementation inlined for performance
 static inline void suspend() {
         coroutine_desc * src = this_coroutine;          // optimization
+        coroutine_desc * src = this_coroutine();                // optimization
         assertf( src->last != 0,
 …
 forall(dtype T | is_coroutine(T))
 static inline void resume(T * cor) {
         coroutine_desc * src = this_coroutine;          // optimization
+        coroutine_desc * src = this_coroutine();                // optimization
         coroutine_desc * dst = get_coroutine(cor);
 …
 static inline void resume(coroutine_desc * dst) {
         coroutine_desc * src = this_coroutine;          // optimization
+        coroutine_desc * src = this_coroutine();                // optimization
         // not resuming self ?

src/libcfa/concurrency/coroutine.c

-              r3d4b23fa
+              r55a68c3
 #include "invoke.h"
 extern volatile thread_local processor * this_processor;
+extern thread_local processor * this_processor;
 //-----------------------------------------------------------------------------
 …
 // Coroutine ctors and dtors
 void ?{}(coStack_t* this) {
         this->size              = 65000;        // size of stack
+        this->size              = 10240;        // size of stack
         this->storage   = NULL; // pointer to stack
         this->limit             = NULL; // stack grows towards stack limit
 …
         this->context   = NULL; // address of cfa_context_t
         this->top               = NULL; // address of top of storage
         this->userStack = false;
+        this->userStack = false;
+}
 …
         // set state of current coroutine to inactive
         src->state = src->state == Halted ? Halted : Inactive;
+        src->state = Inactive;
         // set new coroutine that task is executing
         this_coroutine = dst;
+        this_processor->current_coroutine = dst;
         // context switch to specified coroutine
-        assert( src->stack.context );
         CtxSwitch( src->stack.context, dst->stack.context );
         // when CtxSwitch returns we are back in the src coroutine
+        // when CtxSwitch returns we are back in the src coroutine
         // set state of new coroutine to active
 …
                 this->size = libCeiling( storageSize, 16 );
                 // use malloc/memalign because "new" raises an exception for out-of-memory
                 // assume malloc has 8 byte alignment so add 8 to allow rounding up to 16 byte alignment
                 LIB_DEBUG_DO( this->storage = memalign( pageSize, cxtSize + this->size + pageSize ) );

src/libcfa/concurrency/invoke.c

-              r3d4b23fa
+              r55a68c3
 extern void __suspend_internal(void);
+extern void __leave_thread_monitor( struct thread_desc * this );
+extern void disable_interrupts();
+extern void enable_interrupts( DEBUG_CTX_PARAM );
+extern void __leave_monitor_desc( struct monitor_desc * this );
 void CtxInvokeCoroutine(
       void (*main)(void *),
       struct coroutine_desc *(*get_coroutine)(void *),
+      void (*main)(void *),
+      struct coroutine_desc *(*get_coroutine)(void *),
       void *this
 ) {
 …
 void CtxInvokeThread(
       void (*dtor)(void *),
       void (*main)(void *),
       struct thread_desc *(*get_thread)(void *),
+      void (*dtor)(void *),
+      void (*main)(void *),
+      struct thread_desc *(*get_thread)(void *),
       void *this
 ) {
-      // First suspend, once the thread arrives here,
-      // the function pointer to main can be invalidated without risk
       __suspend_internal();
-      // Fetch the thread handle from the user defined thread structure
       struct thread_desc* thrd = get_thread( this );
+      struct coroutine_desc* cor = &thrd->cor;
+      struct monitor_desc* mon = &thrd->mon;
+      cor->state = Active;
+      // Officially start the thread by enabling preemption
+      enable_interrupts( DEBUG_CTX );
+      // Call the main of the thread
+      // LIB_DEBUG_PRINTF("Invoke Thread : invoking main %p (args %p)\n", main, this);
       main( this );
+      // To exit a thread we must :
+      // 1 - Mark it as halted
+      // 2 - Leave its monitor
+      // 3 - Disable the interupts
+      // 4 - Final suspend
+      // The order of these 4 operations is very important
+      __leave_monitor_desc( mon );
       //Final suspend, should never return
       __leave_thread_monitor( thrd );
+      __suspend_internal();
       abortf("Resumed dead thread");
+}
 …
 void CtxStart(
       void (*main)(void *),
       struct coroutine_desc *(*get_coroutine)(void *),
       void *this,
+      void (*main)(void *),
+      struct coroutine_desc *(*get_coroutine)(void *),
+      void *this,
       void (*invoke)(void *)
 ) {
 …
         ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = invoke;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->mxcr = 0x1F80; //Vol. 2A 3-520
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
 #elif defined( __x86_64__ )
 …
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->mxcr = 0x1F80; //Vol. 2A 3-520
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
 #else
       #error Only __i386__ and __x86_64__ is supported for threads in cfa

src/libcfa/concurrency/invoke.h

-              r3d4b23fa
+              r55a68c3
       struct spinlock {
             volatile int lock;
-            #ifdef __CFA_DEBUG__
-                  const char * prev_name;
-                  void* prev_thrd;
-            #endif
       };
 …
             struct __thread_queue_t entry_queue;      // queue of threads that are blocked waiting for the monitor
             struct __condition_stack_t signal_stack;  // stack of conditions to run next once we exit the monitor
+            struct monitor_desc * stack_owner;        // if bulk acquiring was used we need to synchronize signals with an other monitor
             unsigned int recursion;                   // monitor routines can be called recursively, we need to keep track of that
       };
 …
 #ifndef _INVOKE_PRIVATE_H_
 #define _INVOKE_PRIVATE_H_
       struct machine_context_t {
             void *SP;
 …
       extern void CtxInvokeStub( void );
       void CtxSwitch( void * from, void * to ) asm ("CtxSwitch");
+      #if   defined( __x86_64__ )
+      #define CtxGet( ctx ) __asm__ ( \
+                  "movq %%rsp,%0\n"   \
+                  "movq %%rbp,%1\n"   \
+            : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+      #elif defined( __i386__ )
+      #define CtxGet( ctx ) __asm__ ( \
+                  "movl %%esp,%0\n"   \
+                  "movl %%ebp,%1\n"   \
+            : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+      #endif
+      void CtxGet( void * this ) asm ("CtxGet");
 #endif //_INVOKE_PRIVATE_H_

src/libcfa/concurrency/kernel

-              r3d4b23fa
+              r55a68c3
 //-----------------------------------------------------------------------------
 // Locks
+bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );
+void lock      ( spinlock * DEBUG_CTX_PARAM2 );
+void lock_yield( spinlock * DEBUG_CTX_PARAM2 );
+void unlock    ( spinlock * );
+bool try_lock( spinlock * );
+void lock( spinlock * );
+void unlock( spinlock * );
 struct semaphore {
         spinlock lock;
         int count;
         __thread_queue_t waiting;
+struct signal_once {
+        volatile bool cond;
+        struct spinlock lock;
+        struct __thread_queue_t blocked;
 };
+void  ?{}(semaphore * this, int count = 1);
+void ^?{}(semaphore * this);
+void P(semaphore * this);
+void V(semaphore * this);
+void ?{}(signal_once * this);
+void ^?{}(signal_once * this);
+void wait( signal_once * );
+void signal( signal_once * );
 //-----------------------------------------------------------------------------
 …
         unsigned short thrd_count;
 };
 static inline void ?{}(FinishAction * this) {
+static inline void ?{}(FinishAction * this) {
         this->action_code = No_Action;
         this->thrd = NULL;
 …
         struct processorCtx_t * runner;
         cluster * cltr;
+        coroutine_desc * current_coroutine;
+        thread_desc * current_thread;
         pthread_t kernel_thread;
         semaphore terminated;
+        signal_once terminated;
         volatile bool is_terminated;
 …
         unsigned int preemption;
+        unsigned short disable_preempt_count;
         bool pending_preemption;
-        char * last_enable;
 };

src/libcfa/concurrency/kernel.c

-              r3d4b23fa
+              r55a68c3
 //
+#include "libhdr.h"
+#include "startup.h"
+//Start and stop routine for the kernel, declared first to make sure they run first
+void kernel_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
+void kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) ));
+//Header
+#include "kernel_private.h"
 //C Includes
 …
 //CFA Includes
 #include "kernel_private.h"
+#include "libhdr.h"
 #include "preemption.h"
-#include "startup.h"
 //Private includes
 …
 #include "invoke.h"
-//Start and stop routine for the kernel, declared first to make sure they run first
-void kernel_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
-void kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) ));
 //-----------------------------------------------------------------------------
 // Kernel storage
 #define KERNEL_STORAGE(T,X) static char X##Storage[sizeof(T)]
+#define KERNEL_STORAGE(T,X) static char X##_storage[sizeof(T)]
 KERNEL_STORAGE(processorCtx_t, systemProcessorCtx);
 …
 KERNEL_STORAGE(system_proc_t, systemProcessor);
 KERNEL_STORAGE(thread_desc, mainThread);
 KERNEL_STORAGE(machine_context_t, mainThreadCtx);
+KERNEL_STORAGE(machine_context_t, mainThread_context);
 cluster * systemCluster;
 …
 // Global state
+volatile thread_local processor * this_processor;
+volatile thread_local coroutine_desc * this_coroutine;
+volatile thread_local thread_desc * this_thread;
+volatile thread_local bool preemption_in_progress = 0;
+volatile thread_local unsigned short disable_preempt_count = 1;
+thread_local processor * this_processor;
+coroutine_desc * this_coroutine(void) {
+        return this_processor->current_coroutine;
+}
+thread_desc * this_thread(void) {
+        return this_processor->current_thread;
+}
 //-----------------------------------------------------------------------------
 // Main thread construction
 struct current_stack_info_t {
         machine_context_t ctx;
+        machine_context_t ctx;
         unsigned int size;              // size of stack
         void *base;                             // base of stack
 …
 void ?{}( current_stack_info_t * this ) {
         CtxGet( this->ctx );
+        CtxGet( &this->ctx );
         this->base = this->ctx.FP;
         this->storage = this->ctx.SP;
 …
         this->limit = (void *)(((intptr_t)this->base) - this->size);
         this->context = &mainThreadCtxStorage;
+        this->context = &mainThread_context_storage;
         this->top = this->base;
+}
 …
 void ?{}( coroutine_desc * this, current_stack_info_t * info) {
         (&this->stack){ info };
+        (&this->stack){ info };
         this->name = "Main Thread";
         this->errno_ = 0;
 …
 void ?{}(processor * this, cluster * cltr) {
         this->cltr = cltr;
+        (&this->terminated){ 0 };
+        this->current_coroutine = NULL;
+        this->current_thread = NULL;
+        (&this->terminated){};
         this->is_terminated = false;
         this->preemption_alarm = NULL;
         this->preemption = default_preemption();
+        this->disable_preempt_count = 1;                //Start with interrupts disabled
         this->pending_preemption = false;
 …
 void ?{}(processor * this, cluster * cltr, processorCtx_t * runner) {
         this->cltr = cltr;
+        (&this->terminated){ 0 };
+        this->current_coroutine = NULL;
+        this->current_thread = NULL;
+        (&this->terminated){};
         this->is_terminated = false;
+        this->preemption_alarm = NULL;
+        this->preemption = default_preemption();
+        this->disable_preempt_count = 0;
         this->pending_preemption = false;
-        this->kernel_thread = pthread_self();
         this->runner = runner;
         LIB_DEBUG_PRINT_SAFE("Kernel : constructing system processor context %p\n", runner);
+        LIB_DEBUG_PRINT_SAFE("Kernel : constructing processor context %p\n", runner);
         runner{ this };
+}
-LIB_DEBUG_DO( bool validate( alarm_list_t * this ); )
 void ?{}(system_proc_t * this, cluster * cltr, processorCtx_t * runner) {
 …
         (&this->proc){ cltr, runner };
-        verify( validate( &this->alarms ) );
+}
 …
                 LIB_DEBUG_PRINT_SAFE("Kernel : core %p signaling termination\n", this);
                 this->is_terminated = true;
+                P( &this->terminated );
+                pthread_join( this->kernel_thread, NULL );
+                wait( &this->terminated );
+        }
+}
 …
 void ^?{}(cluster * this) {
+}
 …
                 thread_desc * readyThread = NULL;
                 for( unsigned int spin_count = 0; ! this->is_terminated; spin_count++ )
+                for( unsigned int spin_count = 0; ! this->is_terminated; spin_count++ )
+                {
                         readyThread = nextThread( this->cltr );
 …
                         if(readyThread)
+                        {
-                                verify( disable_preempt_count > 0 );
                                 runThread(this, readyThread);
-                                verify( disable_preempt_count > 0 );
                                 //Some actions need to be taken from the kernel
 …
+        }
+        V( &this->terminated );
+        signal( &this->terminated );
         LIB_DEBUG_PRINT_SAFE("Kernel : core %p terminated\n", this);
+}
 // runThread runs a thread by context switching
 // from the processor coroutine to the target thread
+// runThread runs a thread by context switching
+// from the processor coroutine to the target thread
 void runThread(processor * this, thread_desc * dst) {
         coroutine_desc * proc_cor = get_coroutine(this->runner);
         coroutine_desc * thrd_cor = get_coroutine(dst);
         //Reset the terminating actions here
         this->finish.action_code = No_Action;
         //Update global state
         this_thread = dst;
+        this->current_thread = dst;
         // Context Switch to the thread
 …
+}
 // Once a thread has finished running, some of
+// Once a thread has finished running, some of
 // its final actions must be executed from the kernel
 void finishRunning(processor * this) {
 …
+        }
         else if( this->finish.action_code == Release_Schedule ) {
                 unlock( this->finish.lock );
+                unlock( this->finish.lock );
                 ScheduleThread( this->finish.thrd );
+        }
 …
         processor * proc = (processor *) arg;
         this_processor = proc;
-        this_coroutine = NULL;
-        this_thread = NULL;
-        disable_preempt_count = 1;
         // SKULLDUGGERY: We want to create a context for the processor coroutine
         // which is needed for the 2-step context switch. However, there is no reason
         // to waste the perfectly valid stack create by pthread.
+        // to waste the perfectly valid stack create by pthread.
         current_stack_info_t info;
         machine_context_t ctx;
 …
         //Set global state
         this_coroutine = &proc->runner->__cor;
         this_thread = NULL;
+        proc->current_coroutine = &proc->runner->__cor;
+        proc->current_thread = NULL;
         //We now have a proper context from which to schedule threads
         LIB_DEBUG_PRINT_SAFE("Kernel : core %p created (%p, %p)\n", proc, proc->runner, &ctx);
         // SKULLDUGGERY: Since the coroutine doesn't have its own stack, we can't
         // resume it to start it like it normally would, it will just context switch
         // back to here. Instead directly call the main since we already are on the
+        // SKULLDUGGERY: Since the coroutine doesn't have its own stack, we can't
+        // resume it to start it like it normally would, it will just context switch
+        // back to here. Instead directly call the main since we already are on the
         // appropriate stack.
         proc_cor_storage.__cor.state = Active;
 …
         // Main routine of the core returned, the core is now fully terminated
         LIB_DEBUG_PRINT_SAFE("Kernel : core %p main ended (%p)\n", proc, proc->runner);
+        LIB_DEBUG_PRINT_SAFE("Kernel : core %p main ended (%p)\n", proc, proc->runner);
         return NULL;
 …
 void start(processor * this) {
         LIB_DEBUG_PRINT_SAFE("Kernel : Starting core %p\n", this);
         pthread_create( &this->kernel_thread, NULL, CtxInvokeProcessor, (void*)this );
         LIB_DEBUG_PRINT_SAFE("Kernel : core %p started\n", this);
+        LIB_DEBUG_PRINT_SAFE("Kernel : core %p started\n", this);
+}
 …
 // Scheduler routines
 void ScheduleThread( thread_desc * thrd ) {
+        // if( !thrd ) return;
+        assert( thrd );
+        assert( thrd->cor.state != Halted );
+        verify( disable_preempt_count > 0 );
+        if( !thrd ) return;
         verifyf( thrd->next == NULL, "Expected null got %p", thrd->next );
         lock( &systemProcessor->proc.cltr->lock DEBUG_CTX2 );
+        lock( &systemProcessor->proc.cltr->lock );
         append( &systemProcessor->proc.cltr->ready_queue, thrd );
         unlock( &systemProcessor->proc.cltr->lock );
-        verify( disable_preempt_count > 0 );
+}
 thread_desc * nextThread(cluster * this) {
+        verify( disable_preempt_count > 0 );
+        lock( &this->lock DEBUG_CTX2 );
+        lock( &this->lock );
         thread_desc * head = pop_head( &this->ready_queue );
         unlock( &this->lock );
-        verify( disable_preempt_count > 0 );
         return head;
+}
+void BlockInternal() {
+        disable_interrupts();
+        verify( disable_preempt_count > 0 );
+void ScheduleInternal() {
         suspend();
+        verify( disable_preempt_count > 0 );
+        enable_interrupts( DEBUG_CTX );
+}
+void BlockInternal( spinlock * lock ) {
+        disable_interrupts();
+}
+void ScheduleInternal( spinlock * lock ) {
         this_processor->finish.action_code = Release;
         this_processor->finish.lock = lock;
-        verify( disable_preempt_count > 0 );
         suspend();
+        verify( disable_preempt_count > 0 );
+        enable_interrupts( DEBUG_CTX );
+}
+void BlockInternal( thread_desc * thrd ) {
+        disable_interrupts();
+        assert( thrd->cor.state != Halted );
+}
+void ScheduleInternal( thread_desc * thrd ) {
         this_processor->finish.action_code = Schedule;
         this_processor->finish.thrd = thrd;
-        verify( disable_preempt_count > 0 );
         suspend();
+        verify( disable_preempt_count > 0 );
+        enable_interrupts( DEBUG_CTX );
+}
+void BlockInternal( spinlock * lock, thread_desc * thrd ) {
+        disable_interrupts();
+}
+void ScheduleInternal( spinlock * lock, thread_desc * thrd ) {
         this_processor->finish.action_code = Release_Schedule;
         this_processor->finish.lock = lock;
         this_processor->finish.thrd = thrd;
-        verify( disable_preempt_count > 0 );
         suspend();
+        verify( disable_preempt_count > 0 );
+        enable_interrupts( DEBUG_CTX );
+}
+void BlockInternal(spinlock ** locks, unsigned short count) {
+        disable_interrupts();
+}
+void ScheduleInternal(spinlock ** locks, unsigned short count) {
         this_processor->finish.action_code = Release_Multi;
         this_processor->finish.locks = locks;
         this_processor->finish.lock_count = count;
-        verify( disable_preempt_count > 0 );
         suspend();
+        verify( disable_preempt_count > 0 );
+        enable_interrupts( DEBUG_CTX );
+}
+void BlockInternal(spinlock ** locks, unsigned short lock_count, thread_desc ** thrds, unsigned short thrd_count) {
+        disable_interrupts();
+}
+void ScheduleInternal(spinlock ** locks, unsigned short lock_count, thread_desc ** thrds, unsigned short thrd_count) {
         this_processor->finish.action_code = Release_Multi_Schedule;
         this_processor->finish.locks = locks;
 …
         this_processor->finish.thrds = thrds;
         this_processor->finish.thrd_count = thrd_count;
-        verify( disable_preempt_count > 0 );
-        suspend();
-        verify( disable_preempt_count > 0 );
-        enable_interrupts( DEBUG_CTX );
+}
-void LeaveThread(spinlock * lock, thread_desc * thrd) {
-        verify( disable_preempt_count > 0 );
-        this_processor->finish.action_code = thrd ? Release_Schedule : Release;
-        this_processor->finish.lock = lock;
-        this_processor->finish.thrd = thrd;
         suspend();
+}
 …
 // Kernel boot procedures
 void kernel_startup(void) {
         LIB_DEBUG_PRINT_SAFE("Kernel : Starting\n");
+        LIB_DEBUG_PRINT_SAFE("Kernel : Starting\n");
         // Start by initializing the main thread
         // SKULLDUGGERY: the mainThread steals the process main thread
+        // SKULLDUGGERY: the mainThread steals the process main thread
         // which will then be scheduled by the systemProcessor normally
         mainThread = (thread_desc *)&mainThreadStorage;
+        mainThread = (thread_desc *)&mainThread_storage;
         current_stack_info_t info;
         mainThread{ &info };
 …
         LIB_DEBUG_PRINT_SAFE("Kernel : Main thread ready\n");
+        // Enable preemption
+        kernel_start_preemption();
         // Initialize the system cluster
         systemCluster = (cluster *)&systemClusterStorage;
+        systemCluster = (cluster *)&systemCluster_storage;
         systemCluster{};
 …
         // Initialize the system processor and the system processor ctx
         // (the coroutine that contains the processing control flow)
         systemProcessor = (system_proc_t *)&systemProcessorStorage;
         systemProcessor{ systemCluster, (processorCtx_t *)&systemProcessorCtxStorage };
         // Add the main thread to the ready queue
+        systemProcessor = (system_proc_t *)&systemProcessor_storage;
+        systemProcessor{ systemCluster, (processorCtx_t *)&systemProcessorCtx_storage };
+        // Add the main thread to the ready queue
         // once resume is called on systemProcessor->runner the mainThread needs to be scheduled like any normal thread
         ScheduleThread(mainThread);
 …
         //initialize the global state variables
         this_processor = &systemProcessor->proc;
+        this_thread = mainThread;
+        this_coroutine = &mainThread->cor;
+        disable_preempt_count = 1;
+        // Enable preemption
+        kernel_start_preemption();
+        this_processor->current_thread = mainThread;
+        this_processor->current_coroutine = &mainThread->cor;
         // SKULLDUGGERY: Force a context switch to the system processor to set the main thread's context to the current UNIX
         // context. Hence, the main thread does not begin through CtxInvokeThread, like all other threads. The trick here is that
         // mainThread is on the ready queue when this call is made.
+        // mainThread is on the ready queue when this call is made.
         resume( systemProcessor->proc.runner );
 …
         // THE SYSTEM IS NOW COMPLETELY RUNNING
         LIB_DEBUG_PRINT_SAFE("Kernel : Started\n--------------------------------------------------\n\n");
-        enable_interrupts( DEBUG_CTX );
+}
 void kernel_shutdown(void) {
         LIB_DEBUG_PRINT_SAFE("\n--------------------------------------------------\nKernel : Shutting down\n");
-        disable_interrupts();
         // SKULLDUGGERY: Notify the systemProcessor it needs to terminates.
 …
         // THE SYSTEM IS NOW COMPLETELY STOPPED
-        // Disable preemption
-        kernel_stop_preemption();
         // Destroy the system processor and its context in reverse order of construction
         // These were manually constructed so we need manually destroy them
 …
         ^(mainThread){};
         LIB_DEBUG_PRINT_SAFE("Kernel : Shutdown complete\n");
+        LIB_DEBUG_PRINT_SAFE("Kernel : Shutdown complete\n");
+}
 …
         // abort cannot be recursively entered by the same or different processors because all signal handlers return when
         // the globalAbort flag is true.
         lock( &kernel_abort_lock DEBUG_CTX2 );
+        lock( &kernel_abort_lock );
         // first task to abort ?
 …
                 kernel_abort_called = true;
                 unlock( &kernel_abort_lock );
+        }
+        }
         else {
                 unlock( &kernel_abort_lock );
                 sigset_t mask;
                 sigemptyset( &mask );
 …
                 sigaddset( &mask, SIGUSR1 );                    // block SIGUSR1 signals
                 sigsuspend( &mask );                            // block the processor to prevent further damage during abort
                 _exit( EXIT_FAILURE );                          // if processor unblocks before it is killed, terminate it
+        }
         return this_thread;
+                _exit( EXIT_FAILURE );                          // if processor unblocks before it is killed, terminate it
+        }
+        return this_thread();
+}
 …
         __lib_debug_write( STDERR_FILENO, abort_text, len );
         if ( thrd != this_coroutine ) {
                 len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", this_coroutine->name, this_coroutine );
+        if ( thrd != this_coroutine() ) {
+                len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", this_coroutine()->name, this_coroutine() );
                 __lib_debug_write( STDERR_FILENO, abort_text, len );
+        }
+        }
         else {
                 __lib_debug_write( STDERR_FILENO, ".\n", 2 );
 …
 extern "C" {
         void __lib_debug_acquire() {
                 lock( &kernel_debug_lock DEBUG_CTX2 );
+                lock(&kernel_debug_lock);
+        }
         void __lib_debug_release() {
                 unlock( &kernel_debug_lock );
+                unlock(&kernel_debug_lock);
+        }
+}
 …
+}
 bool try_lock( spinlock * this DEBUG_CTX_PARAM2 ) {
+bool try_lock( spinlock * this ) {
         return this->lock == 0 && __sync_lock_test_and_set_4( &this->lock, 1 ) == 0;
+}
 void lock( spinlock * this DEBUG_CTX_PARAM2 ) {
+void lock( spinlock * this ) {
         for ( unsigned int i = 1;; i += 1 ) {
+                if ( this->lock == 0 && __sync_lock_test_and_set_4( &this->lock, 1 ) == 0 ) { break; }
+        }
+        LIB_DEBUG_DO(
+                this->prev_name = caller;
+                this->prev_thrd = this_thread;
+        )
+}
+void lock_yield( spinlock * this DEBUG_CTX_PARAM2 ) {
+        for ( unsigned int i = 1;; i += 1 ) {
+                if ( this->lock == 0 && __sync_lock_test_and_set_4( &this->lock, 1 ) == 0 ) { break; }
+                yield();
+        }
+        LIB_DEBUG_DO(
+                this->prev_name = caller;
+                this->prev_thrd = this_thread;
+        )
+}
+                if ( this->lock == 0 && __sync_lock_test_and_set_4( &this->lock, 1 ) == 0 ) break;
+        }
+}
 void unlock( spinlock * this ) {
 …
+}
+void  ?{}( semaphore * this, int count = 1 ) {
+        (&this->lock){};
+        this->count = count;
+        (&this->waiting){};
+}
+void ^?{}(semaphore * this) {}
+void P(semaphore * this) {
+        lock( &this->lock DEBUG_CTX2 );
+        this->count -= 1;
+        if ( this->count < 0 ) {
+                // queue current task
+                append( &this->waiting, (thread_desc *)this_thread );
+                // atomically release spin lock and block
+                BlockInternal( &this->lock );
+        }
+        else {
+            unlock( &this->lock );
+        }
+}
+void V(semaphore * this) {
+        thread_desc * thrd = NULL;
+        lock( &this->lock DEBUG_CTX2 );
+        this->count += 1;
+        if ( this->count <= 0 ) {
+                // remove task at head of waiting list
+                thrd = pop_head( &this->waiting );
+        }
+void ?{}( signal_once * this ) {
+        this->cond = false;
+}
+void ^?{}( signal_once * this ) {
+}
+void wait( signal_once * this ) {
+        lock( &this->lock );
+        if( !this->cond ) {
+                append( &this->blocked, this_thread() );
+                ScheduleInternal( &this->lock );
+                lock( &this->lock );
+        }
         unlock( &this->lock );
+        // make new owner
+        WakeThread( thrd );
+}
+void signal( signal_once * this ) {
+        lock( &this->lock );
+        {
+                this->cond = true;
+                thread_desc * it;
+                while( it = pop_head( &this->blocked) ) {
+                        ScheduleThread( it );
+                }
+        }
+        unlock( &this->lock );
+}
 …
+                }
                 head->next = NULL;
+        }
+        }
         return head;
+}
 …
                 this->top = top->next;
                 top->next = NULL;
+        }
+        }
         return top;
+}

src/libcfa/concurrency/kernel_private.h

-              r3d4b23fa
+              r55a68c3
 #define KERNEL_PRIVATE_H
-#include "libhdr.h"
 #include "kernel"
 #include "thread"
 …
 #include "alarm.h"
+#include "libhdr.h"
 //-----------------------------------------------------------------------------
 // Scheduler
-extern "C" {
-        void disable_interrupts();
-        void enable_interrupts_noRF();
-        void enable_interrupts( DEBUG_CTX_PARAM );
+}
 void ScheduleThread( thread_desc * );
-static inline void WakeThread( thread_desc * thrd ) {
-        if( !thrd ) return;
-        disable_interrupts();
-        ScheduleThread( thrd );
-        enable_interrupts( DEBUG_CTX );
+}
 thread_desc * nextThread(cluster * this);
+void BlockInternal(void);
+void BlockInternal(spinlock * lock);
+void BlockInternal(thread_desc * thrd);
+void BlockInternal(spinlock * lock, thread_desc * thrd);
+void BlockInternal(spinlock ** locks, unsigned short count);
+void BlockInternal(spinlock ** locks, unsigned short count, thread_desc ** thrds, unsigned short thrd_count);
+void LeaveThread(spinlock * lock, thread_desc * thrd);
+void ScheduleInternal(void);
+void ScheduleInternal(spinlock * lock);
+void ScheduleInternal(thread_desc * thrd);
+void ScheduleInternal(spinlock * lock, thread_desc * thrd);
+void ScheduleInternal(spinlock ** locks, unsigned short count);
+void ScheduleInternal(spinlock ** locks, unsigned short count, thread_desc ** thrds, unsigned short thrd_count);
 //-----------------------------------------------------------------------------
 …
 extern cluster * systemCluster;
 extern system_proc_t * systemProcessor;
+extern volatile thread_local processor * this_processor;
+extern volatile thread_local coroutine_desc * this_coroutine;
+extern volatile thread_local thread_desc * this_thread;
+extern volatile thread_local bool preemption_in_progress;
+extern volatile thread_local unsigned short disable_preempt_count;
+extern thread_local processor * this_processor;
+static inline void disable_interrupts() {
+        __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &this_processor->disable_preempt_count, 1, __ATOMIC_SEQ_CST );
+        assert( prev != (unsigned short) -1 );
+}
+static inline void enable_interrupts_noRF() {
+        __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &this_processor->disable_preempt_count, -1, __ATOMIC_SEQ_CST );
+        verify( prev != (unsigned short) 0 );
+}
+static inline void enable_interrupts() {
+        __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &this_processor->disable_preempt_count, -1, __ATOMIC_SEQ_CST );
+        verify( prev != (unsigned short) 0 );
+        if( prev == 1 && this_processor->pending_preemption ) {
+                ScheduleInternal( this_processor->current_thread );
+                this_processor->pending_preemption = false;
+        }
+}
 //-----------------------------------------------------------------------------

src/libcfa/concurrency/monitor

r3d4b23fa	r55a68c3
26	26	static inline void ?{}(monitor_desc * this) {
27	27	this->owner = NULL;
	28	this->stack_owner = NULL;
28	29	this->recursion = 0;
29	30	}

src/libcfa/concurrency/monitor.c

-              r3d4b23fa
+              r55a68c3
 #include <stdlib>
+#include "kernel_private.h"
 #include "libhdr.h"
-#include "kernel_private.h"
 //-----------------------------------------------------------------------------
 …
 extern "C" {
         void __enter_monitor_desc( monitor_desc * this ) {
                 lock_yield( &this->lock DEBUG_CTX2 );
                 thread_desc * thrd = this_thread;
                 // LIB_DEBUG_PRINT_SAFE("%p Entering %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
+        void __enter_monitor_desc(monitor_desc * this) {
+                lock( &this->lock );
+                thread_desc * thrd = this_thread();
+                LIB_DEBUG_PRINT_SAFE("%p Entering %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
                 if( !this->owner ) {
 …
                         //Some one else has the monitor, wait in line for it
                         append( &this->entry_queue, thrd );
                         // LIB_DEBUG_PRINT_SAFE("%p Blocking on entry\n", thrd);
                         BlockInternal( &this->lock );
                         //BlockInternal will unlock spinlock, no need to unlock ourselves
                         return;
+                        LIB_DEBUG_PRINT_SAFE("%p Blocking on entry\n", thrd);
+                        ScheduleInternal( &this->lock );
+                        //ScheduleInternal will unlock spinlock, no need to unlock ourselves
+                        return;
+                }
 …
         // leave pseudo code :
         //      TODO
         void __leave_monitor_desc( monitor_desc * this ) {
                 lock_yield( &this->lock DEBUG_CTX2 );
                 // LIB_DEBUG_PRINT_SAFE("%p Leaving %p (o: %p, r: %i). ", this_thread, this, this->owner, this->recursion);
                 verifyf( this_thread == this->owner, "Expected owner to be %p, got %p (r: %i)", this_thread, this->owner, this->recursion );
+        void __leave_monitor_desc(monitor_desc * this) {
+                lock( &this->lock );
+                LIB_DEBUG_PRINT_SAFE("%p Leaving %p (o: %p, r: %i)\n", thrd, this, this->owner, this->recursion);
+                verifyf( this_thread() == this->owner, "Expected owner to be %p, got %p (r: %i)", this_thread(), this->owner, this->recursion );
                 //Leaving a recursion level, decrement the counter
 …
                 unlock( &this->lock );
                 // LIB_DEBUG_PRINT_SAFE("Next owner is %p\n", new_owner);
+                LIB_DEBUG_PRINT_SAFE("Next owner is %p\n", new_owner);
                 //We need to wake-up the thread
+                WakeThread( new_owner );
+        }
+        void __leave_thread_monitor( thread_desc * thrd ) {
+                monitor_desc * this = &thrd->mon;
+                lock_yield( &this->lock DEBUG_CTX2 );
+                disable_interrupts();
+                thrd->cor.state = Halted;
+                verifyf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i)", thrd, this->owner, this->recursion );
+                //Leaving a recursion level, decrement the counter
+                this->recursion -= 1;
+                //If we haven't left the last level of recursion
+                //it means we don't need to do anything
+                if( this->recursion != 0) {
+                        unlock( &this->lock );
+                        return;
+                }
+                thread_desc * new_owner = next_thread( this );
+                LeaveThread( &this->lock, new_owner );
+                ScheduleThread( new_owner );
+        }
+}
 …
         enter( this->m, this->count );
         this->prev_mntrs = this_thread->current_monitors;
         this->prev_count = this_thread->current_monitor_count;
         this_thread->current_monitors      = m;
         this_thread->current_monitor_count = count;
+        this->prev_mntrs = this_thread()->current_monitors;
+        this->prev_count = this_thread()->current_monitor_count;
+        this_thread()->current_monitors      = m;
+        this_thread()->current_monitor_count = count;
+}
 …
         leave( this->m, this->count );
         this_thread->current_monitors      = this->prev_mntrs;
         this_thread->current_monitor_count = this->prev_count;
+        this_thread()->current_monitors      = this->prev_mntrs;
+        this_thread()->current_monitor_count = this->prev_count;
+}
 …
 // Internal scheduling
 void wait( condition * this, uintptr_t user_info = 0 ) {
         // LIB_DEBUG_PRINT_SAFE("Waiting\n");
+        LIB_DEBUG_PRINT_SAFE("Waiting\n");
         brand_condition( this );
 …
         unsigned short count = this->monitor_count;
         unsigned int recursions[ count ];               //Save the current recursion levels to restore them later
         spinlock *   locks     [ count ];               //We need to pass-in an array of locks to BlockInternal
         // LIB_DEBUG_PRINT_SAFE("count %i\n", count);
         __condition_node_t waiter = { (thread_desc*)this_thread, count, user_info };
+        spinlock *   locks     [ count ];               //We need to pass-in an array of locks to ScheduleInternal
+        LIB_DEBUG_PRINT_SAFE("count %i\n", count);
+        __condition_node_t waiter = { this_thread(), count, user_info };
         __condition_criterion_t criteria[count];
         for(int i = 0; i < count; i++) {
                 (&criteria[i]){ this->monitors[i], &waiter };
                 // LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
+                LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
+        }
 …
+        }
         // LIB_DEBUG_PRINT_SAFE("Will unblock: ");
+        LIB_DEBUG_PRINT_SAFE("Will unblock: ");
         for(int i = 0; i < thread_count; i++) {
                 // LIB_DEBUG_PRINT_SAFE("%p ", threads[i]);
+        }
         // LIB_DEBUG_PRINT_SAFE("\n");
+                LIB_DEBUG_PRINT_SAFE("%p ", threads[i]);
+        }
+        LIB_DEBUG_PRINT_SAFE("\n");
         // Everything is ready to go to sleep
         BlockInternal( locks, count, threads, thread_count );
+        ScheduleInternal( locks, count, threads, thread_count );
 …
 bool signal( condition * this ) {
         if( is_empty( this ) ) {
                 // LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
+                LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
                 return false;
+        }
 …
         unsigned short count = this->monitor_count;
         //Some more checking in debug
         LIB_DEBUG_DO(
                 thread_desc * this_thrd = this_thread;
+                thread_desc * this_thrd = this_thread();
                 if ( this->monitor_count != this_thrd->current_monitor_count ) {
                         abortf( "Signal on condition %p made with different number of monitor(s), expected %i got %i", this, this->monitor_count, this_thrd->current_monitor_count );
 …
         //Lock all the monitors
         lock_all( this->monitors, NULL, count );
         // LIB_DEBUG_PRINT_SAFE("Signalling");
+        LIB_DEBUG_PRINT_SAFE("Signalling");
         //Pop the head of the waiting queue
 …
         for(int i = 0; i < count; i++) {
                 __condition_criterion_t * crit = &node->criteria[i];
                 // LIB_DEBUG_PRINT_SAFE(" %p", crit->target);
+                LIB_DEBUG_PRINT_SAFE(" %p", crit->target);
                 assert( !crit->ready );
                 push( &crit->target->signal_stack, crit );
+        }
         // LIB_DEBUG_PRINT_SAFE("\n");
+        LIB_DEBUG_PRINT_SAFE("\n");
         //Release
 …
         unsigned short count = this->monitor_count;
         unsigned int recursions[ count ];               //Save the current recursion levels to restore them later
         spinlock *   locks     [ count ];               //We need to pass-in an array of locks to BlockInternal
+        spinlock *   locks     [ count ];               //We need to pass-in an array of locks to ScheduleInternal
         lock_all( this->monitors, locks, count );
         //create creteria
         __condition_node_t waiter = { (thread_desc*)this_thread, count, 0 };
+        __condition_node_t waiter = { this_thread(), count, 0 };
         __condition_criterion_t criteria[count];
         for(int i = 0; i < count; i++) {
                 (&criteria[i]){ this->monitors[i], &waiter };
                 // LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
+                LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
                 push( &criteria[i].target->signal_stack, &criteria[i] );
+        }
 …
         //Everything is ready to go to sleep
         BlockInternal( locks, count, &signallee, 1 );
+        ScheduleInternal( locks, count, &signallee, 1 );
 …
 uintptr_t front( condition * this ) {
         verifyf( !is_empty(this),
+        verifyf( !is_empty(this),
                 "Attempt to access user data on an empty condition.\n"
                 "Possible cause is not checking if the condition is empty before reading stored data."
 …
 // Internal scheduling
 void __accept_internal( unsigned short count, __acceptable_t * acceptables, void (*func)(void) ) {
         // thread_desc * this = this_thread;
+        // thread_desc * this = this_thread();
         // unsigned short count = this->current_monitor_count;
         // unsigned int recursions[ count ];            //Save the current recursion levels to restore them later
         // spinlock *   locks     [ count ];            //We need to pass-in an array of locks to BlockInternal
+        // spinlock *   locks     [ count ];            //We need to pass-in an array of locks to ScheduleInternal
         // lock_all( this->current_monitors, locks, count );
 …
         // // // Everything is ready to go to sleep
         // // BlockInternal( locks, count, threads, thread_count );
+        // // ScheduleInternal( locks, count, threads, thread_count );
 …
 static inline void lock_all( spinlock ** locks, unsigned short count ) {
         for( int i = 0; i < count; i++ ) {
                 lock_yield( locks[i] DEBUG_CTX2 );
+                lock( locks[i] );
+        }
+}
 …
         for( int i = 0; i < count; i++ ) {
                 spinlock * l = &source[i]->lock;
                 lock_yield( l DEBUG_CTX2 );
+                lock( l );
                 if(locks) locks[i] = l;
+        }
 …
         for(    int i = 0; i < count; i++ ) {
                 // LIB_DEBUG_PRINT_SAFE( "Checking %p for %p\n", &criteria[i], target );
+                LIB_DEBUG_PRINT_SAFE( "Checking %p for %p\n", &criteria[i], target );
                 if( &criteria[i] == target ) {
                         criteria[i].ready = true;
                         // LIB_DEBUG_PRINT_SAFE( "True\n" );
+                        LIB_DEBUG_PRINT_SAFE( "True\n" );
+                }
 …
+        }
         // LIB_DEBUG_PRINT_SAFE( "Runing %i\n", ready2run );
+        LIB_DEBUG_PRINT_SAFE( "Runing %i\n", ready2run );
         return ready2run ? node->waiting_thread : NULL;
+}
 static inline void brand_condition( condition * this ) {
         thread_desc * thrd = this_thread;
+        thread_desc * thrd = this_thread();
         if( !this->monitors ) {
                 // LIB_DEBUG_PRINT_SAFE("Branding\n");
+                LIB_DEBUG_PRINT_SAFE("Branding\n");
                 assertf( thrd->current_monitors != NULL, "No current monitor to brand condition", thrd->current_monitors );
                 this->monitor_count = thrd->current_monitor_count;

src/libcfa/concurrency/preemption.c

-              r3d4b23fa
+              r55a68c3
 //
-#include "libhdr.h"
 #include "preemption.h"
 extern "C" {
-#include <errno.h>
-#include <execinfo.h>
-#define __USE_GNU
 #include <signal.h>
-#undef __USE_GNU
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
+}
+#ifdef __USE_STREAM__
+#include "fstream"
+#endif
+#define __CFA_DEFAULT_PREEMPTION__ 10000
+#define __CFA_DEFAULT_PREEMPTION__ 10
 __attribute__((weak)) unsigned int default_preemption() {
 …
+}
-#define __CFA_SIGCXT__ ucontext_t *
-#define __CFA_SIGPARMS__ __attribute__((unused)) int sig, __attribute__((unused)) siginfo_t *sfp, __attribute__((unused)) __CFA_SIGCXT__ cxt
 static void preempt( processor   * this );
 static void timeout( thread_desc * this );
-void sigHandler_ctxSwitch( __CFA_SIGPARMS__ );
-void sigHandler_alarm    ( __CFA_SIGPARMS__ );
-void sigHandler_segv     ( __CFA_SIGPARMS__ );
-void sigHandler_abort    ( __CFA_SIGPARMS__ );
-static void __kernel_sigaction( int sig, void (*handler)(__CFA_SIGPARMS__), int flags );
-LIB_DEBUG_DO( bool validate( alarm_list_t * this ); )
-#ifdef __x86_64__
-#define CFA_REG_IP REG_RIP
-#else
-#define CFA_REG_IP REG_EIP
-#endif
 //=============================================================================================
 …
 //=============================================================================================
+void kernel_start_preemption() {
+}
 void tick_preemption() {
-        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Ticking preemption\n" );
         alarm_list_t * alarms = &systemProcessor->alarms;
         __cfa_time_t currtime = __kernel_get_time();
         while( alarms->head && alarms->head->alarm < currtime ) {
                 alarm_node_t * node = pop(alarms);
-                // LIB_DEBUG_PRINT_BUFFER_LOCAL( STDERR_FILENO, "Ticking %p\n", node );
                 if( node->kernel_alarm ) {
                         preempt( node->proc );
 …
+                }
-                verify( validate( alarms ) );
                 if( node->period > 0 ) {
                         node->alarm = currtime + node->period;
+                        node->alarm += node->period;
                         insert( alarms, node );
+                }
 …
                 __kernel_set_timer( alarms->head->alarm - currtime );
+        }
-        verify( validate( alarms ) );
-        // LIB_DEBUG_PRINT_BUFFER_LOCAL( STDERR_FILENO, "Ticking preemption done\n" );
+}
 void update_preemption( processor * this, __cfa_time_t duration ) {
+        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Processor : %p updating preemption to %lu\n", this, duration );
+        //     assert( THREAD_GETMEM( disableInt ) && THREAD_GETMEM( disableIntCnt ) == 1 );
         alarm_node_t * alarm = this->preemption_alarm;
-        duration *= 1000;
         // Alarms need to be enabled
 …
+}
+void ?{}( preemption_scope * this, processor * proc ) {
+        (&this->alarm){ proc };
+        this->proc = proc;
+        this->proc->preemption_alarm = &this->alarm;
+        update_preemption( this->proc, this->proc->preemption );
+}
+void ^?{}( preemption_scope * this ) {
+        update_preemption( this->proc, 0 );
+}
 //=============================================================================================
 // Kernel Signal Tools
+// Kernel Signal logic
 //=============================================================================================
-LIB_DEBUG_DO( static thread_local void * last_interrupt = 0; )
-extern "C" {
-        void disable_interrupts() {
-                __attribute__((unused)) unsigned short new_val = __atomic_add_fetch_2( &disable_preempt_count, 1, __ATOMIC_SEQ_CST );
-                verify( new_val < (unsigned short)65_000 );
-                verify( new_val != (unsigned short) 0 );
+        }
-        void enable_interrupts_noRF() {
-                __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &disable_preempt_count, -1, __ATOMIC_SEQ_CST );
-                verify( prev != (unsigned short) 0 );
+        }
-        void enable_interrupts( DEBUG_CTX_PARAM ) {
-                processor * proc   = this_processor;
-                thread_desc * thrd = this_thread;
-                unsigned short prev = __atomic_fetch_add_2( &disable_preempt_count, -1, __ATOMIC_SEQ_CST );
-                verify( prev != (unsigned short) 0 );
-                if( prev == 1 && proc->pending_preemption ) {
-                        proc->pending_preemption = false;
-                        BlockInternal( thrd );
+                }
-                LIB_DEBUG_DO( proc->last_enable = caller; )
+        }
+}
-static inline void signal_unblock( int sig ) {
-        sigset_t mask;
-        sigemptyset( &mask );
-        sigaddset( &mask, sig );
-        if ( pthread_sigmask( SIG_UNBLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+        }
+}
-static inline void signal_block( int sig ) {
-        sigset_t mask;
-        sigemptyset( &mask );
-        sigaddset( &mask, sig );
-        if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+        }
+}
 static inline bool preemption_ready() {
         return disable_preempt_count == 0 && !preemption_in_progress;
+        return this_processor->disable_preempt_count == 0;
+}
 …
+}
+void sigHandler_ctxSwitch( __attribute__((unused)) int sig ) {
+        if( preemption_ready() ) {
+                ScheduleInternal( this_processor->current_thread );
+        }
+        else {
+                defer_ctxSwitch();
+        }
+}
+void sigHandler_alarm( __attribute__((unused)) int sig ) {
+        if( try_lock( &systemProcessor->alarm_lock ) ) {
+                tick_preemption();
+                unlock( &systemProcessor->alarm_lock );
+        }
+        else {
+                defer_alarm();
+        }
+}
 static void preempt( processor * this ) {
         pthread_kill( this->kernel_thread, SIGUSR1 );
 …
         //TODO : implement waking threads
+}
-//=============================================================================================
-// Kernel Signal Startup/Shutdown logic
-//=============================================================================================
-static pthread_t alarm_thread;
-void * alarm_loop( __attribute__((unused)) void * args );
-void kernel_start_preemption() {
-        LIB_DEBUG_PRINT_SAFE("Kernel : Starting preemption\n");
-        __kernel_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO );
-        // __kernel_sigaction( SIGSEGV, sigHandler_segv     , SA_SIGINFO );
-        // __kernel_sigaction( SIGBUS , sigHandler_segv     , SA_SIGINFO );
-        signal_block( SIGALRM );
-        pthread_create( &alarm_thread, NULL, alarm_loop, NULL );
+}
-void kernel_stop_preemption() {
-        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption stopping\n");
-        sigset_t mask;
-        sigfillset( &mask );
-        sigprocmask( SIG_BLOCK, &mask, NULL );
-        sigval val = { 1 };
-        pthread_sigqueue( alarm_thread, SIGALRM, val );
-        pthread_join( alarm_thread, NULL );
-        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption stopped\n");
+}
-void ?{}( preemption_scope * this, processor * proc ) {
-        (&this->alarm){ proc };
-        this->proc = proc;
-        this->proc->preemption_alarm = &this->alarm;
-        update_preemption( this->proc, this->proc->preemption );
+}
-void ^?{}( preemption_scope * this ) {
-        disable_interrupts();
-        update_preemption( this->proc, 0 );
+}
-//=============================================================================================
-// Kernel Signal Handlers
-//=============================================================================================
-void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) {
-        LIB_DEBUG_DO( last_interrupt = (void *)(cxt->uc_mcontext.gregs[CFA_REG_IP]); )
-        if( preemption_ready() ) {
-                preemption_in_progress = true;
-                signal_unblock( SIGUSR1 );
-                this_processor->pending_preemption = false;
-                preemption_in_progress = false;
-                BlockInternal( (thread_desc*)this_thread );
+        }
-        else {
-                defer_ctxSwitch();
+        }
+}
-void * alarm_loop( __attribute__((unused)) void * args ) {
-        sigset_t mask;
-        sigemptyset( &mask );
-        sigaddset( &mask, SIGALRM );
-        if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+        }
-        while( true ) {
-                siginfo_t info;
-                int sig = sigwaitinfo( &mask, &info );
-                if( sig < 0 ) {
-                        abortf( "internal error, sigwait" );
+                }
-                else if( sig == SIGALRM )
+                {
-                        LIB_DEBUG_PRINT_SAFE("Kernel : Caught signal %d (%d)\n", sig, info.si_value.sival_int );
-                        if( info.si_value.sival_int == 0 )
+                        {
-                                LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n");
-                                lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
-                                tick_preemption();
-                                unlock( &systemProcessor->alarm_lock );
+                        }
-                        else if( info.si_value.sival_int == 1 )
+                        {
-                                break;
+                        }
+                }
-                else
+                {
-                        LIB_DEBUG_PRINT_SAFE("Kernel : Unexpected signal %d (%d)\n", sig, info.si_value.sival_int);
+                }
+        }
-        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread stopping\n");
-        return NULL;
+}
-static void __kernel_sigaction( int sig, void (*handler)(__CFA_SIGPARMS__), int flags ) {
-        struct sigaction act;
-        act.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler;
-        act.sa_flags = flags;
-        if ( sigaction( sig, &act, NULL ) == -1 ) {
-                LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO,
-                        " __kernel_sigaction( sig:%d, handler:%p, flags:%d ), problem installing signal handler, error(%d) %s.\n",
-                        sig, handler, flags, errno, strerror( errno )
-                );
-                _exit( EXIT_FAILURE );
+        }
+}
-typedef void (*sa_handler_t)(int);
-static void __kernel_sigdefault( int sig ) {
-        struct sigaction act;
-        // act.sa_handler = SIG_DFL;
-        act.sa_flags = 0;
-        sigemptyset( &act.sa_mask );
-        if ( sigaction( sig, &act, NULL ) == -1 ) {
-                LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO,
-                        " __kernel_sigdefault( sig:%d ), problem reseting signal handler, error(%d) %s.\n",
-                        sig, errno, strerror( errno )
-                );
-                _exit( EXIT_FAILURE );
+        }
+}
-//=============================================================================================
-// Terminating Signals logic
-//=============================================================================================
-LIB_DEBUG_DO(
-        static void __kernel_backtrace( int start ) {
-                // skip first N stack frames
-                enum { Frames = 50 };
-                void * array[Frames];
-                int size = backtrace( array, Frames );
-                char ** messages = backtrace_symbols( array, size );
-                // find executable name
-                *index( messages[0], '(' ) = '\0';
-                #ifdef __USE_STREAM__
-                serr | "Stack back trace for:" | messages[0] | endl;
-                #else
-                fprintf( stderr, "Stack back trace for: %s\n", messages[0]);
-                #endif
-                // skip last 2 stack frames after main
-                for ( int i = start; i < size && messages != NULL; i += 1 ) {
-                        char * name = NULL;
-                        char * offset_begin = NULL;
-                        char * offset_end = NULL;
-                        for ( char *p = messages[i]; *p; ++p ) {
-                                // find parantheses and +offset
-                                if ( *p == '(' ) {
-                                        name = p;
+                                }
-                                else if ( *p == '+' ) {
-                                        offset_begin = p;
+                                }
-                                else if ( *p == ')' ) {
-                                        offset_end = p;
-                                        break;
+                                }
+                        }
-                        // if line contains symbol print it
-                        int frameNo = i - start;
-                        if ( name && offset_begin && offset_end && name < offset_begin ) {
-                                // delimit strings
-                                *name++ = '\0';
-                                *offset_begin++ = '\0';
-                                *offset_end++ = '\0';
-                                #ifdef __USE_STREAM__
-                                serr    | "("  | frameNo | ")" | messages[i] | ":"
-                                        | name | "+" | offset_begin | offset_end | endl;
-                                #else
-                                fprintf( stderr, "(%i) %s : %s + %s %s\n", frameNo, messages[i], name, offset_begin, offset_end);
-                                #endif
+                        }
-                        // otherwise, print the whole line
-                        else {
-                                #ifdef __USE_STREAM__
-                                serr | "(" | frameNo | ")" | messages[i] | endl;
-                                #else
-                                fprintf( stderr, "(%i) %s\n", frameNo, messages[i] );
-                                #endif
+                        }
+                }
-                free( messages );
+        }
+)
-// void sigHandler_segv( __CFA_SIGPARMS__ ) {
-//      LIB_DEBUG_DO(
-//              #ifdef __USE_STREAM__
-//              serr    | "*CFA runtime error* program cfa-cpp terminated with"
-//                      | (sig == SIGSEGV ? "segment fault." : "bus error.")
-//                      | endl;
-//              #else
-//              fprintf( stderr, "*CFA runtime error* program cfa-cpp terminated with %s\n", sig == SIGSEGV ? "segment fault." : "bus error." );
-//              #endif
-//              // skip first 2 stack frames
-//              __kernel_backtrace( 1 );
-//      )
-//      exit( EXIT_FAILURE );
-// }
-// void sigHandler_abort( __CFA_SIGPARMS__ ) {
-//      // skip first 6 stack frames
-//      LIB_DEBUG_DO( __kernel_backtrace( 6 ); )
-//      // reset default signal handler
-//      __kernel_sigdefault( SIGABRT );
-//      raise( SIGABRT );
-// }

src/libcfa/concurrency/thread

r3d4b23fa	r55a68c3
54	54	}
55	55
56		~~extern volatile thread_local thread_desc * this_thread~~;
	56	thread_desc * this_thread(void);
57	57
58	58	forall( dtype T \| is_thread(T) )

src/libcfa/concurrency/thread.c

-              r3d4b23fa
+              r55a68c3
+}
 extern volatile thread_local processor * this_processor;
+extern thread_local processor * this_processor;
 //-----------------------------------------------------------------------------
 …
         coroutine_desc* thrd_c = get_coroutine(this);
         thread_desc*  thrd_h = get_thread   (this);
+        thrd_c->last = this_coroutine;
+        thrd_c->last = this_coroutine();
+        this_processor->current_coroutine = thrd_c;
         // LIB_DEBUG_PRINT_SAFE("Thread start : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
+        LIB_DEBUG_PRINT_SAFE("Thread start : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
-        disable_interrupts();
         create_stack(&thrd_c->stack, thrd_c->stack.size);
-        this_coroutine = thrd_c;
         CtxStart(this, CtxInvokeThread);
-        assert( thrd_c->last->stack.context );
         CtxSwitch( thrd_c->last->stack.context, thrd_c->stack.context );
         ScheduleThread(thrd_h);
-        enable_interrupts( DEBUG_CTX );
+}
 void yield( void ) {
         BlockInternal( (thread_desc *)this_thread );
+        ScheduleInternal( this_processor->current_thread );
+}
 …
 void ThreadCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
         // set state of current coroutine to inactive
         src->state = src->state == Halted ? Halted : Inactive;
+        src->state = Inactive;
         dst->state = Active;
 …
         // set new coroutine that the processor is executing
         // and context switch to it
+        this_coroutine = dst;
+        assert( src->stack.context );
+        this_processor->current_coroutine = dst;
         CtxSwitch( src->stack.context, dst->stack.context );
         this_coroutine = src;
+        this_processor->current_coroutine = src;
         // set state of new coroutine to active
         dst->state = dst->state == Halted ? Halted : Inactive;
+        dst->state = Inactive;
         src->state = Active;
+}

src/libcfa/exception.c

-              r3d4b23fa
+              r55a68c3
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
 // Last Modified On : Tus Jul 11 16:36:00 2017
 // Update Count     : 1
+// Last Modified On : Mon Nov 26 15:11:00 2017
+// Update Count     : 0
 //
 …
 // RESUMPTION ================================================================
 void __cfaehm__throw_resume(exception * except) {
+void __cfaehm__throw_resumption(exception * except) {
         // DEBUG
 …
         // Fall back to termination:
         __cfaehm__throw_terminate(except);
+        __cfaehm__throw_termination(except);
         // TODO: Default handler for resumption.
+}
 …
+}
 void __cfaehm__throw_terminate( exception * val ) {
+void __cfaehm__throw_termination( exception * val ) {
         // Store the current exception
         shared_stack.current_exception = *val;
 …
 // Nesting this the other way would probably be faster.
 void __cfaehm__rethrow_terminate(void) {
+void __cfaehm__rethrow_termination(void) {
         // DEBUG
         printf("Rethrowing termination exception\n");
         __cfaehm__throw_terminate(&shared_stack.current_exception);
+        __cfaehm__throw_termination(&shared_stack.current_exception);
+}

src/libcfa/exception.h

-              r3d4b23fa
+              r55a68c3
 // Created On       : Mon Jun 26 15:11:00 2017
 // Last Modified By : Andrew Beach
 // Last Modified On : Tus Jul 11 16:31:00 2017
 // Update Count     : 2
+// Last Modified On : Mon Nov 26 15:11:00 2017
+// Update Count     : 0
 //
 …
 #ifdef __CFORALL__
 extern "C" {
+extern "BuiltinC" {
 #endif
 // Used in throw statement translation.
 void __cfaehm__throw_terminate(exception * except) __attribute__((noreturn));
 void __cfaehm__rethrow_terminate() __attribute__((noreturn));
 void __cfaehm__throw_resume(exception * except);
+void __cfaehm__throw_termination(exception * except) __attribute__((noreturn));
+void __cfaehm__rethrow_termination() __attribute__((noreturn));
+void __cfaehm__throw_resumption(exception * except);
 // Function catches termination exceptions.

src/libcfa/fstream

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 08:32:38 2017
 // Update Count     : 117
+// Last Modified On : Sat Jul  1 16:37:53 2017
+// Update Count     : 112
 //
+#pragma once
+#ifndef __FSTREAM_H__
+#define __FSTREAM_H__
 #include "iostream"
 enum { sepSize = 16 };
+enum { separateSize = 16 };
 struct ofstream {
         void * file;
         _Bool sepDefault;
         _Bool sepOnOff;
         _Bool sawNL;
+        _Bool lastSepOn;
         const char * sepCur;
         char separator[sepSize];
         char tupleSeparator[sepSize];
+        char separator[separateSize];
+        char tupleSeparator[separateSize];
 }; // ofstream
 …
 const char * sepGetCur( ofstream * );
 void sepSetCur( ofstream *, const char * );
+_Bool getNL( ofstream * );
+void setNL( ofstream *, _Bool );
+_Bool lastSepOn( ofstream * );
 // public
 …
 extern ifstream * sin;
+#endif // __FSTREAM_H__
 // Local Variables: //
 // mode: c //

src/libcfa/fstream.c

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jul  6 18:38:25 2017
 // Update Count     : 251
+// Last Modified On : Sat Jul  1 16:37:54 2017
+// Update Count     : 242
 //
 …
         this->sepDefault = sepDefault;
         this->sepOnOff = sepOnOff;
+        this->lastSepOn = false;
         sepSet( this, separator );
         sepSetCur( this, sepGet( this ) );
 …
 // private
+_Bool sepPrt( ofstream * os ) { setNL( os, false ); return os->sepOnOff; }
+_Bool lastSepOn( ofstream * os ) { return os->lastSepOn; }
+_Bool sepPrt( ofstream * os ) { os->lastSepOn = false; return os->sepOnOff; }
 void sepReset( ofstream * os ) { os->sepOnOff = os->sepDefault; }
 void sepReset( ofstream * os, _Bool reset ) { os->sepDefault = reset; os->sepOnOff = os->sepDefault; }
 const char * sepGetCur( ofstream * os ) { return os->sepCur; }
 void sepSetCur( ofstream * os, const char * sepCur ) { os->sepCur = sepCur; }
-_Bool getNL( ofstream * os ) { return os->sawNL; }
-void setNL( ofstream * os, _Bool state ) { os->sawNL = state; }
 // public
 void sepOn( ofstream * os ) { os->sepOnOff = ! getNL( os ); }
 void sepOff( ofstream * os ) { os->sepOnOff = false; }
+void sepOn( ofstream * os ) { os->lastSepOn = true; os->sepOnOff = true; }
+void sepOff( ofstream * os ) { os->lastSepOn = false; os->sepOnOff = 0; }
 _Bool sepDisable( ofstream *os ) {
         _Bool temp = os->sepDefault;
         os->sepDefault = false;
+        os->lastSepOn = false;
         sepReset( os );
         return temp;
 …
 void sepSet( ofstream * os, const char * s ) {
         assert( s );
         strncpy( os->separator, s, sepSize - 1 );
         os->separator[sepSize - 1] = '\0';
+        strncpy( os->separator, s, separateSize - 1 );
+        os->separator[separateSize - 1] = '\0';
 } // sepSet
 …
 void sepSetTuple( ofstream * os, const char * s ) {
         assert( s );
         strncpy( os->tupleSeparator, s, sepSize - 1 );
         os->tupleSeparator[sepSize - 1] = '\0';
+        strncpy( os->tupleSeparator, s, separateSize - 1 );
+        os->tupleSeparator[separateSize - 1] = '\0';
 } // sepSet
 …
 void open( ifstream * is, const char * name, const char * mode ) {
         FILE *file = fopen( name, mode );
         if ( file == 0 ) {                                                                      // do not change unless successful
+        FILE *t = fopen( name, mode );
+        if ( t == 0 ) {                                                                         // do not change unless successful
                 fprintf( stderr, IO_MSG "open input file \"%s\", ", name );
                 perror( 0 );
                 exit( EXIT_FAILURE );
         } // if
         is->file = file;
+        is->file = t;
 } // open

src/libcfa/gmp

-              r3d4b23fa
+              r55a68c3
 // Created On       : Tue Apr 19 08:43:43 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 09:33:20 2017
 // Update Count     : 15
+// Last Modified On : Sat May 27 09:55:51 2017
+// Update Count     : 14
 //
 // https://gmplib.org/gmp-man-6.1.1.pdf
-#pragma once
 #include <gmp.h>                                                                                // GNU multi-precise integers

src/libcfa/iostream

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 08:35:59 2017
 // Update Count     : 118
+// Last Modified On : Sun Jul  2 08:42:56 2017
+// Update Count     : 110
 //
+#pragma once
+#ifndef __IOSTREAM_H__
+#define __IOSTREAM_H__
 #include "iterator"
 …
         const char * sepGetCur( ostype * );                                     // get current separator string
         void sepSetCur( ostype *, const char * );                       // set current separator string
+        _Bool getNL( ostype * );                                                        // check newline
+        void setNL( ostype *, _Bool );                                          // saw newline
+        _Bool lastSepOn( ostype * );                                            // last manipulator is setOn (context sensitive)
         // public
         void sepOn( ostype * );                                                         // turn separator state on
 …
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, ostype * (*)( ostype * ) );
 forall( dtype ostype | ostream( ostype ) ) ostype * endl( ostype * );
-forall( dtype ostype | ostream( ostype ) ) ostype * sep( ostype * );
-forall( dtype ostype | ostream( ostype ) ) ostype * sepTuple( ostype * );
 forall( dtype ostype | ostream( ostype ) ) ostype * sepOn( ostype * );
 forall( dtype ostype | ostream( ostype ) ) ostype * sepOff( ostype * );
 …
 forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, _Istream_cstrC );
+#endif // __IOSTREAM_H
 // Local Variables: //
 // mode: c //

src/libcfa/iostream.c

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jul  6 18:14:17 2017
 // Update Count     : 396
+// Last Modified On : Sun Jul  2 08:54:02 2017
+// Update Count     : 375
 //
 …
 extern "C" {
 #include <stdio.h>
-#include <stdbool.h>                                                                    // true/false
 #include <string.h>                                                                             // strlen
 #include <float.h>                                                                              // DBL_DIG, LDBL_DIG
 …
 forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype * os, char ch ) {
+        fmt( os, "%c", ch );
+        if ( ch == '\n' ) setNL( os, true );
+ostype * ?|?( ostype * os, char c ) {
+        fmt( os, "%c", c );
         sepOff( os );
         return os;
 …
         // last character IS spacing or opening punctuation => turn off separator for next item
         size_t len = strlen( cp );
         ch = cp[len - 1];                                                                       // must make unsigned
+        unsigned int len = strlen( cp ), posn = len - 1;
+        ch = cp[posn];                                                                          // must make unsigned
         if ( sepPrt( os ) && mask[ ch ] != Open && mask[ ch ] != OpenClose ) {
                 sepOn( os );
 …
                 sepOff( os );
         } // if
-        if ( ch == '\n' ) setNL( os, true );                            // check *AFTER* sepPrt call above as it resets NL flag
         return write( os, cp, len );
 } // ?|?
 …
 forall( dtype ostype | ostream( ostype ) )
-ostype * sep( ostype * os ) {
-        os | sepGet( os );
-        return os;
-} // sep
-forall( dtype ostype | ostream( ostype ) )
-ostype * sepTuple( ostype * os ) {
-        os | sepGetTuple( os );
-        return os;
-} // sepTuple
-forall( dtype ostype | ostream( ostype ) )
 ostype * endl( ostype * os ) {
+        if ( lastSepOn( os ) ) fmt( os, "%s", sepGetCur( os ) );
         os | '\n';
-        setNL( os, true );
         flush( os );
         sepOff( os );                                                                           // prepare for next line

src/libcfa/iterator

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 08:37:25 2017
 // Update Count     : 10
+// Last Modified On : Wed Mar  2 18:06:05 2016
+// Update Count     : 9
 //
+#pragma once
+#ifndef ITERATOR_H
+#define ITERATOR_H
 // An iterator can be used to traverse a data structure.
 …
 forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) )
 void for_each( iterator_type begin, iterator_type end, void (* func)( elt_type ) );
+void for_each( iterator_type begin, iterator_type end, void (*func)( elt_type ) );
 forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) )
+void for_each_reverse( iterator_type begin, iterator_type end, void (* func)( elt_type ) );
+void for_each_reverse( iterator_type begin, iterator_type end, void (*func)( elt_type ) );
+#endif // ITERATOR_H
 // Local Variables: //

src/libcfa/iterator.c

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 08:38:23 2017
 // Update Count     : 28
+// Last Modified On : Wed Mar  2 18:08:11 2016
+// Update Count     : 27
 //
 …
 forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) )
 void for_each( iterator_type begin, iterator_type end, void (* func)( elt_type ) ) {
+void for_each( iterator_type begin, iterator_type end, void (*func)( elt_type ) ) {
         for ( iterator_type i = begin; i != end; ++i ) {
                 func( *i );
         } // for
 } // for_each
+        }
+}
 forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) )
 void for_each_reverse( iterator_type begin, iterator_type end, void (* func)( elt_type ) ) {
+void for_each_reverse( iterator_type begin, iterator_type end, void (*func)( elt_type ) ) {
         for ( iterator_type i = end; i != begin; ) {
                 --i;
                 func( *i );
         } // for
 } // for_each_reverse
+        }
+}
 // Local Variables: //

src/libcfa/libhdr/libalign.h

-              r3d4b23fa
+              r55a68c3
 //                              -*- Mode: C++ -*-
+//                              -*- Mode: C++ -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 …
 // Free Software  Foundation; either  version 2.1 of  the License, or  (at your
 // option) any later version.
 //
+//
 // This library is distributed in the  hope that it will be useful, but WITHOUT
 // ANY  WARRANTY;  without even  the  implied  warranty  of MERCHANTABILITY  or
 // FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
 // for more details.
 //
+//
 // You should  have received a  copy of the  GNU Lesser General  Public License
 // along  with this library.
 //
+//
 …
 #include "assert"
-#include <stdbool.h>
 // Minimum size used to align memory boundaries for memory allocations.
+// Minimum size used to align memory boundaries for memory allocations.
 #define libAlign() (sizeof(double))

src/libcfa/libhdr/libdebug.h

-              r3d4b23fa
+              r55a68c3
 #ifdef __CFA_DEBUG__
+        #define LIB_DEBUG_DO(...) __VA_ARGS__
+        #define LIB_NO_DEBUG_DO(...)
+        #define DEBUG_CTX __PRETTY_FUNCTION__
+        #define DEBUG_CTX2 , __PRETTY_FUNCTION__
+        #define DEBUG_CTX_PARAM const char * caller
+        #define DEBUG_CTX_PARAM2 , const char * caller
+        #define LIB_DEBUG_DO(x) x
+        #define LIB_NO_DEBUG_DO(x) ((void)0)
 #else
+        #define LIB_DEBUG_DO(...)
+        #define LIB_NO_DEBUG_DO(...) __VA_ARGS__
+        #define DEBUG_CTX
+        #define DEBUG_CTX2
+        #define DEBUG_CTX_PARAM
+        #define DEBUG_CTX_PARAM2
+        #define LIB_DEBUG_DO(x) ((void)0)
+        #define LIB_NO_DEBUG_DO(x) x
 #endif
 …
 #ifdef __CFA_DEBUG_PRINT__
+        #define LIB_DEBUG_WRITE( fd, buffer, len )     __lib_debug_write( fd, buffer, len )
+        #define LIB_DEBUG_ACQUIRE()                    __lib_debug_acquire()
+        #define LIB_DEBUG_RELEASE()                    __lib_debug_release()
+        #define LIB_DEBUG_PRINT_SAFE(...)              __lib_debug_print_safe   (__VA_ARGS__)
+        #define LIB_DEBUG_PRINT_NOLOCK(...)            __lib_debug_print_nolock (__VA_ARGS__)
+        #define LIB_DEBUG_PRINT_BUFFER(...)            __lib_debug_print_buffer (__VA_ARGS__)
+        #define LIB_DEBUG_PRINT_BUFFER_DECL(fd, ...)   char text[256]; int len = snprintf( text, 256, __VA_ARGS__ ); __lib_debug_write( fd, text, len );
+        #define LIB_DEBUG_PRINT_BUFFER_LOCAL(fd, ...)  len = snprintf( text, 256, __VA_ARGS__ ); __lib_debug_write( fd, text, len );
+      #define LIB_DEBUG_WRITE( fd, buffer, len )  __lib_debug_write( fd, buffer, len )
+      #define LIB_DEBUG_ACQUIRE()                 __lib_debug_acquire()
+      #define LIB_DEBUG_RELEASE()                 __lib_debug_release()
+      #define LIB_DEBUG_PRINT_SAFE(...)           __lib_debug_print_safe   (__VA_ARGS__)
+      #define LIB_DEBUG_PRINT_NOLOCK(...)         __lib_debug_print_nolock (__VA_ARGS__)
+      #define LIB_DEBUG_PRINT_BUFFER(...)         __lib_debug_print_buffer (__VA_ARGS__)
 #else
+        #define LIB_DEBUG_WRITE(...)               ((void)0)
+        #define LIB_DEBUG_ACQUIRE()                ((void)0)
+        #define LIB_DEBUG_RELEASE()                ((void)0)
+        #define LIB_DEBUG_PRINT_SAFE(...)          ((void)0)
+        #define LIB_DEBUG_PRINT_NOLOCK(...)        ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER(...)        ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER_DECL(...)   ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER_LOCAL(...)  ((void)0)
+      #define LIB_DEBUG_WRITE(...)          ((void)0)
+      #define LIB_DEBUG_ACQUIRE()           ((void)0)
+      #define LIB_DEBUG_RELEASE()           ((void)0)
+      #define LIB_DEBUG_PRINT_SAFE(...)     ((void)0)
+      #define LIB_DEBUG_PRINT_NOLOCK(...)   ((void)0)
+      #define LIB_DEBUG_PRINT_BUFFER(...)   ((void)0)
 #endif

src/libcfa/limits

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed Apr  6 18:06:52 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 09:33:57 2017
 // Update Count     : 7
+// Last Modified On : Wed Apr  6 21:08:16 2016
+// Update Count     : 6
 //
+#pragma once
+#ifndef LIMITS_H
+#define LIMITS_H
 // Integral Constants
 …
 extern const long _Complex _1_SQRT_2;                                   // 1 / sqrt(2)
+#endif // LIMITS_H
 // Local Variables: //
 // mode: c //

src/libcfa/math

-              r3d4b23fa
+              r55a68c3
 // Created On       : Mon Apr 18 23:37:04 2016
 // Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul  7 09:34:15 2017
+// Update Count     : 61
+//
+#pragma once
+// Last Modified On : Wed May 24 17:40:39 2017
+// Update Count     : 60
+//
+#ifndef MATH_H
+#define MATH_H
 extern "C" {
 …
 long double scalbln( long double, long int );
+#endif // MATH_H
 // Local Variables: //
 // mode: c //

src/libcfa/rational

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed Apr  6 17:56:25 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul  7 09:34:33 2017
 // Update Count     : 93
+// Last Modified On : Mon May 15 21:30:12 2017
+// Update Count     : 90
 //
+#pragma once
+#ifndef RATIONAL_H
+#define RATIONAL_H
 #include "iostream"
 …
 // implementation
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 struct Rational {
         RationalImpl numerator, denominator;                            // invariant: denominator > 0
 …
 // constructors
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, RationalImpl n );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, RationalImpl n, RationalImpl d );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, zero_t );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, one_t );
 // numerator/denominator getter
+// getter for numerator/denominator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl numerator( Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl denominator( Rational(RationalImpl) r );
+forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 [ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational(RationalImpl) src );
 // numerator/denominator setter
+// setter for numerator/denominator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl numerator( Rational(RationalImpl) r, RationalImpl n );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl denominator( Rational(RationalImpl) r, RationalImpl d );
 // comparison
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?==?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?!=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?<?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?<=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?>?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?>=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 // arithmetic
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) +?( Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) -?( Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?+?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?-?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?*?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?/?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 // conversion
 forall( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
 double widen( Rational(RationalImpl) r );
 forall( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl );  RationalImpl convert( double );} )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl );  RationalImpl convert( double );} )
 Rational(RationalImpl) narrow( double f, RationalImpl md );
 // I/O
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 forall( dtype istype | istream( istype ) | { istype * ?|?( istype *, RationalImpl * ); } )
 istype * ?|?( istype *, Rational(RationalImpl) * );
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 forall( dtype ostype | ostream( ostype ) | { ostype * ?|?( ostype *, RationalImpl ); } )
 ostype * ?|?( ostype *, Rational(RationalImpl ) );
+#endif // RATIONAL_H
 // Local Variables: //

src/libcfa/rational.c

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue May 16 18:35:36 2017
 // Update Count     : 150
+// Last Modified On : Mon May 15 21:29:23 2017
+// Update Count     : 149
 //
 …
 // Calculate greatest common denominator of two numbers, the first of which may be negative. Used to reduce rationals.
 // alternative: https://en.wikipedia.org/wiki/Binary_GCD_algorithm
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 static RationalImpl gcd( RationalImpl a, RationalImpl b ) {
         for ( ;; ) {                                                                            // Euclid's algorithm
 …
 } // gcd
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 static RationalImpl simplify( RationalImpl * n, RationalImpl * d ) {
         if ( *d == (RationalImpl){0} ) {
 …
 // constructors
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r ) {
         r{ (RationalImpl){0}, (RationalImpl){1} };
 } // rational
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, RationalImpl n ) {
         r{ n, (RationalImpl){1} };
 } // rational
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) * r, RationalImpl n, RationalImpl d ) {
         RationalImpl t = simplify( &n, &d );                            // simplify
 …
 // getter for numerator/denominator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl numerator( Rational(RationalImpl) r ) {
         return r.numerator;
 } // numerator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl denominator( Rational(RationalImpl) r ) {
         return r.denominator;
 } // denominator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 [ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational(RationalImpl) src ) {
         return *dest = src.[ numerator, denominator ];
 …
 // setter for numerator/denominator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl numerator( Rational(RationalImpl) r, RationalImpl n ) {
         RationalImpl prev = r.numerator;
 …
 } // numerator
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 RationalImpl denominator( Rational(RationalImpl) r, RationalImpl d ) {
         RationalImpl prev = r.denominator;
 …
 // comparison
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?==?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return l.numerator * r.denominator == l.denominator * r.numerator;
 } // ?==?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?!=?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return ! ( l == r );
 } // ?!=?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?<?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return l.numerator * r.denominator < l.denominator * r.numerator;
 } // ?<?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?<=?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return l.numerator * r.denominator <= l.denominator * r.numerator;
 } // ?<=?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?>?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return ! ( l <= r );
 } // ?>?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 int ?>=?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return ! ( l < r );
 …
 // arithmetic
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) +?( Rational(RationalImpl) r ) {
         Rational(RationalImpl) t = { r.numerator, r.denominator };
 …
 } // +?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) -?( Rational(RationalImpl) r ) {
         Rational(RationalImpl) t = { -r.numerator, r.denominator };
 …
 } // -?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?+?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         if ( l.denominator == r.denominator ) {                         // special case
 …
 } // ?+?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?-?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         if ( l.denominator == r.denominator ) {                         // special case
 …
 } // ?-?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?*?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         Rational(RationalImpl) t = { l.numerator * r.numerator, l.denominator * r.denominator };
 …
 } // ?*?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 Rational(RationalImpl) ?/?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         if ( r.numerator < (RationalImpl){0} ) {
 …
 // conversion
 forall( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
 double widen( Rational(RationalImpl) r ) {
         return convert( r.numerator ) / convert( r.denominator );
 …
 // http://www.ics.uci.edu/~eppstein/numth/frap.c
 forall( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); RationalImpl convert( double ); } )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); RationalImpl convert( double ); } )
 Rational(RationalImpl) narrow( double f, RationalImpl md ) {
         if ( md <= (RationalImpl){1} ) {                                        // maximum fractional digits too small?
 …
 // I/O
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 forall( dtype istype | istream( istype ) | { istype * ?|?( istype *, RationalImpl * ); } )
 istype * ?|?( istype * is, Rational(RationalImpl) * r ) {
 …
 } // ?|?
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 forall( dtype ostype | ostream( ostype ) | { ostype * ?|?( ostype *, RationalImpl ); } )
 ostype * ?|?( ostype * os, Rational(RationalImpl ) r ) {

src/libcfa/stdlib

-              r3d4b23fa
+              r55a68c3
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul  7 09:34:49 2017
+// Update Count     : 219
+//
+#pragma once
+// Last Modified On : Fri Jun  2 15:51:03 2017
+// Update Count     : 218
+//
+#ifndef STDLIB_H
+#define STDLIB_H
 //---------------------------------------
 …
 void swap( T * t1, T * t2 );
+#endif // STDLIB_H
 // Local Variables: //
 // mode: c //

src/main.cc

-              r3d4b23fa
+              r55a68c3
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul  7 11:13:00 2017
 // Update Count     : 442
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun 29 12:46:50 2017
+// Update Count     : 441
 //
+#include <cassert>                          // for assertf
+#include <cxxabi.h>                         // for __cxa_demangle
+#include <execinfo.h>                       // for backtrace, backtrace_symbols
+#include <getopt.h>                         // for no_argument, optind, geto...
+#include <signal.h>                         // for signal, SIGABRT, SIGSEGV
+#include <cstdio>                           // for fopen, FILE, fclose, stdin
+#include <cstdlib>                          // for exit, free, abort, EXIT_F...
+#include <cstring>                          // for index
+#include <fstream>                          // for ofstream
+#include <iostream>                         // for operator<<, basic_ostream
+#include <iterator>                         // for back_inserter
+#include <list>                             // for list
+#include <string>                           // for operator<<, allocator
+#include "../config.h"                      // for CFA_LIBDIR
+#include "CodeGen/FixMain.h"                // for FixMain
+#include "CodeGen/FixNames.h"               // for fixNames
+#include "CodeGen/Generate.h"               // for generate
+#include "CodeTools/DeclStats.h"            // for printDeclStats
+#include "CodeTools/TrackLoc.h"             // for fillLocations
+#include "Common/CompilerError.h"           // for CompilerError
+#include "Common/SemanticError.h"           // for SemanticError
+#include "Common/UnimplementedError.h"      // for UnimplementedError
+#include "Common/utility.h"                 // for deleteAll, filter, printAll
+#include "ControlStruct/ExceptTranslate.h"  // for translateEHM
+#include "ControlStruct/Mutate.h"           // for mutate
+#include "GenPoly/Box.h"                    // for box
+#include "GenPoly/CopyParams.h"             // for copyParams
+#include "GenPoly/InstantiateGeneric.h"     // for instantiateGeneric
+#include "GenPoly/Lvalue.h"                 // for convertLvalue
+#include "GenPoly/Specialize.h"             // for convertSpecializations
+#include "InitTweak/FixInit.h"              // for fix
+#include "InitTweak/GenInit.h"              // for genInit
+#include "MakeLibCfa.h"                     // for makeLibCfa
+#include "Parser/LinkageSpec.h"             // for Spec, Cforall, Intrinsic
+#include "Parser/ParseNode.h"               // for DeclarationNode, buildList
+#include "Parser/TypedefTable.h"            // for TypedefTable
+#include "ResolvExpr/AlternativePrinter.h"  // for AlternativePrinter
+#include "ResolvExpr/Resolver.h"            // for resolve
+#include "SymTab/Validate.h"                // for validate
+#include "SynTree/Declaration.h"            // for Declaration
+#include "SynTree/Visitor.h"                // for acceptAll
+#include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
+#include <iostream>
+#include <fstream>
+#include <signal.h>                                                                             // signal
+#include <getopt.h>                                                                             // getopt
+#include <execinfo.h>                                                                   // backtrace, backtrace_symbols
+#include <cxxabi.h>                                                                             // __cxa_demangle
+#include <cstring>                                                                              // index
+using namespace std;
+#include "Parser/ParserTypes.h"
+#include "Parser/TypedefTable.h"
+#include "GenPoly/Lvalue.h"
+#include "GenPoly/Specialize.h"
+#include "GenPoly/Box.h"
+#include "GenPoly/CopyParams.h"
+#include "GenPoly/InstantiateGeneric.h"
+#include "Concurrency/Keywords.h"
+#include "CodeGen/Generate.h"
+#include "CodeGen/FixNames.h"
+#include "CodeGen/FixMain.h"
+#include "CodeTools/DeclStats.h"
+#include "CodeTools/TrackLoc.h"
+#include "ControlStruct/Mutate.h"
+#include "ControlStruct/ExceptTranslate.h"
+#include "SymTab/Validate.h"
+#include "ResolvExpr/AlternativePrinter.h"
+#include "ResolvExpr/Resolver.h"
+#include "MakeLibCfa.h"
+#include "InitTweak/GenInit.h"
+#include "InitTweak/FixInit.h"
+#include "Common/UnimplementedError.h"
+#include "../config.h"
+#include "Tuples/Tuples.h"
 using namespace std;
 …
                                 FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                                 assertf( builtins, "cannot open builtins.cf\n" );
                                 parse( builtins, LinkageSpec::BuiltinCFA );
+                                parse( builtins, LinkageSpec::Builtin );
                         } // if
                 } // if

src/prelude/Makefile.in

-              r3d4b23fa
+              r55a68c3
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/prelude/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/prelude/Makefile'; \
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/prelude/Makefile
+          $(AUTOMAKE) --gnu src/prelude/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \

src/tests/.expect/32/math.txt

r3d4b23fa	r55a68c3
22	22	cos:0.540302 0.54030230586814 0.540302305868139717 0.83373-0.988898i 0.833730025131149-0.988897705762865i 0.833730025131149049-0.988897705762865096i
23	23	tan:1.55741 1.5574077246549 1.55740772465490223 0.271753+1.08392i 0.271752585319512+1.08392332733869i 0.271752585319511717+1.08392332733869454i
24		asin:1.5708 1.5707963267949 1.57079632679489662 0.666239+1.06128i 0.666239432492515+1.06127506190504i 0.666239432492515255+1.06127506190503565i
	24	asin:1.5708 1.5707963267949 1.57079632679489662 0.66624+1.06128i 0.666239432492515+1.06127506190504i 0.666239432492515255+1.06127506190503565i
25	25	acos:0 0 0 0.904557-1.06128i 0.904556894302381-1.06127506190504i 0.904556894302381364-1.06127506190503565i
26	26	atan:0.785398 0.785398163397448 0.78539816339744831 1.01722+0.402359i 1.01722196789785+0.402359478108525i 1.01722196789785137+0.402359478108525094i

src/tests/.expect/concurrent/sched-int-disjoint.txt

r3d4b23fa	r55a68c3
9	9	9000
10	10	10000
	11	11000
	12	12000
	13	13000
	14	14000
	15	15000
	16	16000
	17	17000
	18	18000
	19	19000
	20	20000
	21	21000
	22	22000
	23	23000
	24	24000
	25	25000
	26	26000
	27	27000
	28	28000
	29	29000
	30	30000
	31	31000
	32	32000
	33	33000
	34	34000
	35	35000
	36	36000
	37	37000
	38	38000
	39	39000
	40	40000
	41	41000
	42	42000
	43	43000
	44	44000
	45	45000
	46	46000
	47	47000
	48	48000
	49	49000
	50	50000
	51	51000
	52	52000
	53	53000
	54	54000
	55	55000
	56	56000
	57	57000
	58	58000
	59	59000
	60	60000
	61	61000
	62	62000
	63	63000
	64	64000
	65	65000
	66	66000
	67	67000
	68	68000
	69	69000
	70	70000
	71	71000
	72	72000
	73	73000
	74	74000
	75	75000
	76	76000
	77	77000
	78	78000
	79	79000
	80	80000
	81	81000
	82	82000
	83	83000
	84	84000
	85	85000
	86	86000
	87	87000
	88	88000
	89	89000
	90	90000
	91	91000
	92	92000
	93	93000
	94	94000
	95	95000
	96	96000
	97	97000
	98	98000
	99	99000
	100	100000
11	101	All waiter done

src/tests/.expect/io.txt

-              r3d4b23fa
+              r55a68c3
 opening delimiters
+opening delimiters
 x (1 x [2 x {3 x =4 x $5 x £6 x ¥7 x ¡8 x ¿9 x «10
 closing delimiters
 , x 2. x 3; x 4! x 5? x 6% x 7¢ x 8» x 9) x 10] x 11} x
+closing delimiters
+, x 2. x 3; x 4! x 5? x 6% x 7¢ x 8» x 9) x 10] x 11} x
 opening/closing delimiters
+opening/closing delimiters
 x`1`x'2'x"3"x:4:x 5 x   6       x
 …
+x
+x
+x
 override opening/closing delimiters
+override opening/closing delimiters
 x ( 1 ) x 2 , x 3 :x: 4
 input bacis types
+input bacis types
 output basic types
+output basic types
+A
 2 3 4 5 6 7 8
 …
 .1+2.3i 1.1-2.3i 1.1-2.3i
 tuples
 , 2, 3 4, 5, 6
+tuples
+, 2, 3 3, 4, 5
 toggle separator
+toggle separator
 .11.21.3
 .1+2.3i1.1-2.3i1.1-2.3i
+.1+2.3i 1.1-2.3i1.1-2.3i
+.1+2.3i 1.1-2.3i 1.1-2.3i
+.1+2.3i1.1-2.3i 1.1-2.3i
+abcxyz
+abcxyz
+ abcxyz
+abcxyz
 change separator
 from " " to ", $"
+change separator
+from "  "to " , $"
 .1, $1.2, $1.3
 .1+2.3i, $1.1-2.3i, $1.1-2.3i
 abc, $xyz
 , 2, 3, $4, 5, 6
+abc, $xyz, $
+, 2, 3, $3, 4, 5
 from ", $" to " "
+from ", $"to " "
 .1 1.2 1.3
 .1+2.3i 1.1-2.3i 1.1-2.3i
 abc xyz
 , 2, 3 4, 5, 6
+abc xyz
+, 2, 3 3, 4, 5
+check sepOn/sepOff
+2 3
+3
+2 3
 2 3
+3
+2 3
+2 3
+2 3
-2 3
-check enable/disable
 23
 …
 2 3
 2 3
 2 3 4 5 6 " "
 , 2, 3 4, 5, 6 " "
 , 2, 3 4, 5, 6
+2 3 3 4 5 " "
+, 2, 3 3, 4, 5 ", "
+, 2, 3 3, 4, 5
 , 4, a, 7.2
 , 4, a, 7.2
 4 a 7.2
 4 a 7.234a7.23 4 a 7.2
+4 a 7.234a7.23 4 a 7.2
 -4-a-7.2^3^4^3-4-a-7.2

src/tests/Makefile.am

-              r3d4b23fa
+              r55a68c3
 # applies to both programs
+DEBUG_FLAGS =
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@
+if !BUILD_DEBUG
+BUILD_FLAGS += -nodebug
+else
+if !BUILD_RELEASE
+BUILD_FLAGS += -debug
+else
+BUILD_FLAGS += ${DEBUG_FLAGS}
+endif
+endif
+EXTRA_FLAGS =
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
 TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}

src/tests/Makefile.in

-              r3d4b23fa
+              r55a68c3
 host_triplet = @host@
 @BUILD_CONCURRENCY_TRUE@am__append_1 = coroutine thread monitor
-@BUILD_DEBUG_FALSE@am__append_2 = -nodebug
-@BUILD_DEBUG_TRUE@@BUILD_RELEASE_FALSE@am__append_3 = -debug
-@BUILD_DEBUG_TRUE@@BUILD_RELEASE_TRUE@am__append_4 = ${DEBUG_FLAGS}
 EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
         avl_test$(EXEEXT)
 …
 # applies to both programs
+DEBUG_FLAGS =
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ \
+        $(am__append_2) $(am__append_3) $(am__append_4)
+EXTRA_FLAGS =
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
 TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
 …
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tests/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tests/Makefile'; \
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/tests/Makefile
+          $(AUTOMAKE) --gnu src/tests/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \

src/tests/io.c

-              r3d4b23fa
+              r55a68c3
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jul  6 23:26:12 2017
 // Update Count     : 78
+// Last Modified On : Sun Jul  2 09:40:58 2017
+// Update Count     : 68
 //
 …
         sout | "tuples" | endl;
         [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
+        [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 3, [ 4, 5 ] ];
         sout | t1 | t2 | endl;                                                          // print tuple
         sout | endl;
 …
         sout | "toggle separator" | endl;
         sout | f | "" | d | "" | ld | endl                                      // floating point without separator
+                | sepDisable | fc | dc | ldc | endl                             // complex without separator
+                | fc | sepOn | dc | ldc | endl                                  // local separator add
+                | sepEnable | fc | dc | ldc | endl                              // complex with separator
+                | fc | sepOff | dc | ldc | endl                                 // local separator removal
+                | s1 | sepOff | s2 | endl                                               // local separator removal
+                | s1 | "" | s2 | endl;                                                  // local separator removal
+                | sepDisable | fc | dc | ldc | sepEnable | endl // complex without separator
+                | sepOn | s1 | sepOff | s2 | endl                               // local separator removal
+                | s1 | "" | s2 | endl;                                                  // C string without separator
         sout | endl;
         sout | "change separator" | endl;
         sout | "from \"" | sep | "\"";
+        sout | "from \" " | sepGet( sout ) | "\"";
         sepSet( sout, ", $" );                                                          // change separator, maximum of 15 characters
         sout | " to \"" | sep | "\"" | endl;
+        sout | "to \" " | sepGet( sout ) | "\"" | endl;
         sout | f | d | ld | endl
                 | fc | dc | ldc | endl
 …
                 | t1 | t2 | endl;                                                               // print tuple
         sout | endl;
         sout | "from \"" | sep | "\" ";
+        sout | "from \"" | sepGet( sout ) | "\"";
         sepSet( sout, " " );                                                            // restore separator
         sout | "to \"" | sep | "\"" | endl;
+        sout | "to \"" | sepGet( sout ) | "\"" | endl;
         sout | f | d | ld | endl
                 | fc | dc | ldc | endl
 …
         sout | endl;
+        sout | "check sepOn/sepOff" | endl;
+        sout | sepOn | 1 | 2 | 3 | sepOn | endl;                        // no separator at start/end of line
+        sout | sepOn | 1 | 2 | 3 | sepOn | endl;                        // separator at start/end of line
         sout | 1 | sepOff | 2 | 3 | endl;                                       // locally turn off implicit separator
         sout | sepOn | sepOn | 1 | 2 | 3 | sepOn | sepOff | sepOn | '\n'; // no separator at start/end of line
         sout | 1 | 2 | 3 | "\n\n" | sepOn;                                      // no separator at start of next line
+        sout | sepOn | 1 | 2 | 3 | sepOn | sepOff | endl;       // separator at start of line
+        sout | 1 | 2 | 3 | endl | sepOn;                                        // separator at start of next line
         sout | 1 | 2 | 3 | endl;
         sout | endl;
-        sout | "check enable/disable" | endl;
         sout | sepDisable | 1 | 2 | 3 | endl;                           // globally turn off implicit separation
         sout | 1 | sepOn | 2 | 3 | endl;                                        // locally turn on implicit separator
 …
         sout | endl;
-//      sout | fmt( d, "%8.3f" ) || endl;
-//      sout | endl;
         sepSetTuple( sout, " " );                                                       // set tuple separator from ", " to " "
         sout | t1 | t2 | " \"" | sep | "\"" | endl;
+        sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
         sepSetTuple( sout, ", " );                                                      // reset tuple separator to ", "
         sout | t1 | t2 | " \"" | sep | "\"" | endl;
+        sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
         sout | t1 | t2 | endl;                                                          // print tuple
         sout | endl;

src/tests/preempt_longrun/Makefile.am

-              r3d4b23fa
+              r55a68c3
 ## Author           : Thierry Delisle
 ## Created On       : Fri Jun 16 10:57:34 2017
 ## Last Modified By :
 ## Last Modified On :
+## Last Modified By :
+## Last Modified On :
 ## Update Count     : 0
 ###############################################################################
 repeats=10
 max_time=600
 preempt=1_000ul
+max_time=30
+preempt=10_000ul
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
 …
 CC = @CFA_BINDIR@/@CFA_NAME@
 TESTS = barge block create disjoint enter enter3 processor stack wait yield
+TESTS = barge block create disjoint processor stack wait yield
 .INTERMEDIATE: ${TESTS}

src/tests/preempt_longrun/Makefile.in

-              r3d4b23fa
+              r55a68c3
 top_srcdir = @top_srcdir@
 repeats = 10
 max_time = 600
 preempt = 1_000ul
+max_time = 30
+preempt = 10_000ul
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
 TESTS = barge block create disjoint enter enter3 processor stack wait yield
+TESTS = barge block create disjoint processor stack wait yield
 all: all-am
 …
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tests/preempt_longrun/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tests/preempt_longrun/Makefile'; \
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign src/tests/preempt_longrun/Makefile
+          $(AUTOMAKE) --gnu src/tests/preempt_longrun/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
 …
         $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
         "$$tst" $(AM_TESTS_FD_REDIRECT)
-enter.log: enter
-        @p='enter'; \
-        b='enter'; \
-        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-        --log-file $$b.log --trs-file $$b.trs \
-        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-        "$$tst" $(AM_TESTS_FD_REDIRECT)
-enter3.log: enter3
-        @p='enter3'; \
-        b='enter3'; \
-        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-        --log-file $$b.log --trs-file $$b.trs \
-        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-        "$$tst" $(AM_TESTS_FD_REDIRECT)
 processor.log: processor
         @p='processor'; \

src/tests/preempt_longrun/create.c

r3d4b23fa	r55a68c3
10	10	}
11	11
12		thread ~~worker_t~~ {};
	12	thread Worker {};
13	13
14		void main(~~worker_t~~ * this) {}
	14	void main(Worker * this) {}
15	15
16	16	int main(int argc, char* argv[]) {
17		processor p;
18		for(int i = 0; i < 10_000ul; i++) {
19		worker_t w[7];
	17	for(int i = 0; i < 100_000ul; i++) {
	18	Worker w;
20	19	}
21	20	}

src/tests/preempt_longrun/processor.c

-              r3d4b23fa
+              r55a68c3
+}
 thread worker_t {};
+thread Worker {};
 void main(worker_t * this) {}
+void main(Worker * this) {}
 int main(int argc, char* argv[]) {
         for(int i = 0; i < 10_000ul; i++) {
+        for(int i = 0; i < 100_000ul; i++) {
                 processor p;
+        }

src/tests/preempt_longrun/stack.c

-              r3d4b23fa
+              r55a68c3
+}
 thread worker_t {};
+thread Worker {};
 void main(worker_t * this) {
+void main(Worker * this) {
         volatile long p = 5_021_609ul;
         volatile long a = 326_417ul;
         volatile long n = 1l;
         for (volatile long i = 0; i < p; i++) {
                 n *= a;
                 n %= p;
+        for (volatile long i = 0; i < p; i++) {
+                n *= a;
+                n %= p;
+        }
         if( n != a ) {
                 abort();
 …
+}
-extern "C" {
-static worker_t * workers;
+}
 int main(int argc, char* argv[]) {
         processor p;
+        {
+                worker_t w[7];
+                workers = w;
+                Worker w[7];
+        }
+}

src/tests/preempt_longrun/yield.c

r3d4b23fa	r55a68c3
10	10	}
11	11
12		thread ~~worker_t~~ {};
	12	thread Worker {};
13	13
14		void main(~~worker_t~~ * this) {
15		for(int i = 0; i < ~~325~~_000ul; i++) {
	14	void main(Worker * this) {
	15	for(int i = 0; i < 100_000ul; i++) {
16	16	yield();
17	17	}
18		}
19
20		~~extern "C" {~~
21		~~static worker_t * workers;~~
22	18	}
23	19
…	…
25	21	processor p;
26	22	{
27		worker_t w[7];
28		workers = w;
	23	Worker w[7];
29	24	}
30	25	}

src/tests/sched-int-block.c

-              r3d4b23fa
+              r55a68c3
 #ifndef N
 #define N 10_000
+#define N 100_000
 #endif
 …
 //------------------------------------------------------------------------------
 void wait_op( global_data_t * mutex a, global_data_t * mutex b, unsigned i ) {
         wait( &cond, (uintptr_t)this_thread );
+        wait( &cond, (uintptr_t)this_thread() );
         yield( ((unsigned)rand48()) % 10 );
 …
+        }
         a->last_thread = b->last_thread = this_thread;
+        a->last_thread = b->last_thread = this_thread();
         yield( ((unsigned)rand48()) % 10 );
 …
         yield( ((unsigned)rand48()) % 10 );
         a->last_thread = b->last_thread = a->last_signaller = b->last_signaller = this_thread;
+        a->last_thread = b->last_thread = a->last_signaller = b->last_signaller = this_thread();
         if( !is_empty( &cond ) ) {
 …
 //------------------------------------------------------------------------------
 void barge_op( global_data_t * mutex a ) {
         a->last_thread = this_thread;
+        a->last_thread = this_thread();
+}

src/tests/sched-int-disjoint.c

-              r3d4b23fa
+              r55a68c3
 #ifndef N
 #define N 10_000
+#define N 100_000
 #endif
 …
 void main( Barger * this ) {
         while( !all_done ) {
+        while( !all_done ) {
                 barge( &data );
                 yield();
+                yield();
+        }
+}
 …
         wait( &cond );
         if( d->state != SIGNAL ) {
                 sout | "ERROR barging!" | endl;
+                sout | "ERROR barging!" | endl;
+        }
 …
         bool running = data.counter < N && data.counter > 0;
         if( data.state != SIGNAL && running ) {
                 sout | "ERROR Eager signal" | data.state | endl;
+                sout | "ERROR Eager signal" | data.state | endl;
+        }
+}
 …
 void main( Signaller * this ) {
         while( !all_done ) {
+        while( !all_done ) {
                 logic( &mut );
                 yield();
+                yield();
+        }
+}
 …
                 sout | "All waiter done" | endl;
                 all_done = true;
+        }
+        }
+}

src/tests/sched-int-wait.c

-              r3d4b23fa
+              r55a68c3
                 unsigned action = (unsigned)rand48() % 4;
                 switch( action ) {
                         case 0:
+                        case 0:
                                 signal( &condABC, &globalA, &globalB, &globalC );
                                 break;
                         case 1:
+                        case 1:
                                 signal( &condAB , &globalA, &globalB );
                                 break;
                         case 2:
+                        case 2:
                                 signal( &condBC , &globalB, &globalC );
                                 break;
                         case 3:
+                        case 3:
                                 signal( &condAC , &globalA, &globalC );
                                 break;
 …
+                }
                 yield();
+        }
+        }
+}

src/tests/test.py

-              r3d4b23fa
+              r55a68c3
         # build, skipping to next test on error
         make_ret, _ = sh("""%s test=yes DEBUG_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
+        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
         retcode = 0
 …
                         error = myfile.read()
         # clean the executable
         sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)

src/tests/thread.c

-              r3d4b23fa
+              r55a68c3
 #include <thread>
 thread First  { semaphore* lock; };
 thread Second { semaphore* lock; };
+// thread First;
+// void main(First* this);
+void ?{}( First * this, semaphore* lock ) { this->lock = lock; }
+void ?{}( Second * this, semaphore* lock ) { this->lock = lock; }
+// thread Second;
+// void main(Second* this);
+thread First  { signal_once* lock; };
+thread Second { signal_once* lock; };
+void ?{}( First * this, signal_once* lock ) { this->lock = lock; }
+void ?{}( Second * this, signal_once* lock ) { this->lock = lock; }
 void main(First* this) {
 …
                 yield();
+        }
         V(this->lock);
+        signal(this->lock);
+}
 void main(Second* this) {
         P(this->lock);
+        wait(this->lock);
         for(int i = 0; i < 10; i++) {
                 sout | "Second : Suspend No." | i + 1 | endl;
 …
 int main(int argc, char* argv[]) {
         semaphore lock = { 0 };
+        signal_once lock;
         sout | "User main begin" | endl;
+        {

tools/prettyprinter/Makefile.in

-              r3d4b23fa
+              r55a68c3
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/prettyprinter/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/prettyprinter/Makefile'; \
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign tools/prettyprinter/Makefile
+          $(AUTOMAKE) --gnu tools/prettyprinter/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \

Context Navigation

Changes in / [3d4b23fa:55a68c3]

Legend:

Download in other formats: