Index: doc/papers/general/Makefile =================================================================== --- doc/papers/general/Makefile (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ doc/papers/general/Makefile (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -18,4 +18,5 @@ FIGURES = ${addsuffix .tex, \ +Cdecl \ } Index: doc/papers/general/Paper.tex =================================================================== --- doc/papers/general/Paper.tex (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ doc/papers/general/Paper.tex (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -2,4 +2,5 @@ \usepackage{fullpage} +\usepackage{epic,eepic} \usepackage{xspace,calc,comment} \usepackage{upquote} % switch curled `'" to straight @@ -36,5 +37,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newcommand{\Textbf}[1]{{\color{red}\textbf{#1}}} +\newcommand{\Textbf}[2][red]{{\color{#1}{\textbf{#2}}}} \newcommand{\TODO}[1]{\textbf{TODO}: {\itshape #1}} % TODO included %\newcommand{\TODO}[1]{} % TODO elided @@ -101,4 +102,11 @@ \makeatother +\newenvironment{cquote}{% + \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindent\rightmargin\leftmargin}% + \item\relax +}{% + \endlist +}% cquote + % CFA programming language, based on ANSI C (with some gcc additions) \lstdefinelanguage{CFA}[ANSI]{C}{ @@ -226,8 +234,8 @@ int forty_two = identity( 42 ); $\C{// T is bound to int, forty\_two == 42}$ \end{lstlisting} -The @identity@ function above can be applied to any complete \emph{object type} (or @otype@). +The @identity@ function above can be applied to any complete \newterm{object type} (or @otype@). The type variable @T@ is transformed into a set of additional implicit parameters encoding sufficient information about @T@ to create and return a variable of that type. The \CFA implementation passes the size and alignment of the type represented by an @otype@ parameter, as well as an assignment operator, constructor, copy constructor and destructor. -If this extra information is not needed, \eg for a pointer, the type parameter can be declared as a \emph{data type} (or @dtype@). +If this extra information is not needed, \eg for a pointer, the type parameter can be declared as a \newterm{data type} (or @dtype@). In \CFA, the polymorphism runtime-cost is spread over each polymorphic call, due to passing more arguments to polymorphic functions; @@ -235,5 +243,5 @@ A design advantage is that, unlike \CC template-functions, \CFA polymorphic-functions are compatible with C \emph{separate compilation}, preventing compilation and code bloat. -Since bare polymorphic-types provide a restricted set of available operations, \CFA provides a \emph{type assertion}~\cite[pp.~37-44]{Alphard} mechanism to provide further type information, where type assertions may be variable or function declarations that depend on a polymorphic type-variable. +Since bare polymorphic-types provide a restricted set of available operations, \CFA provides a \newterm{type assertion}~\cite[pp.~37-44]{Alphard} mechanism to provide further type information, where type assertions may be variable or function declarations that depend on a polymorphic type-variable. For example, the function @twice@ can be defined using the \CFA syntax for operator overloading: \begin{lstlisting} @@ -302,18 +310,8 @@ \end{lstlisting} Here, the single name @MAX@ replaces all the C type-specific names: @SHRT_MAX@, @INT_MAX@, @DBL_MAX@. -As well, restricted constant overloading is allowed for the values @0@ and @1@, which have special status in C, \eg the value @0@ is both an integer and a pointer literal, so its meaning depends on context. -In addition, several operations are defined in terms values @0@ and @1@, \eg: -\begin{lstlisting} -int x; -if (x) x++ $\C{// if (x != 0) x += 1;}$ -\end{lstlisting} -Every @if@ and iteration statement in C compares the condition with @0@, and every increment and decrement operator is semantically equivalent to adding or subtracting the value @1@ and storing the result. -Due to these rewrite rules, the values @0@ and @1@ have the types @zero_t@ and @one_t@ in \CFA, which allows overloading various operations for new types that seamlessly connect to all special @0@ and @1@ contexts. -The types @zero_t@ and @one_t@ have special built in implicit conversions to the various integral types, and a conversion to pointer types for @0@, which allows standard C code involving @0@ and @1@ to work as normal. - \subsection{Traits} -\CFA provides \emph{traits} to name a group of type assertions, where the trait name allows specifying the same set of assertions in multiple locations, preventing repetition mistakes at each function declaration: +\CFA provides \newterm{traits} to name a group of type assertions, where the trait name allows specifying the same set of assertions in multiple locations, preventing repetition mistakes at each function declaration: \begin{lstlisting} trait summable( otype T ) { @@ -339,5 +337,5 @@ Given the information provided for an @otype@, variables of polymorphic type can be treated as if they were a complete type: stack-allocatable, default or copy-initialized, assigned, and deleted. -In summation, the \CFA type-system uses \emph{nominal typing} for concrete types, matching with the C type-system, and \emph{structural typing} for polymorphic types. +In summation, the \CFA type-system uses \newterm{nominal typing} for concrete types, matching with the C type-system, and \newterm{structural typing} for polymorphic types. Hence, trait names play no part in type equivalence; the names are simply macros for a list of polymorphic assertions, which are expanded at usage sites. @@ -384,5 +382,5 @@ Furthermore, writing and using preprocessor macros can be unnatural and inflexible. -\CC, Java, and other languages use \emph{generic types} to produce type-safe abstract data-types. +\CC, Java, and other languages use \newterm{generic types} to produce type-safe abstract data-types. \CFA also implements generic types that integrate efficiently and naturally with the existing polymorphic functions, while retaining backwards compatibility with C and providing separate compilation. However, for known concrete parameters, the generic-type definition can be inlined, like \CC templates. @@ -405,7 +403,7 @@ \end{lstlisting} -\CFA classifies generic types as either \emph{concrete} or \emph{dynamic}. +\CFA classifies generic types as either \newterm{concrete} or \newterm{dynamic}. Concrete types have a fixed memory layout regardless of type parameters, while dynamic types vary in memory layout depending on their type parameters. -A type may have polymorphic parameters but still be concrete, called \emph{dtype-static}. +A type may have polymorphic parameters but still be concrete, called \newterm{dtype-static}. Polymorphic pointers are an example of dtype-static types, \eg @forall(dtype T) T *@ is a polymorphic type, but for any @T@, @T *@ is a fixed-sized pointer, and therefore, can be represented by a @void *@ in code generation. @@ -444,5 +442,5 @@ Though \CFA implements concrete generic-types efficiently, it also has a fully general system for dynamic generic types. As mentioned in Section~\ref{sec:poly-fns}, @otype@ function parameters (in fact all @sized@ polymorphic parameters) come with implicit size and alignment parameters provided by the caller. -Dynamic generic-types also have an \emph{offset array} containing structure-member offsets. +Dynamic generic-types also have an \newterm{offset array} containing structure-member offsets. A dynamic generic-union needs no such offset array, as all members are at offset 0, but size and alignment are still necessary. Access to members of a dynamic structure is provided at runtime via base-displacement addressing with the structure pointer and the member offset (similar to the @offsetof@ macro), moving a compile-time offset calculation to runtime. @@ -457,5 +455,5 @@ For instance, modularity is generally provided in C by including an opaque forward-declaration of a structure and associated accessor and mutator functions in a header file, with the actual implementations in a separately-compiled @.c@ file. \CFA supports this pattern for generic types, but the caller does not know the actual layout or size of the dynamic generic-type, and only holds it by a pointer. -The \CFA translator automatically generates \emph{layout functions} for cases where the size, alignment, and offset array of a generic struct cannot be passed into a function from that function's caller. +The \CFA translator automatically generates \newterm{layout functions} for cases where the size, alignment, and offset array of a generic struct cannot be passed into a function from that function's caller. These layout functions take as arguments pointers to size and alignment variables and a caller-allocated array of member offsets, as well as the size and alignment of all @sized@ parameters to the generic structure (un@sized@ parameters are forbidden from being used in a context that affects layout). Results of these layout functions are cached so that they are only computed once per type per function. %, as in the example below for @pair@. @@ -481,5 +479,5 @@ Since @pair(T *, T * )@ is a concrete type, there are no implicit parameters passed to @lexcmp@, so the generated code is identical to a function written in standard C using @void *@, yet the \CFA version is type-checked to ensure the fields of both pairs and the arguments to the comparison function match in type. -Another useful pattern enabled by reused dtype-static type instantiations is zero-cost \emph{tag-structures}. +Another useful pattern enabled by reused dtype-static type instantiations is zero-cost \newterm{tag-structures}. Sometimes information is only used for type-checking and can be omitted at runtime, \eg: \begin{lstlisting} @@ -537,7 +535,7 @@ The addition of multiple-return-value functions (MRVF) are useless without a syntax for accepting multiple values at the call-site. The simplest mechanism for capturing the return values is variable assignment, allowing the values to be retrieved directly. -As such, \CFA allows assigning multiple values from a function into multiple variables, using a square-bracketed list of lvalue expressions (as above), called a \emph{tuple}. - -However, functions also use \emph{composition} (nested calls), with the direct consequence that MRVFs must also support composition to be orthogonal with single-returning-value functions (SRVF), \eg: +As such, \CFA allows assigning multiple values from a function into multiple variables, using a square-bracketed list of lvalue expressions (as above), called a \newterm{tuple}. + +However, functions also use \newterm{composition} (nested calls), with the direct consequence that MRVFs must also support composition to be orthogonal with single-returning-value functions (SRVF), \eg: \begin{lstlisting} printf( "%d %d\n", div( 13, 5 ) ); $\C{// return values seperated into arguments}$ @@ -572,5 +570,5 @@ printf( "%d %d\n", qr ); \end{lstlisting} -\CFA also supports \emph{tuple indexing} to access single components of a tuple expression: +\CFA also supports \newterm{tuple indexing} to access single components of a tuple expression: \begin{lstlisting} [int, int] * p = &qr; $\C{// tuple pointer}$ @@ -615,6 +613,6 @@ \subsection{Tuple Assignment} -An assignment where the left side is a tuple type is called \emph{tuple assignment}. -There are two kinds of tuple assignment depending on whether the right side of the assignment operator has a tuple type or a non-tuple type, called \emph{multiple} and \emph{mass assignment}, respectively. +An assignment where the left side is a tuple type is called \newterm{tuple assignment}. +There are two kinds of tuple assignment depending on whether the right side of the assignment operator has a tuple type or a non-tuple type, called \newterm{multiple} and \newterm{mass assignment}, respectively. %\lstDeleteShortInline@% %\par\smallskip @@ -650,5 +648,5 @@ \subsection{Member Access} -It is also possible to access multiple fields from a single expression using a \emph{member-access}. +It is also possible to access multiple fields from a single expression using a \newterm{member-access}. The result is a single tuple-valued expression whose type is the tuple of the types of the members, \eg: \begin{lstlisting} @@ -780,5 +778,5 @@ Matching against a @ttype@ parameter consumes all remaining argument components and packages them into a tuple, binding to the resulting tuple of types. In a given parameter list, there must be at most one @ttype@ parameter that occurs last, which matches normal variadic semantics, with a strong feeling of similarity to \CCeleven variadic templates. -As such, @ttype@ variables are also called \emph{argument packs}. +As such, @ttype@ variables are also called \newterm{argument packs}. Like variadic templates, the main way to manipulate @ttype@ polymorphic functions is via recursion. @@ -852,5 +850,5 @@ \subsection{Implementation} -Tuples are implemented in the \CFA translator via a transformation into \emph{generic types}. +Tuples are implemented in the \CFA translator via a transformation into \newterm{generic types}. For each $N$, the first time an $N$-tuple is seen in a scope a generic type with $N$ type parameters is generated, \eg: \begin{lstlisting} @@ -903,5 +901,5 @@ Similarly, tuple member expressions are recursively expanded into a list of member access expressions. -Expressions that may contain side effects are made into \emph{unique expressions} before being expanded by the flattening conversion. +Expressions that may contain side effects are made into \newterm{unique expressions} before being expanded by the flattening conversion. Each unique expression is assigned an identifier and is guaranteed to be executed exactly once: \begin{lstlisting} @@ -1052,8 +1050,8 @@ \label{s:WithClauseStatement} -Grouping heterogenous data into \newterm{aggregate}s is a common programming practice, and an aggregate can be further organized into more complex structures, such as arrays and containers: -\begin{cfa} -struct S { $\C{// aggregate}$ - char c; $\C{// fields}$ +Grouping heterogenous data into \newterm{aggregate}s (structure/union) is a common programming practice, and an aggregate can be further organized into more complex structures, such as arrays and containers: +\begin{cfa} +struct S { $\C{// aggregate}$ + char c; $\C{// fields}$ int i; double d; @@ -1061,8 +1059,8 @@ S s, as[10]; \end{cfa} -However, routines manipulating aggregates have repeition of the aggregate name to access its containing fields: +However, routines manipulating aggregates must repeat the aggregate name to access its containing fields: \begin{cfa} void f( S s ) { - `s.`c; `s.`i; `s.`d; $\C{// access containing fields}$ + `s.`c; `s.`i; `s.`d; $\C{// access containing fields}$ } \end{cfa} @@ -1070,17 +1068,25 @@ \begin{C++} class C { - char c; $\C{// fields}$ + char c; $\C{// fields}$ int i; double d; - int mem() { $\C{// implicit "this" parameter}$ - `this->`c; `this->`i; `this->`d;$\C{// access containing fields}$ + int mem() { $\C{// implicit "this" parameter}$ + `this->`c; `this->`i; `this->`d; $\C{// access containing fields}$ } } \end{C++} -Nesting of member routines in a \lstinline[language=C++]@class@ allows eliding \lstinline[language=C++]@this->@ because of nested lexical-scoping. +Nesting of member routines in a \lstinline[language=C++]@class@ allows eliding \lstinline[language=C++]@this->@ because of lexical scoping. +However, for other aggregate parameters, qualification is necessary: +\begin{cfa} +struct T { double m, n; }; +int C::mem( T & t ) { $\C{// multiple aggregate parameters}$ + c; i; d; $\C{\color{red}// this-\textgreater.c, this-\textgreater.i, this-\textgreater.d}$ + `t.`m; `t.`n; $\C{// must qualify}$ +} +\end{cfa} % In object-oriented programming, there is an implicit first parameter, often names @self@ or @this@, which is elided. % In any programming language, some functions have a naturally close relationship with a particular data type. -% Object-oriented programming allows this close relationship to be codified in the language by making such functions \emph{class methods} of their related data type. +% Object-oriented programming allows this close relationship to be codified in the language by making such functions \newterm{class methods} of their related data type. % Class methods have certain privileges with respect to their associated data type, notably un-prefixed access to the fields of that data type. % When writing C functions in an object-oriented style, this un-prefixed access is swiftly missed, as access to fields of a @Foo* f@ requires an extra three characters @f->@ every time, which disrupts coding flow and clutters the produced code. @@ -1088,9 +1094,9 @@ % \TODO{Fill out section. Be sure to mention arbitrary expressions in with-blocks, recent change driven by Thierry to prioritize field name over parameters.} -\CFA provides a @with@ clause/statement (see Pascal~\cite[\S~4.F]{Pascal}) to elide aggregate qualification to fields by opening a scope containing field identifiers. -Hence, the qualified fields become variables, and making it easier to optimize field references in a block. -\begin{cfa} -void f( S s ) `with( s )` { $\C{// with clause}$ - c; i; d; $\C{\color{red}// s.c, s.i, s.d}$ +To simplify the programmer experience, \CFA provides a @with@ clause/statement (see Pascal~\cite[\S~4.F]{Pascal}) to elide aggregate qualification to fields by opening a scope containing the field identifiers. +Hence, the qualified fields become variables with the side-effect that it is easier to optimizing field references in a block. +\begin{cfa} +void f( S s ) `with( s )` { $\C{// with clause}$ + c; i; d; $\C{\color{red}// s.c, s.i, s.d}$ } \end{cfa} @@ -1098,20 +1104,62 @@ \begin{cfa} int mem( S & this ) `with( this )` { $\C{// with clause}$ - c; i; d; $\C{\color{red}// this.c, this.i, this.d}$ -} -\end{cfa} -The key generality over the object-oriented approach is that one aggregate parameter \lstinline[language=C++]@this@ is not treated specially over other aggregate parameters: -\begin{cfa} -struct T { double m, n; }; + c; i; d; $\C{\color{red}// this.c, this.i, this.d}$ +} +\end{cfa} +with the generality of opening multiple aggregate-parameters: +\begin{cfa} int mem( S & s, T & t ) `with( s, t )` { $\C{// multiple aggregate parameters}$ - c; i; d; $\C{\color{red}// s.c, s.i, s.d}$ - m; n; $\C{\color{red}// t.m, t.n}$ -} -\end{cfa} -The equivalent object-oriented style is: -\begin{cfa} -int S::mem( T & t ) { $\C{// multiple aggregate parameters}$ - c; i; d; $\C{\color{red}// this-\textgreater.c, this-\textgreater.i, this-\textgreater.d}$ - `t.`m; `t.`n; + c; i; d; $\C{\color{red}// s.c, s.i, s.d}$ + m; n; $\C{\color{red}// t.m, t.n}$ +} +\end{cfa} + +In detail, the @with@ clause/statement has the form: +\begin{cfa} +$\emph{with-statement}$: + 'with' '(' $\emph{expression-list}$ ')' $\emph{compound-statement}$ +\end{cfa} +and may appear as the body of a routine or nested within a routine body. +Each expression in the expression-list provides a type and object. +The type must be an aggregate type. +(Enumerations are already opened.) +The object is the implicit qualifier for the open structure-fields. + +All expressions in the expression list are open in ``parallel'' within the compound statement. +This semantic is different from Pascal, which nests the openings. +The difference between parallel and nesting occurs for fields with the same name but different type: +\begin{cfa} +struct S { int i; int j; double m; } s, w; +struct T { int i; int k; int m } t, w; +with( s, t ) { + j + k; $\C{// unambiguous, s.j + t.m}$ + m = 5.0; $\C{// unambiguous, t.m = 5.0}$ + m = 1; $\C{// unambiguous, s.m = 1}$ + int a = s.i + m; $\C{// unambiguous, a = s.i + t.i}$ + int b = s.i + t.i; $\C{// unambiguous, qualification}$ + sout | (double)m | endl; $\C{// unambiguous, cast}$ + i; $\C{// ambiguous}$ +} +\end{cfa} +\CFA's ability to overload variables means usages of field with the same names can be automatically disambiguated, eliminating most qualification. +Qualification or a cast is used to disambiguate. +A cast may be necessary to disambiguate between the overload variables in a @with@ expression: +\begin{cfa} +with( w ) { ... } $\C{// ambiguous, same name and no context}$ +with( (S)w ) { ... } $\C{// unambiguous}$ +\end{cfa} + +\begin{cfa} +struct S { int i, j; } sv; +with( sv ) { + S & sr = sv; + with( sr ) { + S * sp = &sv; + with( *sp ) { + i = 3; j = 4; $\C{\color{red}// sp-{\textgreater}i, sp-{\textgreater}j}$ + } + i = 3; j = 4; $\C{\color{red}// sr.i, sr.j}$ + } + i = 3; j = 4; $\C{\color{red}// sv.i, sv.j}$ } \end{cfa} @@ -1122,7 +1170,7 @@ struct S1 { ... } s1; struct S2 { ... } s2; - `with( s1 )` { $\C{// with statement}$ + `with( s1 )` { $\C{// with statement}$ // access fields of s1 without qualification - `with( s2 )` { $\C{// nesting}$ + `with( s2 )` { $\C{// nesting}$ // access fields of s1 and s2 without qualification } @@ -1134,46 +1182,4 @@ \end{cfa} -When opening multiple structures, fields with the same name and type are ambiguous and must be fully qualified. -For fields with the same name but different type, context/cast can be used to disambiguate. -\begin{cfa} -struct S { int i; int j; double m; } a, c; -struct T { int i; int k; int m } b, c; -`with( a, b )` { - j + k; $\C{// unambiguous, unique names define unique types}$ - i; $\C{// ambiguous, same name and type}$ - a.i + b.i; $\C{// unambiguous, qualification defines unique names}$ - m; $\C{// ambiguous, same name and no context to define unique type}$ - m = 5.0; $\C{// unambiguous, same name and context defines unique type}$ - m = 1; $\C{// unambiguous, same name and context defines unique type}$ -} -`with( c )` { ... } $\C{// ambiguous, same name and no context}$ -`with( (S)c )` { ... } $\C{// unambiguous, same name and cast defines unique type}$ -\end{cfa} - -The components in the "with" clause - - with ( a, b, c ) { ... } - -serve 2 purposes: each component provides a type and object. The type must be a -structure type. Enumerations are already opened, and I think a union is opened -to some extent, too. (Or is that just unnamed unions?) The object is the target -that the naked structure-fields apply to. The components are open in "parallel" -at the scope of the "with" clause/statement, so opening "a" does not affect -opening "b", etc. This semantic is different from Pascal, which nests the -openings. - -Having said the above, it seems reasonable to allow a "with" component to be an -expression. The type is the static expression-type and the object is the result -of the expression. Again, the type must be an aggregate. Expressions require -parenthesis around the components. - - with( a, b, c ) { ... } - -Does this now make sense? - -Having written more CFA code, it is becoming clear to me that I *really* want -the "with" to be implemented because I hate having to type all those object -names for fields. It's a great way to drive people away from the language. - \subsection{Exception Handling ???} @@ -1190,19 +1196,221 @@ \subsection{Alternative Declaration Syntax} +\newcommand{\R}[1]{\Textbf{#1}} +\newcommand{\B}[1]{{\Textbf[blue]{#1}}} +\newcommand{\G}[1]{{\Textbf[OliveGreen]{#1}}} + +C declaration syntax is notoriously confusing and error prone. +For example, many C programmers are confused by a declaration as simple as: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}ll@{}} +\begin{cfa} +int * x[5] +\end{cfa} +& +\raisebox{-0.75\totalheight}{\input{Cdecl}} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +Is this an array of 5 pointers to integers or a pointer to an array of 5 integers? +If there is any doubt, it implies productivity and safety issues even for basic programs. +Another example of confusion results from the fact that a routine name and its parameters are embedded within the return type, mimicking the way the return value is used at the routine's call site. +For example, a routine returning a pointer to an array of integers is defined and used in the following way: +\begin{cfa} +int `(*`f`())[`5`]` {...}; $\C{// definition}$ + ... `(*`f`())[`3`]` += 1; $\C{// usage}$ +\end{cfa} +Essentially, the return type is wrapped around the routine name in successive layers (like an onion). +While attempting to make the two contexts consistent is a laudable goal, it has not worked out in practice. + +\CFA provides its own type, variable and routine declarations, using a different syntax. +The new declarations place qualifiers to the left of the base type, while C declarations place qualifiers to the right of the base type. +In the following example, \R{red} is the base type and \B{blue} is qualifiers. +The \CFA declarations move the qualifiers to the left of the base type, \ie move the blue to the left of the red, while the qualifiers have the same meaning but are ordered left to right to specify a variable's type. +\begin{cquote} +\lstDeleteShortInline@% +\lstset{moredelim=**[is][\color{blue}]{+}{+}} +\begin{tabular}{@{}l@{\hspace{3em}}l@{}} +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} ++[5] *+ `int` x1; ++* [5]+ `int` x2; ++[* [5] int]+ f`( int p )`; +\end{cfa} +& +\begin{cfa} +`int` +*+ x1 +[5]+; +`int` +(*+x2+)[5]+; ++int (*+f`( int p )`+)[5]+; +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +The only exception is bit field specification, which always appear to the right of the base type. +% Specifically, the character @*@ is used to indicate a pointer, square brackets @[@\,@]@ are used to represent an array or function return value, and parentheses @()@ are used to indicate a routine parameter. +However, unlike C, \CFA type declaration tokens are distributed across all variables in the declaration list. +For instance, variables @x@ and @y@ of type pointer to integer are defined in \CFA as follows: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{3em}}l@{}} +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} +`*` int x, y; +\end{cfa} +& +\begin{cfa} +int `*`x, `*`y; +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +The downside of this semantics is the need to separate regular and pointer declarations: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{3em}}l@{}} +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} +`*` int x; +int y; +\end{cfa} +& +\begin{cfa} +int `*`x, y; + +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +which is prescribing a safety benefit. +Other examples are: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}} +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\ +\begin{cfa} +[ 5 ] int z; +[ 5 ] * char w; +* [ 5 ] double v; +struct s { + int f0:3; + * int f1; + [ 5 ] * int f2; +}; +\end{cfa} +& +\begin{cfa} +int z[ 5 ]; +char * w[ 5 ]; +double (* v)[ 5 ]; +struct s { + int f0:3; + int * f1; + int * f2[ 5 ] +}; +\end{cfa} +& +\begin{cfa} +// array of 5 integers +// array of 5 pointers to char +// pointer to array of 5 doubles + +// common bit field syntax + + + +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} + +All type qualifiers, \eg @const@, @volatile@, etc., are used in the normal way with the new declarations and also appear left to right, \eg: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}} +\multicolumn{1}{c@{\hspace{1em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{1em}}}{\textbf{C}} \\ +\begin{cfa} +const * const int x; +const * [ 5 ] const int y; +\end{cfa} +& +\begin{cfa} +int const * const x; +const int (* const y)[ 5 ] +\end{cfa} +& +\begin{cfa} +// const pointer to const integer +// const pointer to array of 5 const integers +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +All declaration qualifiers, \eg @extern@, @static@, etc., are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier} +The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature.~\cite[\S~6.11.5(1)]{C11}} \eg: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}} +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\ +\begin{cfa} +extern [ 5 ] int x; +static * const int y; +\end{cfa} +& +\begin{cfa} +int extern x[ 5 ]; +const int static * y; +\end{cfa} +& +\begin{cfa} +// externally visible array of 5 integers +// internally visible pointer to constant int +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} + +The new declaration syntax can be used in other contexts where types are required, \eg casts and the pseudo-routine @sizeof@: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{3em}}l@{}} +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} +y = (* int)x; +i = sizeof([ 5 ] * int); +\end{cfa} +& +\begin{cfa} +y = (int *)x; +i = sizeof(int * [ 5 ]); +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} + +Finally, new \CFA declarations may appear together with C declarations in the same program block, but cannot be mixed within a specific declaration. +Therefore, a programmer has the option of either continuing to use traditional C declarations or take advantage of the new style. +Clearly, both styles need to be supported for some time due to existing C-style header-files, particularly for UNIX-like systems. + \subsection{References} -All variables in C have an \emph{address}, a \emph{value}, and a \emph{type}; at the position in the program's memory denoted by the address, there exists a sequence of bits (the value), with the length and semantic meaning of this bit sequence defined by the type. -The C type system does not always track the relationship between a value and its address; a value that does not have a corresponding address is called a \emph{rvalue} (for ``right-hand value''), while a value that does have an address is called a \emph{lvalue} (for ``left-hand value''); in @int x; x = 42;@ the variable expression @x@ on the left-hand-side of the assignment is a lvalue, while the constant expression @42@ on the right-hand-side of the assignment is a rvalue. -Which address a value is located at is sometimes significant; the imperative programming paradigm of C relies on the mutation of values at specific addresses. -Within a lexical scope, lvalue exressions can be used in either their \emph{address interpretation} to determine where a mutated value should be stored or in their \emph{value interpretation} to refer to their stored value; in @x = y;@ in @{ int x, y = 7; x = y; }@, @x@ is used in its address interpretation, while y is used in its value interpretation. -Though this duality of interpretation is useful, C lacks a direct mechanism to pass lvalues between contexts, instead relying on \emph{pointer types} to serve a similar purpose. -In C, for any type @T@ there is a pointer type @T*@, the value of which is the address of a value of type @T@; a pointer rvalue can be explicitly \emph{dereferenced} to the pointed-to lvalue with the dereference operator @*?@, while the rvalue representing the address of a lvalue can be obtained with the address-of operator @&?@. +All variables in C have an \newterm{address}, a \newterm{value}, and a \newterm{type}; +at the position in the program's memory denoted by the address, there exists a sequence of bits (the value), with the length and semantic meaning of this bit sequence defined by the type. +The C type-system does not always track the relationship between a value and its address; +a value that does not have a corresponding address is called a \newterm{rvalue} (for ``right-hand value''), while a value that does have an address is called a \newterm{lvalue} (for ``left-hand value''). +For example, in @int x; x = 42;@ the variable expression @x@ on the left-hand-side of the assignment is a lvalue, while the constant expression @42@ on the right-hand-side of the assignment is a rvalue. +Despite the nomenclature of ``left-hand'' and ``right-hand'', an expression's classification as lvalue or rvalue is entirely dependent on whether it has an address or not; in imperative programming, the address of a value is used for both reading and writing (mutating) a value, and as such lvalues can be converted to rvalues and read from, but rvalues cannot be mutated because they lack a location to store the updated value. + +Within a lexical scope, lvalue expressions have an \newterm{address interpretation} for writing a value or a \newterm{value interpretation} to read a value. +For example, in @x = y@, @x@ has an address interpretation, while @y@ has a value interpretation. +Though this duality of interpretation is useful, C lacks a direct mechanism to pass lvalues between contexts, instead relying on \newterm{pointer types} to serve a similar purpose. +In C, for any type @T@ there is a pointer type @T *@, the value of which is the address of a value of type @T@. +A pointer rvalue can be explicitly \newterm{dereferenced} to the pointed-to lvalue with the dereference operator @*?@, while the rvalue representing the address of a lvalue can be obtained with the address-of operator @&?@. \begin{cfa} int x = 1, y = 2, * p1, * p2, ** p3; -p1 = &x; $\C{// p1 points to x}$ -p2 = &y; $\C{// p2 points to y}$ -p3 = &p1; $\C{// p3 points to p1}$ +p1 = &x; $\C{// p1 points to x}$ +p2 = &y; $\C{// p2 points to y}$ +p3 = &p1; $\C{// p3 points to p1}$ *p2 = ((*p1 + *p2) * (**p3 - *p1)) / (**p3 - 15); \end{cfa} @@ -1210,9 +1418,9 @@ Unfortunately, the dereference and address-of operators introduce a great deal of syntactic noise when dealing with pointed-to values rather than pointers, as well as the potential for subtle bugs. For both brevity and clarity, it would be desirable to have the compiler figure out how to elide the dereference operators in a complex expression such as the assignment to @*p2@ above. -However, since C defines a number of forms of \emph{pointer arithmetic}, two similar expressions involving pointers to arithmetic types (\eg @*p1 + x@ and @p1 + x@) may each have well-defined but distinct semantics, introducing the possibility that a user programmer may write one when they mean the other, and precluding any simple algorithm for elision of dereference operators. +However, since C defines a number of forms of \newterm{pointer arithmetic}, two similar expressions involving pointers to arithmetic types (\eg @*p1 + x@ and @p1 + x@) may each have well-defined but distinct semantics, introducing the possibility that a user programmer may write one when they mean the other, and precluding any simple algorithm for elision of dereference operators. To solve these problems, \CFA introduces reference types @T&@; a @T&@ has exactly the same value as a @T*@, but where the @T*@ takes the address interpretation by default, a @T&@ takes the value interpretation by default, as below: \begin{cfa} -inx x = 1, y = 2, & r1, & r2, && r3; +int x = 1, y = 2, & r1, & r2, && r3; &r1 = &x; $\C{// r1 points to x}$ &r2 = &y; $\C{// r2 points to y}$ @@ -1236,4 +1444,5 @@ This allows \CFA references to be default-initialized (\eg to a null pointer), and also to point to different addresses throughout their lifetime. This rebinding is accomplished without adding any new syntax to \CFA, but simply by extending the existing semantics of the address-of operator in C. + In C, the address of a lvalue is always a rvalue, as in general that address is not stored anywhere in memory, and does not itself have an address. In \CFA, the address of a @T&@ is a lvalue @T*@, as the address of the underlying @T@ is stored in the reference, and can thus be mutated there. @@ -1249,7 +1458,7 @@ if @L@ is an lvalue of type {@T &@$_1 \cdots$@ &@$_l$} where $l \ge 0$ references (@&@ symbols) then @&L@ has type {@T `*`&@$_{\color{red}1} \cdots$@ &@$_{\color{red}l}$}, \\ \ie @T@ pointer with $l$ references (@&@ symbols). \end{itemize} - Since pointers and references share the same internal representation, code using either is equally performant; in fact the \CFA compiler converts references to pointers internally, and the choice between them in user code can be made based solely on convenience. -By analogy to pointers, \CFA references also allow cv-qualifiers: + +By analogy to pointers, \CFA references also allow cv-qualifiers such as @const@: \begin{cfa} @@ -1269,9 +1478,10 @@ More generally, this initialization of references from lvalues rather than pointers is an instance of a ``lvalue-to-reference'' conversion rather than an elision of the address-of operator; this conversion can actually be used in any context in \CFA an implicit conversion would be allowed. -Similarly, use of a the value pointed to by a reference in an rvalue context can be thought of as a ``reference-to-rvalue'' conversion, and \CFA also includes a qualifier-adding ``reference-to-reference'' conversion, analagous to the @T *@ to @const T *@ conversion in standard C. +Similarly, use of a the value pointed to by a reference in an rvalue context can be thought of as a ``reference-to-rvalue'' conversion, and \CFA also includes a qualifier-adding ``reference-to-reference'' conversion, analogous to the @T *@ to @const T *@ conversion in standard C. The final reference conversion included in \CFA is ``rvalue-to-reference'' conversion, implemented by means of an implicit temporary. When an rvalue is used to initialize a reference, it is instead used to initialize a hidden temporary value with the same lexical scope as the reference, and the reference is initialized to the address of this temporary. This allows complex values to be succinctly and efficiently passed to functions, without the syntactic overhead of explicit definition of a temporary variable or the runtime cost of pass-by-value. -\CC allows a similar binding, but only for @const@ references; the more general semantics of \CFA are an attempt to avoid the \emph{const hell} problem, in which addition of a @const@ qualifier to one reference requires a cascading chain of added qualifiers. +\CC allows a similar binding, but only for @const@ references; the more general semantics of \CFA are an attempt to avoid the \newterm{const hell} problem, in which addition of a @const@ qualifier to one reference requires a cascading chain of added qualifiers. + \subsection{Constructors and Destructors} @@ -1279,5 +1489,5 @@ One of the strengths of C is the control over memory management it gives programmers, allowing resource release to be more consistent and precisely timed than is possible with garbage-collected memory management. However, this manual approach to memory management is often verbose, and it is useful to manage resources other than memory (\eg file handles) using the same mechanism as memory. -\CC is well-known for an approach to manual memory management that addresses both these issues, Resource Aquisition Is Initialization (RAII), implemented by means of special \emph{constructor} and \emph{destructor} functions; we have implemented a similar feature in \CFA. +\CC is well-known for an approach to manual memory management that addresses both these issues, Resource Aquisition Is Initialization (RAII), implemented by means of special \newterm{constructor} and \newterm{destructor} functions; we have implemented a similar feature in \CFA. While RAII is a common feature of object-oriented programming languages, its inclusion in \CFA does not violate the design principle that \CFA retain the same procedural paradigm as C. In particular, \CFA does not implement class-based encapsulation: neither the constructor nor any other function has privileged access to the implementation details of a type, except through the translation-unit-scope method of opaque structs provided by C. @@ -1311,11 +1521,11 @@ \end{cfa} -In the example above, a \emph{default constructor} (\ie one with no parameters besides the @this@ parameter) and destructor are defined for the @Array@ struct, a dynamic array of @int@. -@Array@ is an example of a \emph{managed type} in \CFA, a type with a non-trivial constructor or destructor, or with a field of a managed type. +In the example above, a \newterm{default constructor} (\ie one with no parameters besides the @this@ parameter) and destructor are defined for the @Array@ struct, a dynamic array of @int@. +@Array@ is an example of a \newterm{managed type} in \CFA, a type with a non-trivial constructor or destructor, or with a field of a managed type. As in the example, all instances of managed types are implicitly constructed upon allocation, and destructed upon deallocation; this ensures proper initialization and cleanup of resources contained in managed types, in this case the @data@ array on the heap. The exact details of the placement of these implicit constructor and destructor calls are omitted here for brevity, the interested reader should consult \cite{Schluntz17}. Constructor calls are intended to seamlessly integrate with existing C initialization syntax, providing a simple and familiar syntax to veteran C programmers and allowing constructor calls to be inserted into legacy C code with minimal code changes. -As such, \CFA also provides syntax for \emph{copy initialization} and \emph{initialization parameters}: +As such, \CFA also provides syntax for \newterm{copy initialization} and \newterm{initialization parameters}: \begin{cfa} @@ -1332,5 +1542,5 @@ In addition to initialization syntax, \CFA provides two ways to explicitly call constructors and destructors. Explicit calls to constructors double as a placement syntax, useful for construction of member fields in user-defined constructors and reuse of large storage allocations. -While the existing function-call syntax works for explicit calls to constructors and destructors, \CFA also provides a more concise \emph{operator syntax} for both: +While the existing function-call syntax works for explicit calls to constructors and destructors, \CFA also provides a more concise \newterm{operator syntax} for both: \begin{cfa} @@ -1349,5 +1559,5 @@ For compatibility with C, a copy constructor from the first union member type is also defined. For @struct@ types, each of the four functions are implicitly defined to call their corresponding functions on each member of the struct. -To better simulate the behaviour of C initializers, a set of \emph{field constructors} is also generated for structures. +To better simulate the behaviour of C initializers, a set of \newterm{field constructors} is also generated for structures. A constructor is generated for each non-empty prefix of a structure's member-list which copy-constructs the members passed as parameters and default-constructs the remaining members. To allow users to limit the set of constructors available for a type, when a user declares any constructor or destructor, the corresponding generated function and all field constructors for that type are hidden from expression resolution; similarly, the generated default constructor is hidden upon declaration of any constructor. @@ -1355,5 +1565,5 @@ In rare situations user programmers may not wish to have constructors and destructors called; in these cases, \CFA provides an ``escape hatch'' to not call them. -If a variable is initialized using the syntax \lstinline|S x @= {}| it will be an \emph{unmanaged object}, and will not have constructors or destructors called. +If a variable is initialized using the syntax \lstinline|S x @= {}| it will be an \newterm{unmanaged object}, and will not have constructors or destructors called. Any C initializer can be the right-hand side of an \lstinline|@=| initializer, \eg \lstinline|Array a @= { 0, 0x0 }|, with the usual C initialization semantics. In addition to the expressive power, \lstinline|@=| provides a simple path for migrating legacy C code to \CFA, by providing a mechanism to incrementally convert initializers; the \CFA design team decided to introduce a new syntax for this escape hatch because we believe that our RAII implementation will handle the vast majority of code in a desirable way, and we wished to maintain familiar syntax for this common case. @@ -1364,9 +1574,19 @@ \section{Literals} +C already includes limited polymorphism for literals -- @0@ can be either an integer or a pointer literal, depending on context, while the syntactic forms of literals of the various integer and floating-point types are very similar, differing from each other only in suffix. +In keeping with the general \CFA approach of adding features while respecting ``the C way'' of doing things, we have extended both C's polymorphic zero and typed literal syntax to interoperate with user-defined types, while maintaining a backwards-compatible semantics. \subsection{0/1} -\TODO{Some text already at the end of Section~\ref{sec:poly-fns}} - +In C, @0@ has the special property that it is the only ``false'' value; by the standard, any value which compares equal to @0@ is false, while any value that compares unequal to @0@ is true. +As such, an expression @x@ in any boolean context (such as the condition of an @if@ or @while@ statement, or the arguments to an @&&@, @||@, or ternary operator) can be rewritten as @x != 0@ without changing its semantics. +The operator overloading feature of \CFA provides a natural means to implement this truth value comparison for arbitrary types, but the C type system is not precise enough to distinguish an equality comparison with @0@ from an equality comparison with an arbitrary integer or pointer. +To provide this precision, \CFA introduces a new type @zero_t@ as type type of literal @0@ (somewhat analagous to @nullptr_t@ and @nullptr@ in \CCeleven); @zero_t@ can only take the value @0@, but has implicit conversions to the integer and pointer types so that standard C code involving @0@ continues to work properly. +With this addition, the \CFA compiler rewrites @if (x)@ and similar expressions to @if ((x) != 0)@ or the appropriate analogue, and any type @T@ can be made ``truthy'' by defining an operator overload @int ?!=?(T, zero_t)@. +\CC makes types truthy by adding a conversion to @bool@; prior to the addition of explicit cast operators in \CCeleven this approach had the pitfall of making truthy types transitively convertable to any numeric type; our design for \CFA avoids this issue. + +\CFA also includes a special type for @1@, @one_t@; like @zero_t@, @one_t@ has built-in implicit conversions to the various integral types so that @1@ maintains its expected semantics in legacy code. +The addition of @one_t@ allows generic algorithms to handle the unit value uniformly for types where that is meaningful. +\TODO{Make this sentence true} In particular, polymorphic functions in the \CFA prelude define @++x@ and @x++@ in terms of @x += 1@, allowing users to idiomatically define all forms of increment for a type @T@ by defining the single function @T& ?+=(T&, one_t)@; analogous overloads for the decrement operators are present as well. \subsection{Units} @@ -1397,5 +1617,4 @@ \end{cfa} }% - \section{Evaluation} @@ -1573,5 +1792,5 @@ Finally, we demonstrate that \CFA performance for some idiomatic cases is better than C and close to \CC, showing the design is practically applicable. -There is ongoing work on a wide range of \CFA feature extensions, including reference types, arrays with size, exceptions, concurrent primitives and modules. +There is ongoing work on a wide range of \CFA feature extensions, including arrays with size, exceptions, concurrent primitives, modules, and user-defined conversions. (While all examples in the paper compile and run, a public beta-release of \CFA will take another 8--12 months to finalize these additional extensions.) In addition, there are interesting future directions for the polymorphism design. Index: doc/papers/general/figures/Cdecl.fig =================================================================== --- doc/papers/general/figures/Cdecl.fig (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) +++ doc/papers/general/figures/Cdecl.fig (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -0,0 +1,63 @@ +#FIG 3.2 Produced by xfig version 3.2.5b +Landscape +Center +Inches +Letter +100.00 +Single +-2 +1200 2 +6 2850 1200 3600 1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 3000 1200 3000 1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 3150 1200 3150 1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 3300 1200 3300 1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 3450 1200 3450 1350 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 2850 1200 3600 1200 3600 1350 2850 1350 2850 1200 +4 1 0 50 -1 4 10 0.0000 2 120 90 2925 1325 0\001 +4 1 0 50 -1 4 10 0.0000 2 120 90 3075 1325 1\001 +4 1 0 50 -1 4 10 0.0000 2 120 90 3225 1325 2\001 +4 1 0 50 -1 4 10 0.0000 2 120 90 3375 1325 3\001 +4 1 0 50 -1 4 10 0.0000 2 120 90 3525 1325 4\001 +-6 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 1275 1200 2025 1200 2025 1350 1275 1350 1275 1200 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 1425 1200 1425 1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 1575 1200 1575 1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 1725 1200 1725 1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 1875 1200 1875 1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 1 1 1.00 45.00 60.00 + 1950 1275 1950 1500 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 1 1 1.00 45.00 60.00 + 1350 1275 1350 1500 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 1 1 1.00 45.00 60.00 + 1500 1275 1500 1500 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 1 1 1.00 45.00 60.00 + 1650 1275 1650 1500 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 1 1 1.00 45.00 60.00 + 1800 1275 1800 1500 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 2475 1200 2625 1200 2625 1350 2475 1350 2475 1200 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 1 1 1.00 45.00 60.00 + 2550 1275 2850 1275 +4 1 0 50 -1 4 10 0.0000 2 120 90 1350 1650 0\001 +4 1 0 50 -1 4 10 0.0000 2 120 90 1500 1650 1\001 +4 1 0 50 -1 4 10 0.0000 2 120 90 1650 1650 2\001 +4 1 0 50 -1 4 10 0.0000 2 120 90 1800 1650 3\001 +4 1 0 50 -1 4 10 0.0000 2 120 90 1950 1650 4\001 +4 1 0 50 -1 4 10 0.0000 2 90 90 1200 1325 x\001 +4 1 0 50 -1 4 10 0.0000 2 90 90 2400 1325 x\001 Index: src/libcfa/Makefile.am =================================================================== --- src/libcfa/Makefile.am (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/Makefile.am (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -10,7 +10,7 @@ ## Author : Peter A. Buhr ## Created On : Sun May 31 08:54:01 2015 -## Last Modified By : Andrew Beach -## Last Modified On : Wed Jul 26 14:15:00 2017 -## Update Count : 221 +## Last Modified By : Peter A. Buhr +## Last Modified On : Fri Feb 9 15:51:24 2018 +## Update Count : 223 ############################################################################### @@ -92,5 +92,5 @@ libcfa_d_a_CFLAGS = -debug -O0 #No need for __CFA_DEBUG__ since we pass -debug -stdhdr = ${shell echo stdhdr/*} +stdhdr = ${shell find stdhdr -type f -printf "%p "} cfa_includedir = $(CFA_INCDIR) Index: src/libcfa/bits/debug.c =================================================================== --- src/libcfa/bits/debug.c (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/bits/debug.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -11,5 +11,5 @@ // Last Modified By : // Last Modified On : -// Update Count : 0 +// Update Count : 1 // @@ -47,5 +47,5 @@ void __cfaabi_dbg_bits_release() __attribute__((__weak__)) {} - void __cfaabi_dbg_bits_print_safe ( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) )) { + void __cfaabi_dbg_bits_print_safe ( const char fmt[], ... ) __attribute__(( format(printf, 1, 2) )) { va_list args; @@ -60,5 +60,5 @@ } - void __cfaabi_dbg_bits_print_nolock( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) )) { + void __cfaabi_dbg_bits_print_nolock( const char fmt[], ... ) __attribute__(( format(printf, 1, 2) )) { va_list args; @@ -76,5 +76,5 @@ } - void __cfaabi_dbg_bits_print_buffer( char in_buffer[], int in_buffer_size, const char fmt[], ... ) __attribute__(( format (printf, 3, 4) )) { + void __cfaabi_dbg_bits_print_buffer( char in_buffer[], int in_buffer_size, const char fmt[], ... ) __attribute__(( format(printf, 3, 4) )) { va_list args; Index: src/libcfa/bits/debug.h =================================================================== --- src/libcfa/bits/debug.h (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/bits/debug.h (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -10,6 +10,6 @@ // Created On : Mon Nov 28 12:27:26 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jul 22 10:02:24 2017 -// Update Count : 1 +// Last Modified On : Thu Feb 8 12:35:19 2018 +// Update Count : 2 // @@ -41,8 +41,8 @@ extern void __cfaabi_dbg_bits_acquire(); extern void __cfaabi_dbg_bits_release(); - extern void __cfaabi_dbg_bits_print_safe ( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) )); - extern void __cfaabi_dbg_bits_print_nolock( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) )); + extern void __cfaabi_dbg_bits_print_safe ( const char fmt[], ... ) __attribute__(( format(printf, 1, 2) )); + extern void __cfaabi_dbg_bits_print_nolock( const char fmt[], ... ) __attribute__(( format(printf, 1, 2) )); extern void __cfaabi_dbg_bits_print_vararg( const char fmt[], va_list arg ); - extern void __cfaabi_dbg_bits_print_buffer( char buffer[], int buffer_size, const char fmt[], ... ) __attribute__(( format (printf, 3, 4) )); + extern void __cfaabi_dbg_bits_print_buffer( char buffer[], int buffer_size, const char fmt[], ... ) __attribute__(( format(printf, 3, 4) )); #ifdef __cforall } Index: src/libcfa/bits/defs.h =================================================================== --- src/libcfa/bits/defs.h (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/bits/defs.h (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -10,6 +10,6 @@ // Created On : Thu Nov 9 13:24:10 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jan 2 09:17:06 2018 -// Update Count : 2 +// Last Modified On : Thu Feb 8 16:22:41 2018 +// Update Count : 8 // @@ -34,10 +34,8 @@ #ifdef __cforall -#ifndef __NO_ABORT_OVERLOAD -void abort ( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)); -#endif +void abort ( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )); extern "C" { #endif -void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)); +void __cabi_abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )); #ifdef __cforall } Index: src/libcfa/concurrency/coroutine.c =================================================================== --- src/libcfa/concurrency/coroutine.c (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/concurrency/coroutine.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -10,6 +10,6 @@ // Created On : Mon Nov 28 12:27:26 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jul 21 22:34:57 2017 -// Update Count : 1 +// Last Modified On : Thu Feb 8 16:10:31 2018 +// Update Count : 4 // @@ -77,5 +77,5 @@ __cfaabi_dbg_debug_do( if ( mprotect( this.storage, pageSize, PROT_READ | PROT_WRITE ) == -1 ) { - abortf( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", &this, errno, strerror( errno ) ); + abort( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", &this, errno, strerror( errno ) ); } ); @@ -99,5 +99,5 @@ // Wrapper for co void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) { - // THREAD_GETMEM( This )->disableInterrupts(); + disable_interrupts(); // set state of current coroutine to inactive @@ -115,5 +115,5 @@ src->state = Active; - // THREAD_GETMEM( This )->enableInterrupts(); + enable_interrupts( __cfaabi_dbg_ctx ); } //ctxSwitchDirect @@ -135,10 +135,10 @@ __cfaabi_dbg_debug_do( if ( mprotect( storage, pageSize, PROT_NONE ) == -1 ) { - abortf( "(uMachContext &)%p.createContext() : internal error, mprotect failure, error(%d) %s.", this, (int)errno, strerror( (int)errno ) ); + abort( "(uMachContext &)%p.createContext() : internal error, mprotect failure, error(%d) %s.", this, (int)errno, strerror( (int)errno ) ); } // if ); if ( (intptr_t)storage == 0 ) { - abortf( "Attempt to allocate %d bytes of storage for coroutine or task execution-state but insufficient memory available.", size ); + abort( "Attempt to allocate %zd bytes of storage for coroutine or task execution-state but insufficient memory available.", size ); } // if Index: src/libcfa/concurrency/invoke.c =================================================================== --- src/libcfa/concurrency/invoke.c (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/concurrency/invoke.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -10,6 +10,6 @@ // Created On : Tue Jan 17 12:27:26 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Feb 6 23:00:57 2018 -// Update Count : 3 +// Last Modified On : Fri Feb 9 16:37:42 2018 +// Update Count : 5 // @@ -51,5 +51,5 @@ //Final suspend, should never return __leave_coroutine(); - abortf( "Resumed dead coroutine" ); + __cabi_abort( "Resumed dead coroutine" ); } @@ -81,5 +81,5 @@ //Final suspend, should never return __leave_thread_monitor( thrd ); - abortf( "Resumed dead thread" ); + __cabi_abort( "Resumed dead thread" ); } @@ -93,5 +93,5 @@ struct coStack_t* stack = &get_coroutine( this )->stack; -#if defined( __i386__ ) +#if defined( __i386 ) struct FakeStack { @@ -114,5 +114,5 @@ ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F; //Vol. 1 8-7 -#elif defined( __x86_64__ ) +#elif defined( __x86_64 ) struct FakeStack { @@ -150,6 +150,7 @@ fs->arg[0] = this; fs->arg[1] = invoke; + #else - #error Only __i386__ and __x86_64__ is supported for threads in cfa + #error uknown hardware architecture #endif } Index: src/libcfa/concurrency/invoke.h =================================================================== --- src/libcfa/concurrency/invoke.h (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/concurrency/invoke.h (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -10,6 +10,6 @@ // Created On : Tue Jan 17 12:27:26 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jan 23 14:55:46 2018 -// Update Count : 3 +// Last Modified On : Fri Feb 9 14:41:55 2018 +// Update Count : 6 // @@ -202,13 +202,13 @@ void CtxSwitch( void * from, void * to ) asm ("CtxSwitch"); - #if defined( __x86_64__ ) + #if defined( __i386 ) + #define CtxGet( ctx ) __asm__ ( \ + "movl %%esp,%0\n" \ + "movl %%ebp,%1\n" \ + : "=rm" (ctx.SP), "=rm" (ctx.FP) ) + #elif 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) ) #elif defined( __ARM_ARCH ) @@ -217,4 +217,6 @@ "mov %1,%%r11\n" \ : "=rm" (ctx.SP), "=rm" (ctx.FP) ) + #else + #error unknown hardware architecture #endif Index: src/libcfa/concurrency/kernel.c =================================================================== --- src/libcfa/concurrency/kernel.c (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/concurrency/kernel.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -10,11 +10,10 @@ // Created On : Tue Jan 17 12:27:26 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Feb 6 21:51:26 2018 -// Update Count : 4 +// Last Modified On : Thu Feb 8 23:52:19 2018 +// Update Count : 5 // //C Includes #include -#define ftype `ftype` extern "C" { #include @@ -24,5 +23,4 @@ #include } -#undef ftype //CFA Includes Index: src/libcfa/concurrency/monitor.c =================================================================== --- src/libcfa/concurrency/monitor.c (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/concurrency/monitor.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -10,6 +10,6 @@ // Created On : Thd Feb 23 12:27:26 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jul 31 14:59:05 2017 -// Update Count : 3 +// Last Modified On : Thu Feb 8 16:12:20 2018 +// Update Count : 4 // @@ -87,5 +87,5 @@ thread_desc * thrd = this_thread; - __cfaabi_dbg_print_safe("Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner); + __cfaabi_dbg_print_safe( "Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner); if( !this->owner ) { @@ -93,5 +93,5 @@ set_owner( this, thrd ); - __cfaabi_dbg_print_safe("Kernel : mon is free \n"); + __cfaabi_dbg_print_safe( "Kernel : mon is free \n" ); } else if( this->owner == thrd) { @@ -99,5 +99,5 @@ this->recursion += 1; - __cfaabi_dbg_print_safe("Kernel : mon already owned \n"); + __cfaabi_dbg_print_safe( "Kernel : mon already owned \n" ); } else if( is_accepted( this, group) ) { @@ -108,8 +108,8 @@ reset_mask( this ); - __cfaabi_dbg_print_safe("Kernel : mon accepts \n"); + __cfaabi_dbg_print_safe( "Kernel : mon accepts \n" ); } else { - __cfaabi_dbg_print_safe("Kernel : blocking \n"); + __cfaabi_dbg_print_safe( "Kernel : blocking \n" ); // Some one else has the monitor, wait in line for it @@ -118,5 +118,5 @@ BlockInternal( &this->lock ); - __cfaabi_dbg_print_safe("Kernel : %10p Entered mon %p\n", thrd, this); + __cfaabi_dbg_print_safe( "Kernel : %10p Entered mon %p\n", thrd, this); // BlockInternal will unlock spinlock, no need to unlock ourselves @@ -124,5 +124,5 @@ } - __cfaabi_dbg_print_safe("Kernel : %10p Entered mon %p\n", thrd, this); + __cfaabi_dbg_print_safe( "Kernel : %10p Entered mon %p\n", thrd, this); // Release the lock and leave @@ -136,9 +136,9 @@ thread_desc * thrd = this_thread; - __cfaabi_dbg_print_safe("Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner); + __cfaabi_dbg_print_safe( "Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner); if( !this->owner ) { - __cfaabi_dbg_print_safe("Kernel : Destroying free mon %p\n", this); + __cfaabi_dbg_print_safe( "Kernel : Destroying free mon %p\n", this); // No one has the monitor, just take it @@ -151,5 +151,5 @@ // We already have the monitor... but where about to destroy it so the nesting will fail // Abort! - abortf("Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex."); + abort( "Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex." ); } @@ -158,5 +158,5 @@ __monitor_group_t group = { &this, 1, func }; if( is_accepted( this, group) ) { - __cfaabi_dbg_print_safe("Kernel : mon accepts dtor, block and signal it \n"); + __cfaabi_dbg_print_safe( "Kernel : mon accepts dtor, block and signal it \n" ); // Wake the thread that is waiting for this @@ -177,5 +177,5 @@ } else { - __cfaabi_dbg_print_safe("Kernel : blocking \n"); + __cfaabi_dbg_print_safe( "Kernel : blocking \n" ); wait_ctx( this_thread, 0 ) @@ -190,5 +190,5 @@ } - __cfaabi_dbg_print_safe("Kernel : Destroying %p\n", this); + __cfaabi_dbg_print_safe( "Kernel : Destroying %p\n", this); } @@ -199,5 +199,5 @@ lock( this->lock __cfaabi_dbg_ctx2 ); - __cfaabi_dbg_print_safe("Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner); + __cfaabi_dbg_print_safe( "Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner); verifyf( this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", this_thread, this->owner, this->recursion, this ); @@ -209,5 +209,5 @@ // it means we don't need to do anything if( this->recursion != 0) { - __cfaabi_dbg_print_safe("Kernel : recursion still %d\n", this->recursion); + __cfaabi_dbg_print_safe( "Kernel : recursion still %d\n", this->recursion); unlock( this->lock ); return; @@ -228,8 +228,8 @@ __cfaabi_dbg_debug_do( if( this_thread != this->owner ) { - abortf("Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner); + abort( "Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner); } if( this->recursion != 1 ) { - abortf("Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1); + abort( "Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1); } ) @@ -256,5 +256,5 @@ // If we haven't left the last level of recursion // it must mean there is an error - if( this->recursion != 0) { abortf("Thread internal monitor has unbalanced recursion"); } + if( this->recursion != 0) { abort( "Thread internal monitor has unbalanced recursion" ); } // Fetch the next thread, can be null @@ -302,5 +302,5 @@ (this_thread->monitors){m, count, func}; - // __cfaabi_dbg_print_safe("MGUARD : enter %d\n", count); + // __cfaabi_dbg_print_safe( "MGUARD : enter %d\n", count); // Enter the monitors in order @@ -308,5 +308,5 @@ enter( group ); - // __cfaabi_dbg_print_safe("MGUARD : entered\n"); + // __cfaabi_dbg_print_safe( "MGUARD : entered\n" ); } @@ -314,10 +314,10 @@ // Dtor for monitor guard void ^?{}( monitor_guard_t & this ) { - // __cfaabi_dbg_print_safe("MGUARD : leaving %d\n", this.count); + // __cfaabi_dbg_print_safe( "MGUARD : leaving %d\n", this.count); // Leave the monitors in order leave( this.m, this.count ); - // __cfaabi_dbg_print_safe("MGUARD : left\n"); + // __cfaabi_dbg_print_safe( "MGUARD : left\n" ); // Restore thread context @@ -427,10 +427,10 @@ thread_desc * this_thrd = this_thread; if ( this.monitor_count != this_thrd->monitors.size ) { - abortf( "Signal on condition %p made with different number of monitor(s), expected %i got %i", &this, this.monitor_count, this_thrd->monitors.size ); + abort( "Signal on condition %p made with different number of monitor(s), expected %i got %i", &this, this.monitor_count, this_thrd->monitors.size ); } for(int i = 0; i < this.monitor_count; i++) { if ( this.monitors[i] != this_thrd->monitors[i] ) { - abortf( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors[i] ); + abort( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors[i] ); } } @@ -534,5 +534,5 @@ if(actual_count == 0) return; - __cfaabi_dbg_print_buffer_local( "Kernel : waitfor internal proceeding\n"); + __cfaabi_dbg_print_buffer_local( "Kernel : waitfor internal proceeding\n" ); // Create storage for monitor context @@ -551,5 +551,5 @@ __acceptable_t& accepted = mask[index]; if( accepted.is_dtor ) { - __cfaabi_dbg_print_buffer_local( "Kernel : dtor already there\n"); + __cfaabi_dbg_print_buffer_local( "Kernel : dtor already there\n" ); verifyf( accepted.size == 1, "ERROR: Accepted dtor has more than 1 mutex parameter." ); @@ -563,5 +563,5 @@ } else { - __cfaabi_dbg_print_buffer_local( "Kernel : thread present, baton-passing\n"); + __cfaabi_dbg_print_buffer_local( "Kernel : thread present, baton-passing\n" ); // Create the node specific to this wait operation @@ -577,5 +577,5 @@ } #endif - __cfaabi_dbg_print_buffer_local( "\n"); + __cfaabi_dbg_print_buffer_local( "\n" ); // Set the owners to be the next thread @@ -588,5 +588,5 @@ monitor_restore; - __cfaabi_dbg_print_buffer_local( "Kernel : thread present, returned\n"); + __cfaabi_dbg_print_buffer_local( "Kernel : thread present, returned\n" ); } @@ -598,5 +598,5 @@ if( duration == 0 ) { - __cfaabi_dbg_print_buffer_local( "Kernel : non-blocking, exiting\n"); + __cfaabi_dbg_print_buffer_local( "Kernel : non-blocking, exiting\n" ); unlock_all( locks, count ); @@ -607,7 +607,7 @@ - verifyf( duration < 0, "Timeout on waitfor statments not supported yet."); - - __cfaabi_dbg_print_buffer_local( "Kernel : blocking waitfor\n"); + verifyf( duration < 0, "Timeout on waitfor statments not supported yet." ); + + __cfaabi_dbg_print_buffer_local( "Kernel : blocking waitfor\n" ); // Create the node specific to this wait operation @@ -631,5 +631,5 @@ monitor_restore; - __cfaabi_dbg_print_buffer_local( "Kernel : exiting\n"); + __cfaabi_dbg_print_buffer_local( "Kernel : exiting\n" ); __cfaabi_dbg_print_buffer_local( "Kernel : accepted %d\n", *mask.accepted); @@ -640,5 +640,5 @@ static inline void set_owner( monitor_desc * this, thread_desc * owner ) { - // __cfaabi_dbg_print_safe("Kernal : Setting owner of %p to %p ( was %p)\n", this, owner, this->owner ); + // __cfaabi_dbg_print_safe( "Kernal : Setting owner of %p to %p ( was %p)\n", this, owner, this->owner ); //Pass the monitor appropriately @@ -672,5 +672,5 @@ static inline thread_desc * next_thread( monitor_desc * this ) { //Check the signaller stack - __cfaabi_dbg_print_safe("Kernel : mon %p AS-stack top %p\n", this, this->signal_stack.top); + __cfaabi_dbg_print_safe( "Kernel : mon %p AS-stack top %p\n", this, this->signal_stack.top); __condition_criterion_t * urgent = pop( this->signal_stack ); if( urgent ) { @@ -814,5 +814,5 @@ thread_desc * thrd = this_thread; if( !this.monitors ) { - // __cfaabi_dbg_print_safe("Branding\n"); + // __cfaabi_dbg_print_safe( "Branding\n" ); assertf( thrd->monitors.data != NULL, "No current monitor to brand condition %p", thrd->monitors.data ); this.monitor_count = thrd->monitors.size; Index: src/libcfa/concurrency/preemption.c =================================================================== --- src/libcfa/concurrency/preemption.c (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/concurrency/preemption.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -10,11 +10,10 @@ // Created On : Mon Jun 5 14:20:42 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Feb 6 15:00:36 2018 -// Update Count : 10 +// Last Modified On : Fri Feb 9 16:38:13 2018 +// Update Count : 14 // #include "preemption.h" -#define ftype `ftype` extern "C" { #include @@ -23,5 +22,4 @@ #include } -#undef ftype #include "bits/signal.h" @@ -50,10 +48,12 @@ // Machine specific register name -#if defined(__x86_64__) +#if defined( __i386 ) +#define CFA_REG_IP gregs[REG_EIP] +#elif defined( __x86_64 ) #define CFA_REG_IP gregs[REG_RIP] -#elif defined(__i386__) -#define CFA_REG_IP gregs[REG_EIP] -#elif defined(__ARM_ARCH__) +#elif defined( __ARM_ARCH ) #define CFA_REG_IP arm_pc +#else +#error unknown hardware architecture #endif @@ -197,5 +197,5 @@ if ( pthread_sigmask( SIG_UNBLOCK, &mask, NULL ) == -1 ) { - abortf( "internal error, pthread_sigmask" ); + abort( "internal error, pthread_sigmask" ); } } @@ -208,5 +208,5 @@ if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) { - abortf( "internal error, pthread_sigmask" ); + abort( "internal error, pthread_sigmask" ); } } @@ -247,5 +247,5 @@ // Called from kernel_startup void kernel_start_preemption() { - __cfaabi_dbg_print_safe("Kernel : Starting preemption\n"); + __cfaabi_dbg_print_safe( "Kernel : Starting preemption\n" ); // Start with preemption disabled until ready @@ -268,5 +268,5 @@ // Called from kernel_shutdown void kernel_stop_preemption() { - __cfaabi_dbg_print_safe("Kernel : Preemption stopping\n"); + __cfaabi_dbg_print_safe( "Kernel : Preemption stopping\n" ); // Block all signals since we are already shutting down @@ -284,5 +284,5 @@ // Preemption is now fully stopped - __cfaabi_dbg_print_safe("Kernel : Preemption stopped\n"); + __cfaabi_dbg_print_safe( "Kernel : Preemption stopped\n" ); } @@ -322,5 +322,5 @@ case PREEMPT_TERMINATE: verify(this_processor->do_terminate); default: - abortf( "internal error, signal value is %d", sfp->si_value.sival_int ); + abort( "internal error, signal value is %d", sfp->si_value.sival_int ); } @@ -328,5 +328,5 @@ if( !preemption_ready() ) { return; } - __cfaabi_dbg_print_buffer_decl(" KERNEL: preempting core %p (%p).\n", this_processor, this_thread); + __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p).\n", this_processor, this_thread); preemption_in_progress = true; // Sync flag : prevent recursive calls to the signal handler @@ -348,5 +348,5 @@ if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) { - abortf( "internal error, pthread_sigmask" ); + abort( "internal error, pthread_sigmask" ); } @@ -365,7 +365,7 @@ continue; case EINVAL : - abortf("Timeout was invalid."); + abort( "Timeout was invalid." ); default: - abortf("Unhandled error %d", err); + abort( "Unhandled error %d", err); } } @@ -374,5 +374,5 @@ assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int); - // __cfaabi_dbg_print_safe("Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int ); + // __cfaabi_dbg_print_safe( "Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int ); // Switch on the code (a.k.a. the sender) to switch( info.si_code ) @@ -382,5 +382,5 @@ case SI_TIMER: case SI_KERNEL: - // __cfaabi_dbg_print_safe("Kernel : Preemption thread tick\n"); + // __cfaabi_dbg_print_safe( "Kernel : Preemption thread tick\n" ); lock( event_kernel->lock __cfaabi_dbg_ctx2 ); tick_preemption(); @@ -396,5 +396,5 @@ EXIT: - __cfaabi_dbg_print_safe("Kernel : Preemption thread stopping\n"); + __cfaabi_dbg_print_safe( "Kernel : Preemption thread stopping\n" ); return NULL; } Index: src/libcfa/exception.c =================================================================== --- src/libcfa/exception.c (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/exception.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -9,7 +9,7 @@ // Author : Andrew Beach // Created On : Mon Jun 26 15:13:00 2017 -// Last Modified By : Andrew Beach -// Last Modified On : Thr Aug 17 15:45:00 2017 -// Update Count : 7 +// Last Modified By : Peter A. Buhr +// Last Modified On : Fri Feb 9 14:41:55 2018 +// Update Count : 8 // @@ -453,5 +453,5 @@ // match, which is no way generic. Some more works need to be done if we want to have a single call to the try routine. -#if defined( __x86_64__ ) || defined( __i386__ ) +#if defined( __i386 ) || defined( __x86_64 ) asm ( //HEADER @@ -476,3 +476,3 @@ // " .section .note.GNU-stack,\"x\",@progbits\n" ); -#endif // __x86_64__ || __i386__ +#endif // __i386 || __x86_64 Index: src/libcfa/interpose.c =================================================================== --- src/libcfa/interpose.c (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/libcfa/interpose.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -10,6 +10,6 @@ // Created On : Wed Mar 29 16:10:31 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 7 09:05:18 2018 -// Update Count : 59 +// Last Modified On : Thu Feb 8 16:18:09 2018 +// Update Count : 75 // @@ -28,5 +28,4 @@ } -#define __NO_ABORT_OVERLOAD // no abort overload avoid ambiguities #include "bits/debug.h" #include "bits/defs.h" @@ -51,5 +50,5 @@ error = dlerror(); if ( error ) { - abortf( "interpose_symbol : failed to open libc, %s\n", error ); + abort( "interpose_symbol : failed to open libc, %s\n", error ); } #endif @@ -69,5 +68,5 @@ error = dlerror(); - if ( error ) abortf( "interpose_symbol : internal error, %s\n", error ); + if ( error ) abort( "interpose_symbol : internal error, %s\n", error ); return originalFunc.fptr; @@ -98,6 +97,6 @@ struct { - __typeof__( exit ) exit __attribute__(( noreturn )); - __typeof__( abort ) abort __attribute__(( noreturn )); + void (* exit)( int ) __attribute__ (( __noreturn__ )); + void (* abort)( void ) __attribute__ (( __noreturn__ )); } __cabi_libc; @@ -123,12 +122,13 @@ // Forward declare abort after the __typeof__ call to avoid ambiguities -void abort ( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)); +void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ )); +void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )); extern "C" { - void abort( void ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) { - abortf( NULL ); - } - - void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) { + void abort( void ) __attribute__ (( __nothrow__, __leaf__, __noreturn__ )) { + abort( NULL ); + } + + void __cabi_abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) { va_list argp; va_start( argp, fmt ); @@ -137,12 +137,12 @@ } - void exit( int __status ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) { - __cabi_libc.exit(__status); - } -} - -void * kernel_abort ( void ) __attribute__ ((__nothrow__, __leaf__, __weak__)) { return NULL; } -void kernel_abort_msg( void * data, char * buffer, int size ) __attribute__ ((__nothrow__, __leaf__, __weak__)) {} -int kernel_abort_lastframe( void ) __attribute__ ((__nothrow__, __leaf__, __weak__)) { return 4; } + void exit( int status ) __attribute__ (( __nothrow__, __leaf__, __noreturn__ )) { + __cabi_libc.exit( status ); + } +} + +void * kernel_abort ( void ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) { return NULL; } +void kernel_abort_msg( void * data, char * buffer, int size ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) {} +int kernel_abort_lastframe( void ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) { return 4; } enum { abort_text_size = 1024 }; @@ -150,5 +150,13 @@ static int abort_lastframe; -void abort( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) { +void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ )) { + va_list args; + va_start( args, fmt ); + vfprintf( stderr, fmt, args ); + va_end( args ); + __cabi_libc.exit( status ); +} + +void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) { void * kernel_data = kernel_abort(); // must be done here to lock down kernel int len; @@ -226,5 +234,5 @@ void sigHandler_segv( __CFA_SIGPARMS__ ) { - abortf( "Addressing invalid memory at location %p\n" + abort( "Addressing invalid memory at location %p\n" "Possible cause is reading outside the address space or writing to a protected area within the address space with an invalid pointer or subscript.\n", sfp->si_addr ); @@ -232,5 +240,5 @@ void sigHandler_ill( __CFA_SIGPARMS__ ) { - abortf( "Executing illegal instruction at location %p.\n" + abort( "Executing illegal instruction at location %p.\n" "Possible cause is stack corruption.\n", sfp->si_addr ); @@ -248,5 +256,5 @@ default: msg = "unknown"; } // choose - abortf( "Computation error %s at location %p.\n", msg, sfp->si_addr ); + abort( "Computation error %s at location %p.\n", msg, sfp->si_addr ); } Index: src/libcfa/stdhdr/sys/ucontext.h =================================================================== --- src/libcfa/stdhdr/sys/ucontext.h (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) +++ src/libcfa/stdhdr/sys/ucontext.h (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -0,0 +1,32 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// uco.h -- +// +// Author : Peter A. Buhr +// Created On : Thu Feb 8 23:48:16 2018 +// Last Modified By : Peter A. Buhr +// Last Modified On : Thu Feb 8 23:50:44 2018 +// Update Count : 4 +// + +#if ! defined( ftype ) // nesting ? +#define ftype `ftype` // make keyword an identifier +#define __CFA_UCONTEXT_H__ +#endif + +#include_next // must have internal check for multiple expansion + +#if defined( ftype ) && defined( __CFA_UCONTEXT_H__ ) // reset only if set +#undef ftype +#undef __CFA_UCONTEXT_H__ +#endif + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/prelude/builtins.c =================================================================== --- src/prelude/builtins.c (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/prelude/builtins.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -9,7 +9,7 @@ // Author : Peter A. Buhr // Created On : Fri Jul 21 16:21:03 2017 -// Last Modified By : Andrew Beach -// Last Modified On : Tus Jul 25 15:33:00 2017 -// Update Count : 14 +// Last Modified By : Peter A. Buhr +// Last Modified On : Thu Feb 8 12:47:59 2018 +// Update Count : 19 // @@ -20,4 +20,7 @@ #include "../libcfa/virtual.h" #include "../libcfa/exception.h" + +void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ )); +void abort ( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )); // exponentiation operator implementation Index: src/tests/preempt_longrun/Makefile.am =================================================================== --- src/tests/preempt_longrun/Makefile.am (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/tests/preempt_longrun/Makefile.am (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -18,13 +18,14 @@ max_time=600 preempt=1_000ul +debug=-debug REPEAT = ${abs_top_srcdir}/tools/repeat TIME = /usr/bin/time -f "%E" -BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt} +BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} CFLAGS = ${BUILD_FLAGS} CC = @CFA_BINDIR@/@CFA_NAME@ -TESTS = block create disjoint enter enter3 processor stack wait yield +TESTS = block coroutine create disjoint enter enter3 processor stack wait yield .INTERMEDIATE: ${TESTS} @@ -36,5 +37,5 @@ % : %.c ${CC} - ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@} + ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@} %.run : % ${REPEAT} Index: src/tests/preempt_longrun/Makefile.in =================================================================== --- src/tests/preempt_longrun/Makefile.in (revision c40e7c50c63d8609881909b05381968059fbeef7) +++ src/tests/preempt_longrun/Makefile.in (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -451,8 +451,9 @@ max_time = 600 preempt = 1_000ul +debug = -debug REPEAT = ${abs_top_srcdir}/tools/repeat TIME = /usr/bin/time -f "%E" -BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt} -TESTS = block create disjoint enter enter3 processor stack wait yield +BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} +TESTS = block coroutine create disjoint enter enter3 processor stack wait yield all: all-am @@ -643,4 +644,11 @@ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +coroutine.log: coroutine + @p='coroutine'; \ + b='coroutine'; \ + $(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) create.log: create @p='create'; \ @@ -873,5 +881,5 @@ % : %.c ${CC} - ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@} + ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@} %.run : % ${REPEAT} Index: src/tests/preempt_longrun/coroutine.c =================================================================== --- src/tests/preempt_longrun/coroutine.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) +++ src/tests/preempt_longrun/coroutine.c (revision d56ca3549a29e84c57908987b2e9e0f6adc5ba42) @@ -0,0 +1,1 @@ +../concurrent/coroutineYield.c