Index: .gitignore =================================================================== --- .gitignore (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ .gitignore (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -25,4 +25,5 @@ include share +*.class # src executables, for lib and bin Index: doc/refrat/refrat.tex =================================================================== --- doc/refrat/refrat.tex (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ doc/refrat/refrat.tex (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:52:25 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Sun Aug 6 10:25:31 2017 -%% Update Count : 105 +%% Last Modified On : Tue Aug 15 18:46:31 2017 +%% Update Count : 106 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -492,6 +492,6 @@ \begin{rationale} -The use of ``©?©'' in identifiers means that some C programs are not \CFA programs. For instance, the sequence of characters ``©(i < 0)?--i:i©'' is legal in a C program, but a -\CFA compiler detects a syntax error because it treats ``©?--©'' as an identifier, not as the two tokens ``©?©'' and ``©--©''. +The use of ``©?©'' in identifiers means that some C programs are not \CFA programs. +For instance, the sequence of characters ``©(i < 0)?--i:i©'' is legal in a C program, but a \CFA compiler detects a syntax error because it treats ``©?--©'' as an identifier, not as the two tokens ``©?©'' and ``©--©''. \end{rationale} Index: doc/user/user.tex =================================================================== --- doc/user/user.tex (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ doc/user/user.tex (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:53:29 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Sun Aug 6 10:24:21 2017 -%% Update Count : 3036 +%% Last Modified On : Mon Nov 27 18:09:59 2017 +%% Update Count : 3143 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -59,5 +59,5 @@ \CFAStyle % use default CFA format-style \lstnewenvironment{C++}[1][] % use C++ style -{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{®}{®}#1}} +{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{®}{®},#1}} {} @@ -777,5 +777,5 @@ case 7: ... - ®break® §\C{// redundant explicit end of switch}§ + ®break® §\C{// explicit end of switch (redundant)}§ default: j = 3; @@ -806,4 +806,5 @@ ®int k = 0;® §\C{// allowed at different nesting levels}§ ... + ®case 2:® §\C{// disallow case in nested statements}§ } ... @@ -962,4 +963,29 @@ \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. + \section{Exception Handling} @@ -977,7 +1003,7 @@ try { f(...); -} catch( E e : §boolean-predicate§ ) { §\C[8cm]{// termination handler}§ +} catch( E e ; §boolean-predicate§ ) { §\C[8cm]{// termination handler}§ // recover and continue -} catchResume( E e : §boolean-predicate§ ) { §\C{// resumption handler}\CRT§ +} catchResume( E e ; §boolean-predicate§ ) { §\C{// resumption handler}\CRT§ // repair and return } finally { @@ -1872,17 +1898,11 @@ \end{cfa} This syntax allows a prototype declaration to be created by cutting and pasting source text from the routine definition header (or vice versa). -It is possible to declare multiple routine-prototypes in a single declaration, but the entire type specification is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:Declarations}), \eg: -\begin{quote2} -\begin{tabular}{@{}l@{\hspace{3em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ -\begin{cfa} -[ int ] f( int ), g; -\end{cfa} -& -\begin{cfa} -int f( int ), g( int ); -\end{cfa} -\end{tabular} -\end{quote2} +Like C, it is possible to declare multiple routine-prototypes in a single declaration, where the return type is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:Declarations}), \eg: +\begin{cfa} +C : const double bar1(), bar2( int ), bar3( double ); +§\CFA§: [const double] foo(), foo( int ), foo( double ) { return 3.0; } +\end{cfa} +\CFA allows the last routine in the list to define its body. + Declaration qualifiers can only appear at the start of a \CFA routine declaration,\footref{StorageClassSpecifier} \eg: \begin{cfa} @@ -2235,134 +2255,92 @@ \label{s:MRV_Functions} -In standard C, functions can return at most one value. +In C and most programming languages, functions return at most one value; +however, many operations have multiple outcomes, some exceptional (see~\VRef{s:ExceptionHandling}). To emulate functions with multiple return values, \emph{\Index{aggregation}} and/or \emph{\Index{aliasing}} is used. -In the former situation, the function designer creates a record type that combines all of the return values into a single type. -For example, consider a function returning the most frequently occurring letter in a string, and its frequency. -This example is complex enough to illustrate that an array is insufficient, since arrays are homogeneous, and demonstrates a potential pitfall that exists with aliasing. -\begin{cfa} -struct mf_ret { - int freq; - char ch; -}; - -struct mf_ret most_frequent(const char * str) { - char freqs [26] = { 0 }; - struct mf_ret ret = { 0, 'a' }; - for (int i = 0; str[i] != '\0'; ++i) { - if (isalpha(str[i])) { // only count letters - int ch = tolower(str[i]); // convert to lower case - int idx = ch-'a'; - if (++freqs[idx] > ret.freq) { // update on new max - ret.freq = freqs[idx]; - ret.ch = ch; - } - } - } - return ret; -} - -const char * str = "hello world"; -struct mf_ret ret = most_frequent(str); -printf("%s -- %d %c\n", str, ret.freq, ret.ch); -\end{cfa} -Of note, the designer must come up with a name for the return type and for each of its fields. -Unnecessary naming is a common programming language issue, introducing verbosity and a complication of the user's mental model. -That is, adding another named type creates another association in the programmer's mind that needs to be kept track of when reading and writing code. -As such, this technique is effective when used sparingly, but can quickly get out of hand if many functions need to return different combinations of types. - -In the latter approach, the designer simulates multiple return values by passing the additional return values as pointer parameters. -The pointer parameters are assigned inside of the routine body to emulate a return. -Using the same example, -\begin{cfa} -int most_frequent(const char * str, char * ret_ch) { - char freqs [26] = { 0 }; - int ret_freq = 0; - for (int i = 0; str[i] != '\0'; ++i) { - if (isalpha(str[i])) { // only count letters - int ch = tolower(str[i]); // convert to lower case - int idx = ch-'a'; - if (++freqs[idx] > ret_freq) { // update on new max - ret_freq = freqs[idx]; - *ret_ch = ch; // assign to out parameter - } - } - } - return ret_freq; // only one value returned directly -} - -const char * str = "hello world"; -char ch; // pre-allocate return value -int freq = most_frequent(str, &ch); // pass return value as out parameter -printf("%s -- %d %c\n", str, freq, ch); -\end{cfa} -Notably, using this approach, the caller is directly responsible for allocating storage for the additional temporary return values, which complicates the call site with a sequence of variable declarations leading up to the call. -Also, while a disciplined use of ©const© can give clues about whether a pointer parameter is going to be used as an out parameter, it is not immediately obvious from only the routine signature whether the callee expects such a parameter to be initialized before the call. -Furthermore, while many C routines that accept pointers are designed so that it is safe to pass ©NULL© as a parameter, there are many C routines that are not null-safe. -On a related note, C does not provide a standard mechanism to state that a parameter is going to be used as an additional return value, which makes the job of ensuring that a value is returned more difficult for the compiler. -Interestingly, there is a subtle bug in the previous example, in that ©ret_ch© is never assigned for a string that does not contain any letters, which can lead to undefined behaviour. -In this particular case, it turns out that the frequency return value also doubles as an error code, where a frequency of 0 means the character return value should be ignored. + +In the former approach, a record type is created combining all of the return values. +For example, consider C's \Indexc{div} function, which returns the quotient and remainder for a division of an integer value. +\begin{cfa} +typedef struct { int quot, rem; } div_t; §\C[7cm]{// from include stdlib.h}§ +div_t div( int num, int den ); +div_t qr = div( 13, 5 ); §\C{// return quotient/remainder aggregate}§ +printf( "%d %d\n", qr.quot, qr.rem ); §\C{// print quotient/remainder}§ +\end{cfa} +This approach requires a name for the return type and fields, where \Index{naming} is a common programming-language issue. +That is, naming creates an association that must be managed when reading and writing code. +While effective when used sparingly, this approach does not scale when functions need to return multiple combinations of types. + +In the latter approach, additional return values are passed as pointer parameters. +A pointer parameter is assigned inside the routine to emulate a return. +For example, consider C's \Indexc{modf} function, which returns the integral and fractional part of a floating-point value. +\begin{cfa} +double modf( double x, double * i ); §\C{// from include math.h}§ +double intp, frac = modf( 13.5, &intp ); §\C{// return integral and fractional components}§ +printf( "%g %g\n", intp, frac ); §\C{// print integral/fractional components}§ +\end{cfa} +This approach requires allocating storage for the return values, which complicates the call site with a sequence of variable declarations leading to the call. +Also, while a disciplined use of ©const© can give clues about whether a pointer parameter is used as an \Index{out parameter}, it is not obvious from the routine signature whether the callee expects such a parameter to be initialized before the call. +Furthermore, while many C routines that accept pointers are safe for a ©NULL© argument, there are many C routines that are not null-safe. +Finally, C does not provide a mechanism to state that a parameter is going to be used as an additional return value, which makes the job of ensuring that a value is returned more difficult for the compiler. Still, not every routine with multiple return values should be required to return an error code, and error codes are easily ignored, so this is not a satisfying solution. As with the previous approach, this technique can simulate multiple return values, but in practice it is verbose and error prone. -In \CFA, functions can be declared to return multiple values with an extension to the function declaration syntax. +\CFA allows functions to return multiple values by extending the function declaration syntax. Multiple return values are declared as a comma-separated list of types in square brackets in the same location that the return type appears in standard C function declarations. +\begin{cfa} +[ char, int, double ] f( ... ); +\end{cfa} The ability to return multiple values from a function requires a new syntax for the return statement. For consistency, the return statement in \CFA accepts a comma-separated list of expressions in square brackets. -The expression resolution phase of the \CFA translator ensures that the correct form is used depending on the values being returned and the return type of the current function. +\begin{cfa} +return [ c, i, d ]; +\end{cfa} +The expression resolution ensures the correct form is used depending on the values being returned and the return type of the current function. A multiple-returning function with return type ©T© can return any expression that is implicitly convertible to ©T©. -Using the running example, the ©most_frequent© function can be written using multiple return values as such, -\begin{cfa} -[int, char] most_frequent(const char * str) { - char freqs [26] = { 0 }; - int ret_freq = 0; - char ret_ch = 'a'; // arbitrary default value for consistent results - for (int i = 0; str[i] != '\0'; ++i) { - if (isalpha(str[i])) { // only count letters - int ch = tolower(str[i]); // convert to lower case - int idx = ch-'a'; - if (++freqs[idx] > ret_freq) { // update on new max - ret_freq = freqs[idx]; - ret_ch = ch; - } - } - } - return [ret_freq, ret_ch]; -} -\end{cfa} -This approach provides the benefits of compile-time checking for appropriate return statements as in aggregation, but without the required verbosity of declaring a new named type, which precludes the bug seen with out-parameters. - -The addition of multiple-return-value functions necessitates a syntax for accepting multiple values at the call-site. + +A common use of a function's output is input to another function. +\CFA allows this case, without any new syntax; +a multiple-returning function can be used in any of the contexts where an expression is allowed. +When a function call is passed as an argument to another call, the best match of actual arguments to formal parameters is evaluated given all possible expression interpretations in the current scope. +\begin{cfa} +void g( int, int ); §\C{// 1}§ +void g( double, double ); §\C{// 2}§ +g( div( 13, 5 ) ); §\C{// select 1}§ +g( modf( 13.5 ) ); §\C{// select 2}§ +\end{cfa} +In this case, there are two overloaded ©g© routines. +Both calls to ©g© expect two arguments that are matched by the two return values from ©div© and ©modf©. respectively, which are fed directly to the first and second parameters of ©g©. +As well, both calls to ©g© have exact type matches for the two different versions of ©g©, so these exact matches are chosen. +When type matches are not exact, conversions are used to find a best match. + +The previous examples can be rewritten passing the multiple returned-values directly to the ©printf© function call. +\begin{cfa} +[ int, int ] div( int x, int y ); §\C{// from include stdlib}§ +printf( "%d %d\n", div( 13, 5 ) ); §\C{// print quotient/remainder}§ + +[ double, double ] modf( double x ); §\C{// from include math}§ +printf( "%g %g\n", modf( 13.5 ) ); §\C{// print integral/fractional components}§ +\end{cfa} +This approach provides the benefits of compile-time checking for appropriate return statements as in aggregation, but without the required verbosity of declaring a new named type. + +Finally, the addition of multiple-return-value functions necessitates a syntax for retaining the multiple values at the call-site versus their temporary existence during a call. The simplest mechanism for retaining a return value in C is variable assignment. -By assigning the return value into a variable, its value can be retrieved later at any point in the program. +By assigning the multiple return-values into multiple variables, the values can be retrieved later. As such, \CFA allows assigning multiple values from a function into multiple variables, using a square-bracketed list of lvalue expressions on the left side. \begin{cfa} -const char * str = "hello world"; -int freq; -char ch; -[freq, ch] = most_frequent(str); // assign into multiple variables -printf("%s -- %d %c\n", str, freq, ch); -\end{cfa} -It is also common to use a function's output as the input to another function. -\CFA also allows this case, without any new syntax. -When a function call is passed as an argument to another call, the expression resolver attempts to find the best match of actual arguments to formal parameters given all of the possible expression interpretations in the current scope \cite{Bilson03}. -For example, -\begin{cfa} -void process(int); // (1) -void process(char); // (2) -void process(int, char); // (3) -void process(char, int); // (4) - -process(most_frequent("hello world")); // selects (3) -\end{cfa} -In this case, there is only one option for a function named ©most_frequent© that takes a string as input. -This function returns two values, one ©int© and one ©char©. -There are four options for a function named ©process©, but only two that accept two arguments, and of those the best match is (3), which is also an exact match. -This expression first calls ©most_frequent("hello world")©, which produces the values ©3© and ©'l'©, which are fed directly to the first and second parameters of (3), respectively. - -\section{Tuple Expressions} +int quot, rem; +[ quot, rem ] = div( 13, 5 ); §\C{// assign multiple variables}§ +printf( "%d %d\n", quot, rem ); §\C{// print quotient/remainder}\CRT§ +\end{cfa} +Here, the multiple return-values are matched in much the same way as passing multiple return-values to multiple parameters in a call. + + +\subsection{Expressions} + Multiple-return-value functions provide \CFA with a new syntax for expressing a combination of expressions in the return statement and a combination of types in a function signature. -These notions can be generalized to provide \CFA with \emph{tuple expressions} and \emph{tuple types}. +These notions are generalized to provide \CFA with \newterm{tuple expression}s and \newterm{tuple type}s. A tuple expression is an expression producing a fixed-size, ordered list of values of heterogeneous types. -The type of a tuple expression is the tuple of the subexpression types, or a \emph{tuple type}. +The type of a tuple expression is the tuple of the subexpression types, or a tuple type. + In \CFA, a tuple expression is denoted by a comma-separated list of expressions enclosed in square brackets. For example, the expression ©[5, 'x', 10.5]© has type ©[int, char, double]©. @@ -2371,40 +2349,36 @@ The order of evaluation of the components in a tuple expression is unspecified, to allow a compiler the greatest flexibility for program optimization. It is, however, guaranteed that each component of a tuple expression is evaluated for side-effects, even if the result is not used. -Multiple-return-value functions can equivalently be called \emph{tuple-returning functions}. - -\subsection{Tuple Variables} -The call-site of the ©most_frequent© routine has a notable blemish, in that it required the preallocation of return variables in a manner similar to the aliasing example, since it is impossible to declare multiple variables of different types in the same declaration in standard C. -In \CFA, it is possible to overcome this restriction by declaring a \emph{tuple variable}. -\begin{cfa}[emph=ret, emphstyle=\color{red}] -const char * str = "hello world"; -[int, char] ret = most_frequent(str); // initialize tuple variable -printf("%s -- %d %c\n", str, ret); -\end{cfa} -It is now possible to accept multiple values into a single piece of storage, in much the same way that it was previously possible to pass multiple values from one function call to another. -These variables can be used in any of the contexts where a tuple expression is allowed, such as in the ©printf© function call. -As in the ©process© example, the components of the tuple value are passed as separate parameters to ©printf©, allowing very simple printing of tuple expressions. -One way to access the individual components is with a simple assignment, as in previous examples. -\begin{cfa} -int freq; -char ch; -[freq, ch] = ret; -\end{cfa} - -\begin{sloppypar} +Multiple-return-value functions can equivalently be called \newterm{tuple-returning functions}. + + +\subsection{Variables} + +The previous call of ©div© still requires the preallocation of multiple return-variables in a manner similar to the aliasing example. +In \CFA, it is possible to overcome this restriction by declaring a \newterm{tuple variable}. +\begin{cfa} +[int, int] ®qr® = div( 13, 5 ); §\C{// initialize tuple variable}§ +printf( "%d %d\n", ®qr® ); §\C{// print quotient/remainder}§ +\end{cfa} +It is now possible to match the multiple return-values to a single variable, in much the same way as \Index{aggregation}. +As well, the components of the tuple value are passed as separate parameters to ©printf©, allowing direct printing of tuple variables. +One way to access the individual components of a tuple variable is with assignment. +\begin{cfa} +[ quot, rem ] = qr; §\C{// assign multiple variables}§ +\end{cfa} + In addition to variables of tuple type, it is also possible to have pointers to tuples, and arrays of tuples. Tuple types can be composed of any types, except for array types, since array assignment is disallowed, which makes tuple assignment difficult when a tuple contains an array. \begin{cfa} -[double, int] di; -[double, int] * pdi -[double, int] adi[10]; +[ double, int ] di; +[ double, int ] * pdi +[ double, int ] adi[10]; \end{cfa} This examples declares a variable of type ©[double, int]©, a variable of type pointer to ©[double, int]©, and an array of ten ©[double, int]©. -\end{sloppypar} - -\subsection{Tuple Indexing} - -At times, it is desirable to access a single component of a tuple-valued expression without creating unnecessary temporary variables to assign to. -Given a tuple-valued expression ©e© and a compile-time constant integer $i$ where $0 \leq i < n$, where $n$ is the number of components in ©e©, ©e.i© accesses the $i$\textsuperscript{th} component of ©e©. -For example, + + +\subsection{Indexing} + +It is also possible to access a single component of a tuple-valued expression without creating temporary variables. +Given a tuple-valued expression $e$np and a compile-time constant integer $i$ where $0 \leq i < n$, where $n$ is the number of components in $e$, $e.i$ accesses the $i^{\:th}$ component of $e$, \eg: \begin{cfa} [int, double] x; @@ -2417,10 +2391,12 @@ p->0 = 5; §\C{// access int component of tuple pointed-to by p}§ g( x.1, x.0 ); §\C{// rearrange x to pass to g}§ -double z = [x, f()].0.1; §\C{// access second component of first component of tuple expression}§ -\end{cfa} -As seen above, tuple-index expressions can occur on any tuple-typed expression, including tuple-returning functions, square-bracketed tuple expressions, and other tuple-index expressions, provided the retrieved component is also a tuple. +double z = [ x, f() ].0.1; §\C{// access second component of first component of tuple expression}§ +\end{cfa} +Tuple-index expressions can occur on any tuple-typed expression, including tuple-returning functions, square-bracketed tuple expressions, and other tuple-index expressions, provided the retrieved component is also a tuple. This feature was proposed for \KWC but never implemented \cite[p.~45]{Till89}. + \subsection{Flattening and Structuring} + As evident in previous examples, tuples in \CFA do not have a rigid structure. In function call contexts, tuples support implicit flattening and restructuring conversions. @@ -2465,23 +2441,25 @@ There is only a single definition of ©f©, and 3 arguments with only single interpretations. First, the argument alternative list ©[5, 10.2], 4© is flattened to produce the argument list ©5, 10.2, 4©. -Next, the parameter matching algorithm begins, with $P = $©int© and $A = $©int©, which unifies exactly. -Moving to the next parameter and argument, $P = $©[double, int]© and $A = $©double©. -This time, the parameter is a tuple type, so the algorithm applies recursively with $P' = $©double© and $A = $©double©, which unifies exactly. -Then $P' = $©int© and $A = $©double©, which again unifies exactly. +Next, the parameter matching algorithm begins, with $P =$© int© and $A =$© int©, which unifies exactly. +Moving to the next parameter and argument, $P =$© [double, int]© and $A =$© double©. +This time, the parameter is a tuple type, so the algorithm applies recursively with $P' =$© double© and $A =$© double©, which unifies exactly. +Then $P' =$© int© and $A =$© double©, which again unifies exactly. At this point, the end of $P'$ has been reached, so the arguments ©10.2, 4© are structured into the tuple expression ©[10.2, 4]©. Finally, the end of the parameter list $P$ has also been reached, so the final expression is ©f(5, [10.2, 4])©. -\section{Tuple Assignment} + +\subsection{Assignment} \label{s:TupleAssignment} -An assignment where the left side of the assignment operator has a tuple type is called 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 of the assignment operator has 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 non-tuple or tuple type, called \newterm[mass assignment]{mass} and \newterm[multiple assignment]{multiple} assignment, respectively. \begin{cfa} int x; double y; [int, double] z; -[y, x] = 3.14; // mass assignment -[x, y] = z; // multiple assignment -z = 10; // mass assignment -z = [x, y]; // multiple assignment +[y, x] = 3.14; §\C{// mass assignment}§ +[x, y] = z; §\C{// multiple assignment}§ +z = 10; §\C{// mass assignment}§ +z = [x, y]; §\C{// multiple assignment}§ \end{cfa} Let $L_i$ for $i$ in $[0, n)$ represent each component of the flattened left side, $R_i$ represent each component of the flattened right side of a multiple assignment, and $R$ represent the right side of a mass assignment. @@ -2490,6 +2468,6 @@ For example, the following is invalid because the number of components on the left does not match the number of components on the right. \begin{cfa} -[int, int] x, y, z; -[x, y] = z; // multiple assignment, invalid 4 != 2 +[ int, int ] x, y, z; +[ x, y ] = z; §\C{// multiple assignment, invalid 4 != 2}§ \end{cfa} Multiple assignment assigns $R_i$ to $L_i$ for each $i$. @@ -2507,5 +2485,5 @@ \begin{cfa} int x = 10, y = 20; -[x, y] = [y, x]; +[ x, y ] = [ y, x ]; \end{cfa} After executing this code, ©x© has the value ©20© and ©y© has the value ©10©. @@ -2526,6 +2504,6 @@ int a, b; double c, d; - [void] f([int, int]); - f([c, a] = [b, d] = 1.5); // assignments in parameter list + [ void ] f( [ int, int ] ); + f( [ c, a ] = [ b, d ] = 1.5 ); // assignments in parameter list \end{cfa} The tuple expression begins with a mass assignment of ©1.5© into ©[b, d]©, which assigns ©1.5© into ©b©, which is truncated to ©1©, and ©1.5© into ©d©, producing the tuple ©[1, 1.5]© as a result. @@ -2533,5 +2511,7 @@ Finally, the tuple ©[1, 1]© is used as an expression in the call to ©f©. -\subsection{Tuple Construction} + +\subsection{Construction} + Tuple construction and destruction follow the same rules and semantics as tuple assignment, except that in the case where there is no right side, the default constructor or destructor is called on each component of the tuple. As constructors and destructors did not exist in previous versions of \CFA or in \KWC, this is a primary contribution of this thesis to the design of tuples. @@ -2569,42 +2549,51 @@ The initialization of ©s© with ©t© works by default because ©t© is flattened into its components, which satisfies the generated field constructor ©?{}(S *, int, double)© to initialize the first two values. -\section{Member-Access Tuple Expression} + +\subsection{Member-Access Expression} \label{s:MemberAccessTuple} -It is possible to access multiple fields from a single expression using a \emph{Member-Access Tuple Expression}. + +Tuples may be used to select multiple fields of a record by field name. The result is a single tuple-valued expression whose type is the tuple of the types of the members. For example, \begin{cfa} -struct S { int x; double y; char * z; } s; +struct S { char x; int y; double z; } s; s.[x, y, z]; \end{cfa} -Here, the type of ©s.[x, y, z]© is ©[int, double, char *]©. -A member tuple expression has the form ©a.[x, y, z];© where ©a© is an expression with type ©T©, where ©T© supports member access expressions, and ©x, y, z© are all members of ©T© with types ©T$_x$©, ©T$_y$©, and ©T$_z$© respectively. -Then the type of ©a.[x, y, z]© is ©[T_x, T_y, T_z]©. - -Since tuple index expressions are a form of member-access expression, it is possible to use tuple-index expressions in conjunction with member tuple expressions to manually restructure a tuple (\eg, rearrange components, drop components, duplicate components, etc.). -\begin{cfa} -[int, int, long, double] x; -void f(double, long); - -f(x.[0, 3]); // f(x.0, x.3) -x.[0, 1] = x.[1, 0]; // [x.0, x.1] = [x.1, x.0] -[long, int, long] y = x.[2, 0, 2]; -\end{cfa} - -It is possible for a member tuple expression to contain other member access expressions. -For example, +Here, the type of ©s.[ x, y, z ]© is ©[ char, int, double ]©. +A member tuple expression has the form \emph{e}©.[x, y, z];© where \emph{e} is an expression with type ©T©, where ©T© supports member access expressions, and ©x, y, z© are all members of ©T© with types ©T$_x$©, ©T$_y$©, and ©T$_z$© respectively. +Then the type of \emph{e}©.[x, y, z]© is ©[T$_x$, T$_y$, T$_z$]©. + +A member-access tuple may be used anywhere a tuple can be used, \eg: +\begin{cfa} +s.[ y, z, x ] = [ 3, 3.2, 'x' ]; §\C{// equivalent to s.x = 'x', s.y = 3, s.z = 3.2}§ +f( s.[ y, z ] ); §\C{// equivalent to f( s.y, s.z )}§ +\end{cfa} +Note, the fields appearing in a record-field tuple may be specified in any order; +also, it is unnecessary to specify all the fields of a struct in a multiple record-field tuple. + +Since tuple-index expressions are a form of member-access expression, it is possible to use tuple-index expressions in conjunction with member-access expressions to restructure a tuple (\eg, rearrange components, drop components, duplicate components, etc.). +\begin{cfa} +[ int, int, long, double ] x; +void f( double, long ); + +f( x.[ 0, 3 ] ); §\C{// f( x.0, x.3 )}§ +x.[ 0, 1 ] = x.[ 1, 0 ]; §\C{// [ x.0, x.1 ] = [ x.1, x.0 ]}§ +[ long, int, long ] y = x.[ 2, 0, 2 ]; +\end{cfa} + +It is possible for a member tuple expression to contain other member access expressions, \eg: \begin{cfa} struct A { double i; int j; }; struct B { int * k; short l; }; struct C { int x; A y; B z; } v; -v.[x, y.[i, j], z.k]; -\end{cfa} -This expression is equivalent to ©[v.x, [v.y.i, v.y.j], v.z.k]©. -That is, the aggregate expression is effectively distributed across the tuple, which allows simple and easy access to multiple components in an aggregate, without repetition. +v.[ x, y.[ i, j ], z.k ]; +\end{cfa} +This expression is equivalent to ©[ v.x, [ v.y.i, v.y.j ], v.z.k ]©. +That is, the aggregate expression is effectively distributed across the tuple allowing simple and easy access to multiple components in an aggregate without repetition. It is guaranteed that the aggregate expression to the left of the ©.© in a member tuple expression is evaluated exactly once. -As such, it is safe to use member tuple expressions on the result of a side-effecting function. -\begin{cfa} -[int, float, double] f(); -[double, float] x = f().[2, 1]; +As such, it is safe to use member tuple expressions on the result of a function with side-effects. +\begin{cfa} +[ int, float, double ] f(); +[ double, float ] x = f().[ 2, 1 ]; §\C{// f() called once}§ \end{cfa} @@ -2612,64 +2601,7 @@ Since \CFA permits these tuple-access expressions using structures, unions, and tuples, \emph{member tuple expression} or \emph{field tuple expression} is more appropriate. -It is possible to extend member-access expressions further. -Currently, a member-access expression whose member is a name requires that the aggregate is a structure or union, while a constant integer member requires the aggregate to be a tuple. -In the interest of orthogonal design, \CFA could apply some meaning to the remaining combinations as well. -For example, -\begin{cfa} -struct S { int x, y; } s; -[S, S] z; - -s.x; // access member -z.0; // access component - -s.1; // ??? -z.y; // ??? -\end{cfa} -One possibility is for ©s.1© to select the second member of ©s©. -Under this interpretation, it becomes possible to not only access members of a struct by name, but also by position. -Likewise, it seems natural to open this mechanism to enumerations as well, wherein the left side would be a type, rather than an expression. -One benefit of this interpretation is familiarity, since it is extremely reminiscent of tuple-index expressions. -On the other hand, it could be argued that this interpretation is brittle in that changing the order of members or adding new members to a structure becomes a brittle operation. -This problem is less of a concern with tuples, since modifying a tuple affects only the code that directly uses the tuple, whereas modifying a structure has far reaching consequences for every instance of the structure. - -As for ©z.y©, one interpretation is to extend the meaning of member tuple expressions. -That is, currently the tuple must occur as the member, \ie to the right of the dot. -Allowing tuples to the left of the dot could distribute the member across the elements of the tuple, in much the same way that member tuple expressions distribute the aggregate across the member tuple. -In this example, ©z.y© expands to ©[z.0.y, z.1.y]©, allowing what is effectively a very limited compile-time field-sections map operation, where the argument must be a tuple containing only aggregates having a member named ©y©. -It is questionable how useful this would actually be in practice, since structures often do not have names in common with other structures, and further this could cause maintainability issues in that it encourages programmers to adopt very simple naming conventions to maximize the amount of overlap between different types. -Perhaps more useful would be to allow arrays on the left side of the dot, which would likewise allow mapping a field access across the entire array, producing an array of the contained fields. -The immediate problem with this idea is that C arrays do not carry around their size, which would make it impossible to use this extension for anything other than a simple stack allocated array. - -Supposing this feature works as described, it would be necessary to specify an ordering for the expansion of member-access expressions versus member-tuple expressions. -\begin{cfa} -struct { int x, y; }; -[S, S] z; -z.[x, y]; // ??? -// => [z.0, z.1].[x, y] -// => [z.0.x, z.0.y, z.1.x, z.1.y] -// or -// => [z.x, z.y] -// => [[z.0, z.1].x, [z.0, z.1].y] -// => [z.0.x, z.1.x, z.0.y, z.1.y] -\end{cfa} -Depending on exactly how the two tuples are combined, different results can be achieved. -As such, a specific ordering would need to be imposed to make this feature useful. -Furthermore, this addition moves a member-tuple expression's meaning from being clear statically to needing resolver support, since the member name needs to be distributed appropriately over each member of the tuple, which could itself be a tuple. - -A second possibility is for \CFA to have named tuples, as they exist in Swift and D. -\begin{cfa} -typedef [int x, int y] Point2D; -Point2D p1, p2; -p1.x + p1.y + p2.x + p2.y; -p1.0 + p1.1 + p2.0 + p2.1; // equivalent -\end{cfa} -In this simpler interpretation, a tuple type carries with it a list of possibly empty identifiers. -This approach fits naturally with the named return-value feature, and would likely go a long way towards implementing it. - -Ultimately, the first two extensions introduce complexity into the model, with relatively little perceived benefit, and so were dropped from consideration. -Named tuples are a potentially useful addition to the language, provided they can be parsed with a reasonable syntax. - - -\section{Casting} + +\subsection{Casting} + In C, the cast operator is used to explicitly convert between types. In \CFA, the cast operator has a secondary use, which is type ascription, since it forces the expression resolution algorithm to choose the lowest cost conversion to the target type. @@ -2725,5 +2657,7 @@ That is, it is invalid to cast ©[int, int]© to ©[int, int, int]©. -\section{Polymorphism} + +\subsection{Polymorphism} + Due to the implicit flattening and structuring conversions involved in argument passing, ©otype© and ©dtype© parameters are restricted to matching only with non-tuple types. The integration of polymorphism, type assertions, and monomorphic specialization of tuple-assertions are a primary contribution of this thesis to the design of tuples. @@ -2778,5 +2712,8 @@ Until this point, it has been assumed that assertion arguments must match the parameter type exactly, modulo polymorphic specialization (\ie, no implicit conversions are applied to assertion arguments). This decision presents a conflict with the flexibility of tuples. -\subsection{Assertion Inference} + + +\subsubsection{Assertion Inference} + \begin{cfa} int f([int, double], double); @@ -2902,5 +2839,5 @@ Unfortunately, C's syntax for subscripts precluded treating them as tuples. The C subscript list has the form ©[i][j]...© and not ©[i, j, ...]©. -Therefore, there is no syntactic way for a routine returning multiple values to specify the different subscript values, \eg ©f[g()]© always means a single subscript value because there is only one set of brackets. +Therefore, there is no syntactic way for a routine returning multiple values to specify the different subscript values, \eg ©f[ g() ]© always means a single subscript value because there is only one set of brackets. Fixing this requires a major change to C because the syntactic form ©M[i, j, k]© already has a particular meaning: ©i, j, k© is a comma expression. \end{rationale} @@ -2951,5 +2888,5 @@ -\section{Mass Assignment} +\subsection{Mass Assignment} \CFA permits assignment to several variables at once using mass assignment~\cite{CLU}. @@ -2991,5 +2928,5 @@ -\section{Multiple Assignment} +\subsection{Multiple Assignment} \CFA also supports the assignment of several values at once, known as multiple assignment~\cite{CLU,Galletly96}. @@ -3032,5 +2969,5 @@ -\section{Cascade Assignment} +\subsection{Cascade Assignment} As in C, \CFA mass and multiple assignments can be cascaded, producing cascade assignment. @@ -3048,43 +2985,4 @@ \end{cfa} As in C, the rightmost assignment is performed first, \ie assignment parses right to left. - - -\section{Field Tuples} - -Tuples may be used to select multiple fields of a record by field name. -Its general form is: -\begin{cfa} -§\emph{expr}§ . [ §\emph{fieldlist}§ ] -§\emph{expr}§ -> [ §\emph{fieldlist}§ ] -\end{cfa} -\emph{expr} is any expression yielding a value of type record, \eg ©struct©, ©union©. -Each element of \emph{ fieldlist} is an element of the record specified by \emph{expr}. -A record-field tuple may be used anywhere a tuple can be used. An example of the use of a record-field tuple is -the following: -\begin{cfa} -struct s { - int f1, f2; - char f3; - double f4; -} v; -v.[ f3, f1, f2 ] = ['x', 11, 17 ]; §\C{// equivalent to v.f3 = 'x', v.f1 = 11, v.f2 = 17}§ -f( v.[ f3, f1, f2 ] ); §\C{// equivalent to f( v.f3, v.f1, v.f2 )}§ -\end{cfa} -Note, the fields appearing in a record-field tuple may be specified in any order; -also, it is unnecessary to specify all the fields of a struct in a multiple record-field tuple. - -If a field of a ©struct© is itself another ©struct©, multiple fields of this subrecord can be specified using a nested record-field tuple, as in the following example: -\begin{cfa} -struct inner { - int f2, f3; -}; -struct outer { - int f1; - struct inner i; - double f4; -} o; - -o.[ f1, i.[ f2, f3 ], f4 ] = [ 11, 12, 13, 3.14159 ]; -\end{cfa} Index: src/Concurrency/Waitfor.cc =================================================================== --- src/Concurrency/Waitfor.cc (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/Concurrency/Waitfor.cc (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -416,5 +416,5 @@ makeAccStatement( acceptables, index, "is_dtor", detectIsDtor( clause.target.function ) , indexer ), makeAccStatement( acceptables, index, "func" , new CastExpr( clause.target.function, fptr_t ) , indexer ), - makeAccStatement( acceptables, index, "list" , new VariableExpr( monitors ) , indexer ), + makeAccStatement( acceptables, index, "data" , new VariableExpr( monitors ) , indexer ), makeAccStatement( acceptables, index, "size" , new ConstantExpr( Constant::from_ulong( clause.target.arguments.size() ) ), indexer ), setter->clone() Index: src/GenPoly/Box.cc =================================================================== --- src/GenPoly/Box.cc (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/GenPoly/Box.cc (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -855,4 +855,13 @@ DeclarationWithType *adapteeDecl = adapterType->get_parameters().front(); adapteeDecl->set_name( "_adaptee" ); + // do not carry over attributes to real type parameters/return values + for ( DeclarationWithType * dwt : realType->parameters ) { + deleteAll( dwt->get_type()->attributes ); + dwt->get_type()->attributes.clear(); + } + for ( DeclarationWithType * dwt : realType->returnVals ) { + deleteAll( dwt->get_type()->attributes ); + dwt->get_type()->attributes.clear(); + } ApplicationExpr *adapteeApp = new ApplicationExpr( new CastExpr( new VariableExpr( adapteeDecl ), new PointerType( Type::Qualifiers(), realType ) ) ); Statement *bodyStmt; Index: src/GenPoly/InstantiateGeneric.cc =================================================================== --- src/GenPoly/InstantiateGeneric.cc (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/GenPoly/InstantiateGeneric.cc (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -210,5 +210,5 @@ PassVisitor instantiator; - mutateAll( translationUnit, fixer ); + // mutateAll( translationUnit, fixer ); mutateAll( translationUnit, instantiator ); } Index: src/Parser/ParseNode.h =================================================================== --- src/Parser/ParseNode.h (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/Parser/ParseNode.h (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:28:16 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Sep 23 18:11:22 2017 -// Update Count : 821 +// Last Modified On : Mon Nov 27 17:33:35 2017 +// Update Count : 824 // @@ -292,4 +292,6 @@ DeclarationNode * set_extension( bool exten ) { extension = exten; return this; } public: + DeclarationNode * get_last() { return (DeclarationNode *)ParseNode::get_last(); } + struct Variable_t { // const std::string * name; Index: src/Parser/TypeData.cc =================================================================== --- src/Parser/TypeData.cc (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/Parser/TypeData.cc (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -792,5 +792,5 @@ -NamedTypeDecl * buildSymbolic( const TypeData * td, const string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage ) { +NamedTypeDecl * buildSymbolic( const TypeData * td, std::list< Attribute * > attributes, const string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage ) { assert( td->kind == TypeData::Symbolic ); NamedTypeDecl * ret; @@ -803,4 +803,5 @@ buildList( td->symbolic.params, ret->get_parameters() ); buildList( td->symbolic.assertions, ret->get_assertions() ); + ret->base->attributes.splice( ret->base->attributes.end(), attributes ); return ret; } // buildSymbolic @@ -866,5 +867,5 @@ return buildEnum( td, attributes, linkage ); } else if ( td->kind == TypeData::Symbolic ) { - return buildSymbolic( td, name, scs, linkage ); + return buildSymbolic( td, attributes, name, scs, linkage ); } else { return (new ObjectDecl( name, scs, linkage, bitfieldWidth, typebuild( td ), init, attributes ))->set_asmName( asmName ); Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/Parser/parser.yy (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -10,6 +10,6 @@ // Created On : Sat Sep 1 20:22:55 2001 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Nov 20 09:45:36 2017 -// Update Count : 2945 +// Last Modified On : Mon Nov 27 17:23:35 2017 +// Update Count : 2992 // @@ -345,5 +345,5 @@ %type type_list -%type type_qualifier type_qualifier_name type_qualifier_list_opt type_qualifier_list +%type type_qualifier type_qualifier_name forall type_qualifier_list_opt type_qualifier_list %type type_specifier type_specifier_nobody @@ -379,5 +379,5 @@ // `---' matches start of TYPEGENname '(' // Must be: -// Foo( int ) ( *fp )( int ); +// Foo( int ) ( *fp )( int ); // Order of these lines matters (low-to-high precedence). @@ -1058,5 +1058,5 @@ with_statement: WITH '(' tuple_expression_list ')' statement - { $$ = nullptr; } // FIX ME + { throw SemanticError("With clause is currently unimplemented."); $$ = nullptr; } // FIX ME ; @@ -1064,5 +1064,5 @@ mutex_statement: MUTEX '(' argument_expression_list ')' statement - { $$ = nullptr; } // FIX ME + { throw SemanticError("Mutex statement is currently unimplemented."); $$ = nullptr; } // FIX ME ; @@ -1280,4 +1280,6 @@ c_declaration pop ';' | cfa_declaration pop ';' // CFA + | STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11 + { throw SemanticError("Static assert is currently unimplemented."); $$ = nullptr; } // FIX ME ; @@ -1362,8 +1364,10 @@ $$ = $3->addQualifiers( $1 )->addQualifiers( $2 ); } - | cfa_function_declaration pop ',' push identifier_or_type_name - { - typedefTable.addToEnclosingScope( *$5, TypedefTable::ID ); - $$ = $1->appendList( $1->cloneType( $5 ) ); + | cfa_function_declaration pop ',' push identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')' + { + // Append the return type at the start (left-hand-side) to each identifier in the list. + DeclarationNode * ret = new DeclarationNode; + ret->type = maybeClone( $1->type->base ); + $$ = $1->appendList( DeclarationNode::newFunction( $5, ret, $8, nullptr, true ) ); } ; @@ -1587,5 +1591,9 @@ | ATOMIC { $$ = DeclarationNode::newTypeQualifier( Type::Atomic ); } - | FORALL '(' + | forall + ; + +forall: + FORALL '(' { typedefTable.enterScope(); @@ -2374,4 +2382,5 @@ $$ = $2; } + | forall '{' external_definition_list '}' // CFA, namespace ; @@ -2399,7 +2408,7 @@ with_clause_opt: // empty - { $$ = nullptr; } // FIX ME + { $$ = nullptr; } | WITH '(' tuple_expression_list ')' - { $$ = nullptr; } // FIX ME + { throw SemanticError("With clause is currently unimplemented."); $$ = nullptr; } // FIX ME ; @@ -2409,5 +2418,8 @@ typedefTable.addToEnclosingScope( TypedefTable::ID ); typedefTable.leaveScope(); - $$ = $1->addFunctionBody( $3 ); + // Add the function body to the last identifier in the function definition list, i.e., foo3: + // [const double] foo1(), foo2( int ), foo3( double ) { return 3.0; } + $1->get_last()->addFunctionBody( $3 ); + $$ = $1; } | declaration_specifier function_declarator with_clause_opt compound_statement @@ -2418,4 +2430,5 @@ $$ = $2->addFunctionBody( $4 )->addType( $1 ); } + // handles default int return type, OBSOLESCENT (see 1) | type_qualifier_list function_declarator with_clause_opt compound_statement { @@ -2424,4 +2437,5 @@ $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 ); } + // handles default int return type, OBSOLESCENT (see 1) | declaration_qualifier_list function_declarator with_clause_opt compound_statement { @@ -2430,4 +2444,5 @@ $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 ); } + // handles default int return type, OBSOLESCENT (see 1) | declaration_qualifier_list type_qualifier_list function_declarator with_clause_opt compound_statement { @@ -2445,4 +2460,5 @@ $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addType( $1 ); } + // handles default int return type, OBSOLESCENT (see 1) | type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement { @@ -2451,6 +2467,5 @@ $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addQualifiers( $1 ); } - - // Old-style K&R function definition with "implicit int" type_specifier, OBSOLESCENT (see 4) + // handles default int return type, OBSOLESCENT (see 1) | declaration_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement { @@ -2459,4 +2474,5 @@ $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addQualifiers( $1 ); } + // handles default int return type, OBSOLESCENT (see 1) | declaration_qualifier_list type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement { Index: src/SymTab/Autogen.cc =================================================================== --- src/SymTab/Autogen.cc (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/SymTab/Autogen.cc (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -372,5 +372,10 @@ continue; } - memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, 0, field->get_type()->clone(), 0 ) ); + // do not carry over field's attributes to parameter type + Type * paramType = field->get_type()->clone(); + deleteAll( paramType->attributes ); + paramType->attributes.clear(); + // add a parameter corresponding to this field + memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType, nullptr ) ); FunctionDecl * ctor = genFunc( "?{}", memCtorType->clone(), functionNesting ); makeFieldCtorBody( aggregateDecl->members.begin(), aggregateDecl->members.end(), ctor ); @@ -503,5 +508,10 @@ break; } - memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, field->get_type()->clone(), nullptr ) ); + // do not carry over field's attributes to parameter type + Type * paramType = field->get_type()->clone(); + deleteAll( paramType->attributes ); + paramType->attributes.clear(); + // add a parameter corresponding to this field + memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType, nullptr ) ); FunctionDecl * ctor = genFunc( "?{}", memCtorType->clone(), functionNesting ); ObjectDecl * srcParam = strict_dynamic_cast( ctor->type->parameters.back() ); Index: src/SymTab/Validate.cc =================================================================== --- src/SymTab/Validate.cc (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/SymTab/Validate.cc (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -201,4 +201,6 @@ Declaration * postmutate( TraitDecl * contextDecl ); + void premutate( FunctionType * ftype ); + private: template @@ -214,4 +216,5 @@ TypeDeclMap typedeclNames; int scopeLevel; + bool inFunctionType = false; }; @@ -725,4 +728,11 @@ Type *ret = def->second.first->base->clone(); ret->get_qualifiers() |= typeInst->get_qualifiers(); + // attributes are not carried over from typedef to function parameters/return values + if ( ! inFunctionType ) { + ret->attributes.splice( ret->attributes.end(), typeInst->attributes ); + } else { + deleteAll( ret->attributes ); + ret->attributes.clear(); + } // place instance parameters on the typedef'd type if ( ! typeInst->parameters.empty() ) { @@ -901,4 +911,9 @@ Declaration *EliminateTypedef::postmutate( TraitDecl * traitDecl ) { return handleAggregate( traitDecl ); + } + + void EliminateTypedef::premutate( FunctionType * ) { + GuardValue( inFunctionType ); + inFunctionType = true; } Index: src/benchmark/Makefile.am =================================================================== --- src/benchmark/Makefile.am (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/benchmark/Makefile.am (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -94,5 +94,7 @@ ctxswitch-cfa_thread.run \ ctxswitch-upp_coroutine.run \ - ctxswitch-upp_thread.run + ctxswitch-upp_thread.run \ + ctxswitch-goroutine.run \ + ctxswitch-java_thread.run ctxswitch-cfa_coroutine$(EXEEXT): @@ -111,16 +113,30 @@ @@BACKEND_CC@ ctxswitch/pthreads.c -DBENCH_N=50000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} +ctxswitch-goroutine$(EXEEXT): + @go build -o a.out ctxswitch/goroutine.go + +ctxswitch-java_thread$(EXEEXT): + @javac ctxswitch/JavaThread.java + @echo "#!/bin/sh" > a.out + @echo "cd ctxswitch && java JavaThread" >> a.out + @chmod a+x a.out + ## ========================================================================================================= mutex$(EXEEXT) :\ mutex-function.run \ + mutex-fetch_add.run \ mutex-pthread_lock.run \ mutex-upp.run \ mutex-cfa1.run \ mutex-cfa2.run \ - mutex-cfa4.run + mutex-cfa4.run \ + mutex-java_thread.run mutex-function$(EXEEXT): @@BACKEND_CC@ mutex/function.c -DBENCH_N=500000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} +mutex-fetch_add$(EXEEXT): + @@BACKEND_CC@ mutex/fetch_add.c -DBENCH_N=500000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + mutex-pthread_lock$(EXEEXT): @@BACKEND_CC@ mutex/pthreads.c -DBENCH_N=50000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} @@ -137,4 +153,10 @@ mutex-cfa4$(EXEEXT): @${CC} mutex/cfa4.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + +mutex-java_thread$(EXEEXT): + @javac mutex/JavaThread.java + @echo "#!/bin/sh" > a.out + @echo "cd mutex && java JavaThread" >> a.out + @chmod a+x a.out ## ========================================================================================================= @@ -143,5 +165,6 @@ signal-cfa1.run \ signal-cfa2.run \ - signal-cfa4.run + signal-cfa4.run \ + signal-java_thread.run signal-upp$(EXEEXT): @@ -156,4 +179,11 @@ signal-cfa4$(EXEEXT): @${CC} schedint/cfa4.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + +signal-java_thread$(EXEEXT): + @javac schedint/JavaThread.java + @echo "#!/bin/sh" > a.out + @echo "cd schedint && java JavaThread" >> a.out + @chmod a+x a.out + ## ========================================================================================================= @@ -183,5 +213,7 @@ creation-cfa_thread.run \ creation-upp_coroutine.run \ - creation-upp_thread.run + creation-upp_thread.run \ + creation-goroutine.run \ + creation-java_thread.run creation-cfa_coroutine$(EXEEXT): @@ -202,4 +234,13 @@ creation-pthread$(EXEEXT): @@BACKEND_CC@ creation/pthreads.c -DBENCH_N=250000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + +creation-goroutine$(EXEEXT): + @go build -o a.out creation/goroutine.go + +creation-java_thread$(EXEEXT): + @javac creation/JavaThread.java + @echo "#!/bin/sh" > a.out + @echo "cd creation && java JavaThread" >> a.out + @chmod a+x a.out ## ========================================================================================================= Index: src/benchmark/Makefile.in =================================================================== --- src/benchmark/Makefile.in (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/benchmark/Makefile.in (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -507,5 +507,7 @@ ctxswitch-cfa_thread.run \ ctxswitch-upp_coroutine.run \ - ctxswitch-upp_thread.run + ctxswitch-upp_thread.run \ + ctxswitch-goroutine.run \ + ctxswitch-java_thread.run ctxswitch-cfa_coroutine$(EXEEXT): @@ -524,15 +526,29 @@ @@BACKEND_CC@ ctxswitch/pthreads.c -DBENCH_N=50000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} +ctxswitch-goroutine$(EXEEXT): + @go build -o a.out ctxswitch/goroutine.go + +ctxswitch-java_thread$(EXEEXT): + @javac ctxswitch/JavaThread.java + @echo "#!/bin/sh" > a.out + @echo "cd ctxswitch && java JavaThread" >> a.out + @chmod a+x a.out + mutex$(EXEEXT) :\ mutex-function.run \ + mutex-fetch_add.run \ mutex-pthread_lock.run \ mutex-upp.run \ mutex-cfa1.run \ mutex-cfa2.run \ - mutex-cfa4.run + mutex-cfa4.run \ + mutex-java_thread.run mutex-function$(EXEEXT): @@BACKEND_CC@ mutex/function.c -DBENCH_N=500000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} +mutex-fetch_add$(EXEEXT): + @@BACKEND_CC@ mutex/fetch_add.c -DBENCH_N=500000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + mutex-pthread_lock$(EXEEXT): @@BACKEND_CC@ mutex/pthreads.c -DBENCH_N=50000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} @@ -549,4 +565,10 @@ mutex-cfa4$(EXEEXT): @${CC} mutex/cfa4.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + +mutex-java_thread$(EXEEXT): + @javac mutex/JavaThread.java + @echo "#!/bin/sh" > a.out + @echo "cd mutex && java JavaThread" >> a.out + @chmod a+x a.out signal$(EXEEXT) :\ @@ -567,4 +589,10 @@ signal-cfa4$(EXEEXT): @${CC} schedint/cfa4.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + +signal-java_thread$(EXEEXT): + @javac schedint/JavaThread.java + @echo "#!/bin/sh" > a.out + @echo "cd schedint && java JavaThread" >> a.out + @chmod a+x a.out waitfor$(EXEEXT) :\ @@ -592,5 +620,7 @@ creation-cfa_thread.run \ creation-upp_coroutine.run \ - creation-upp_thread.run + creation-upp_thread.run \ + creation-goroutine.run \ + creation-java_thread.run creation-cfa_coroutine$(EXEEXT): @@ -611,4 +641,13 @@ creation-pthread$(EXEEXT): @@BACKEND_CC@ creation/pthreads.c -DBENCH_N=250000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + +creation-goroutine$(EXEEXT): + @go build -o a.out creation/goroutine.go + +creation-java_thread$(EXEEXT): + @javac creation/JavaThread.java + @echo "#!/bin/sh" > a.out + @echo "cd creation && java JavaThread" >> a.out + @chmod a+x a.out compile$(EXEEXT) :\ Index: src/benchmark/bench.h =================================================================== --- src/benchmark/bench.h (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/benchmark/bench.h (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -1,5 +1,5 @@ #pragma once -#if defined(__CFORALL__) +#if defined(__cforall) extern "C" { #endif @@ -8,5 +8,5 @@ #include // times #include -#if defined(__CFORALL__) +#if defined(__cforall) } #endif Index: src/benchmark/creation/JavaThread.java =================================================================== --- src/benchmark/creation/JavaThread.java (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) +++ src/benchmark/creation/JavaThread.java (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -0,0 +1,18 @@ +public class JavaThread { + public static class MyThread extends Thread { + @Override + public void run() {} + } + + public static void main(String[] args) throws InterruptedException { + int NoOfTimes = 50000; + long start = System.nanoTime(); + for(int i = 1; i <= NoOfTimes; i += 1) { + JavaThread.MyThread m = new JavaThread.MyThread(); + m.start(); + m.join(); + } + long end = System.nanoTime(); + System.out.println( (end - start) / NoOfTimes); + } +} Index: src/benchmark/creation/goroutine.go =================================================================== --- src/benchmark/creation/goroutine.go (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) +++ src/benchmark/creation/goroutine.go (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -0,0 +1,27 @@ +package main + +import ( + "fmt" + "time" +) + +var shake chan bool = make( chan bool ) + +func noop() { + shake <- true // indicate completion +} + +//======================================= +// benchmark driver +//======================================= + +func main() { + const NoOfTimes = 500000 + start := time.Now() + for i := 1; i <= NoOfTimes; i += 1 { + go noop() // creation + } + end := time.Now() + fmt.Printf("%d\n", end.Sub(start) / time.Duration(NoOfTimes)) + <- shake +} Index: src/benchmark/ctxswitch/JavaThread.java =================================================================== --- src/benchmark/ctxswitch/JavaThread.java (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) +++ src/benchmark/ctxswitch/JavaThread.java (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -0,0 +1,11 @@ +public class JavaThread { + public static void main(String[] args) { + int NoOfTimes = 5000000; + long start = System.nanoTime(); + for(int i = 1; i <= NoOfTimes; i += 1) { + Thread.yield(); + } + long end = System.nanoTime(); + System.out.println( (end - start) / NoOfTimes); + } +} Index: src/benchmark/ctxswitch/goroutine.go =================================================================== --- src/benchmark/ctxswitch/goroutine.go (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) +++ src/benchmark/ctxswitch/goroutine.go (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -0,0 +1,33 @@ +package main + +import ( + "fmt" + "runtime" + "time" +) + +//======================================= +// time context switch +//======================================= + +var shake chan bool = make( chan bool ) + +func ContextSwitch(N int) { + start := time.Now() + for i := 1; i <= N; i += 1 { + runtime.Gosched() + } + end := time.Now() + fmt.Printf("%d\n", end.Sub(start) / time.Duration(N)) + shake <- true // indicate completion +} + +//======================================= +// benchmark driver +//======================================= + +func main() { + const NoOfTimes = 10000000 + go ContextSwitch( NoOfTimes ) // context switch + <- shake +} Index: src/benchmark/mutex/JavaThread.java =================================================================== --- src/benchmark/mutex/JavaThread.java (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) +++ src/benchmark/mutex/JavaThread.java (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -0,0 +1,14 @@ +public class JavaThread { + public synchronized void noop() {} + + public static void main(String[] args) { + int NoOfTimes = 5000000; + JavaThread j = new JavaThread(); + long start = System.nanoTime(); + for(int i = 1; i <= NoOfTimes; i += 1) { + j.noop(); + } + long end = System.nanoTime(); + System.out.println( (end - start) / NoOfTimes); + } +} Index: src/benchmark/mutex/fetch_add.c =================================================================== --- src/benchmark/mutex/fetch_add.c (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) +++ src/benchmark/mutex/fetch_add.c (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -0,0 +1,22 @@ +#include + +#include "bench.h" + +volatile int value; + +void __attribute__((noinline)) do_call() { + __atomic_add_fetch( &value, 1, __ATOMIC_SEQ_CST ); + asm volatile (""); + __atomic_sub_fetch( &value, 1, __ATOMIC_SEQ_CST ); +} + +int main(int argc, char* argv[]) { + BENCH( + for (size_t i = 0; i < n; i++) { + do_call(); + }, + result + ) + + printf("%llu\n", result); +} Index: src/benchmark/schedint/JavaThread.java =================================================================== --- src/benchmark/schedint/JavaThread.java (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) +++ src/benchmark/schedint/JavaThread.java (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -0,0 +1,42 @@ +class Monitor { + public static volatile Boolean go = false; +} + +class Signaller extends Thread { + Monitor m; + Signaller(Monitor m) { + this.m = m; + } + + public void run() { + Monitor.go = true; + while( Monitor.go ) { + synchronized(this.m) { + this.m.notify(); + } + } + } +} + +public class JavaThread { + public static void main(String[] args) throws InterruptedException { + int NoOfTimes = 50000; + Monitor m = new Monitor(); + long start, end; + Signaller s = new Signaller(m); + synchronized(m) { + s.start(); + while( !Monitor.go ) { + Thread.yield(); + } + start = System.nanoTime(); + for(int i = 1; i <= NoOfTimes; i += 1) { + m.wait(); + } + end = System.nanoTime(); + } + Monitor.go = false; + s.join(); + System.out.println( (end - start) / NoOfTimes); + } +} Index: src/libcfa/Makefile.am =================================================================== --- src/libcfa/Makefile.am (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/Makefile.am (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -100,4 +100,5 @@ math \ gmp \ + bits/containers.h \ bits/defs.h \ bits/locks.h \ Index: src/libcfa/Makefile.in =================================================================== --- src/libcfa/Makefile.in (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/Makefile.in (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -264,6 +264,6 @@ containers/result containers/vector concurrency/coroutine \ concurrency/thread concurrency/kernel concurrency/monitor \ - ${shell echo stdhdr/*} math gmp bits/defs.h bits/locks.h \ - concurrency/invoke.h libhdr.h libhdr/libalign.h \ + ${shell echo stdhdr/*} math gmp bits/containers.h bits/defs.h \ + bits/locks.h concurrency/invoke.h libhdr.h libhdr/libalign.h \ libhdr/libdebug.h libhdr/libtools.h HEADERS = $(nobase_cfa_include_HEADERS) @@ -437,4 +437,5 @@ math \ gmp \ + bits/containers.h \ bits/defs.h \ bits/locks.h \ Index: src/libcfa/bits/containers.h =================================================================== --- src/libcfa/bits/containers.h (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/bits/containers.h (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -15,7 +15,52 @@ #pragma once -#include +#include "bits/defs.h" +#include "libhdr.h" -#include "libhdr.h" +//----------------------------------------------------------------------------- +// Array +//----------------------------------------------------------------------------- + +#ifdef __cforall + forall(dtype T) +#else + #define T void +#endif +struct __small_array { + T * data; + __lock_size_t size; +}; +#undef T + +#ifdef __cforall + #define __small_array_t(T) __small_array(T) +#else + #define __small_array_t(T) struct __small_array +#endif + +#ifdef __cforall + // forall(otype T | sized(T)) + // static inline void ?{}(__small_array(T) & this) {} + + forall(dtype T | sized(T)) + static inline T& ?[?]( __small_array(T) & this, __lock_size_t idx) { + return ((typeof(this.data))this.data)[idx]; + } + + forall(dtype T | sized(T)) + static inline T& ?[?]( const __small_array(T) & this, __lock_size_t idx) { + return ((typeof(this.data))this.data)[idx]; + } + + forall(dtype T | sized(T)) + static inline T* begin( const __small_array(T) & this ) { + return ((typeof(this.data))this.data); + } + + forall(dtype T | sized(T)) + static inline T* end( const __small_array(T) & this ) { + return ((typeof(this.data))this.data) + this.size; + } +#endif //----------------------------------------------------------------------------- @@ -23,5 +68,5 @@ //----------------------------------------------------------------------------- -#ifdef __CFORALL__ +#ifdef __cforall trait is_node(dtype T) { T*& get_next( T& ); @@ -32,5 +77,5 @@ // Stack //----------------------------------------------------------------------------- -#ifdef __CFORALL__ +#ifdef __cforall forall(dtype TYPE | is_node(TYPE)) #define T TYPE @@ -41,6 +86,7 @@ T * top; }; +#undef T -#ifdef __CFORALL__ +#ifdef __cforall #define __stack_t(T) __stack(T) #else @@ -48,12 +94,12 @@ #endif -#ifdef __CFORALL__ +#ifdef __cforall forall(dtype T | is_node(T)) - void ?{}( __stack(T) & this ) { - this.top = NULL; + static inline void ?{}( __stack(T) & this ) { + (this.top){ NULL }; } forall(dtype T | is_node(T) | sized(T)) - void push( __stack(T) & this, T * val ) { + static inline void push( __stack(T) & this, T * val ) { verify( !get_next( *val ) ); get_next( *val ) = this.top; @@ -62,5 +108,5 @@ forall(dtype T | is_node(T) | sized(T)) - T * pop( __stack(T) & this ) { + static inline T * pop( __stack(T) & this ) { T * top = this.top; if( top ) { @@ -75,6 +121,6 @@ // Queue //----------------------------------------------------------------------------- -#ifdef __CFORALL__ - forall(dtype T | is_node(T)) +#ifdef __cforall + forall(dtype TYPE | is_node(TYPE)) #define T TYPE #else @@ -85,14 +131,21 @@ T ** tail; }; +#undef T -#ifdef __CFORALL__ +#ifdef __cforall +#define __queue_t(T) __queue(T) +#else +#define __queue_t(T) struct __queue +#endif + +#ifdef __cforall forall(dtype T | is_node(T)) - void ?{}( __queue(T) & this ) { - this.head = NULL; - this.tail = &this.head; + static inline void ?{}( __queue(T) & this ) { + (this.head){ NULL }; + (this.tail){ &this.head }; } forall(dtype T | is_node(T) | sized(T)) - void append( __queue(T) & this, T * val ) { + static inline void append( __queue(T) & this, T * val ) { verify(this.tail != NULL); *this.tail = val; @@ -101,5 +154,5 @@ forall(dtype T | is_node(T) | sized(T)) - T * pop_head( __queue(T) & this ) { + static inline T * pop_head( __queue(T) & this ) { T * head = this.head; if( head ) { @@ -114,5 +167,5 @@ forall(dtype T | is_node(T) | sized(T)) - T * remove( __queue(T) & this, T ** it ) { + static inline T * remove( __queue(T) & this, T ** it ) { T * val = *it; verify( val ); Index: src/libcfa/bits/defs.h =================================================================== --- src/libcfa/bits/defs.h (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/bits/defs.h (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -17,4 +17,5 @@ #include +#include #include @@ -22,2 +23,11 @@ #define likely (x) __builtin_expect(!!(x), 1) #define thread_local _Thread_local + +typedef void (*fptr_t)(); +typedef int_fast16_t __lock_size_t; + +#ifdef __cforall +#define __cfa_anonymous_object +#else +#define __cfa_anonymous_object __cfa_anonymous_object +#endif Index: src/libcfa/bits/locks.h =================================================================== --- src/libcfa/bits/locks.h (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/bits/locks.h (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -56,5 +56,5 @@ } __ALIGN__; -#ifdef __CFORALL__ +#ifdef __cforall extern void yield( unsigned int ); extern thread_local struct thread_desc * volatile this_thread; Index: src/libcfa/concurrency/invoke.h =================================================================== --- src/libcfa/concurrency/invoke.h (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/concurrency/invoke.h (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -14,8 +14,9 @@ // +#include "bits/containers.h" #include "bits/defs.h" #include "bits/locks.h" -#ifdef __CFORALL__ +#ifdef __cforall extern "C" { #endif @@ -25,26 +26,8 @@ #define _INVOKE_H_ - typedef void (*fptr_t)(); - typedef int_fast16_t __lock_size_t; - - struct __thread_queue_t { - struct thread_desc * head; - struct thread_desc ** tail; - }; - - struct __condition_stack_t { - struct __condition_criterion_t * top; - }; - - #ifdef __CFORALL__ + #ifdef __cforall extern "Cforall" { - void ?{}( struct __thread_queue_t & ); - void append( struct __thread_queue_t &, struct thread_desc * ); - struct thread_desc * pop_head( struct __thread_queue_t & ); - struct thread_desc * remove( struct __thread_queue_t &, struct thread_desc ** ); - - void ?{}( struct __condition_stack_t & ); - void push( struct __condition_stack_t &, struct __condition_criterion_t * ); - struct __condition_criterion_t * pop( struct __condition_stack_t & ); + static inline struct thread_desc * & get_next( struct thread_desc & this ); + static inline struct __condition_criterion_t * & get_next( struct __condition_criterion_t & this ); } #endif @@ -100,8 +83,5 @@ // list of acceptable functions, null if any - struct __acceptable_t * clauses; - - // number of acceptable functions - __lock_size_t size; + __small_array_t(struct __acceptable_t) __cfa_anonymous_object; }; @@ -114,8 +94,8 @@ // queue of threads that are blocked waiting for the monitor - struct __thread_queue_t entry_queue; + __queue_t(struct thread_desc) entry_queue; // stack of conditions to run next once we exit the monitor - struct __condition_stack_t signal_stack; + __stack_t(struct __condition_criterion_t) signal_stack; // monitor routines can be called recursively, we need to keep track of that @@ -131,8 +111,5 @@ struct __monitor_group_t { // currently held monitors - struct monitor_desc ** list; - - // number of currently held monitors - __lock_size_t size; + __small_array_t(monitor_desc*) __cfa_anonymous_object; // last function that acquired monitors @@ -159,12 +136,26 @@ }; - #ifdef __CFORALL__ + #ifdef __cforall extern "Cforall" { - static inline monitor_desc * ?[?]( const __monitor_group_t & this, ptrdiff_t index ) { - return this.list[index]; + static inline thread_desc * & get_next( thread_desc & this ) { + return this.next; + } + + static inline struct __condition_criterion_t * & get_next( struct __condition_criterion_t & this ); + + static inline void ?{}(__monitor_group_t & this) { + (this.data){NULL}; + (this.size){0}; + (this.func){NULL}; + } + + static inline void ?{}(__monitor_group_t & this, struct monitor_desc ** data, __lock_size_t size, fptr_t func) { + (this.data){data}; + (this.size){size}; + (this.func){func}; } static inline bool ?==?( const __monitor_group_t & lhs, const __monitor_group_t & rhs ) { - if( (lhs.list != 0) != (rhs.list != 0) ) return false; + if( (lhs.data != 0) != (rhs.data != 0) ) return false; if( lhs.size != rhs.size ) return false; if( lhs.func != rhs.func ) return false; @@ -177,4 +168,10 @@ return true; + } + + static inline void ?=?(__monitor_group_t & lhs, const __monitor_group_t & rhs) { + lhs.data = rhs.data; + lhs.size = rhs.size; + lhs.func = rhs.func; } } @@ -210,5 +207,5 @@ #endif //_INVOKE_PRIVATE_H_ #endif //! defined(__CFA_INVOKE_PRIVATE__) -#ifdef __CFORALL__ +#ifdef __cforall } #endif Index: src/libcfa/concurrency/kernel =================================================================== --- src/libcfa/concurrency/kernel (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/concurrency/kernel (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -26,20 +26,8 @@ //----------------------------------------------------------------------------- // Locks -// // Lock the spinlock, spin if already acquired -// void lock ( spinlock * DEBUG_CTX_PARAM2 ); - -// // Lock the spinlock, yield repeatedly if already acquired -// void lock_yield( spinlock * DEBUG_CTX_PARAM2 ); - -// // Lock the spinlock, return false if already acquired -// bool try_lock ( spinlock * DEBUG_CTX_PARAM2 ); - -// // Unlock the spinlock -// void unlock ( spinlock * ); - struct semaphore { __spinlock_t lock; int count; - __thread_queue_t waiting; + __queue_t(thread_desc) waiting; }; @@ -57,5 +45,5 @@ // Ready queue for threads - __thread_queue_t ready_queue; + __queue_t(thread_desc) ready_queue; // Preemption rate on this cluster Index: src/libcfa/concurrency/kernel.c =================================================================== --- src/libcfa/concurrency/kernel.c (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/concurrency/kernel.c (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -164,5 +164,5 @@ void ?{}(cluster & this) { - ( this.ready_queue ){}; + (this.ready_queue){}; ( this.ready_queue_lock ){}; @@ -611,65 +611,4 @@ } -//----------------------------------------------------------------------------- -// Queues -void ?{}( __thread_queue_t & this ) { - this.head = NULL; - this.tail = &this.head; -} - -void append( __thread_queue_t & this, thread_desc * t ) { - verify(this.tail != NULL); - *this.tail = t; - this.tail = &t->next; -} - -thread_desc * pop_head( __thread_queue_t & this ) { - thread_desc * head = this.head; - if( head ) { - this.head = head->next; - if( !head->next ) { - this.tail = &this.head; - } - head->next = NULL; - } - return head; -} - -thread_desc * remove( __thread_queue_t & this, thread_desc ** it ) { - thread_desc * thrd = *it; - verify( thrd ); - - (*it) = thrd->next; - - if( this.tail == &thrd->next ) { - this.tail = it; - } - - thrd->next = NULL; - - verify( (this.head == NULL) == (&this.head == this.tail) ); - verify( *this.tail == NULL ); - return thrd; -} - -void ?{}( __condition_stack_t & this ) { - this.top = NULL; -} - -void push( __condition_stack_t & this, __condition_criterion_t * t ) { - verify( !t->next ); - t->next = this.top; - this.top = t; -} - -__condition_criterion_t * pop( __condition_stack_t & this ) { - __condition_criterion_t * top = this.top; - if( top ) { - this.top = top->next; - top->next = NULL; - } - return top; -} - // Local Variables: // // mode: c // Index: src/libcfa/concurrency/monitor =================================================================== --- src/libcfa/concurrency/monitor (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/concurrency/monitor (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -34,5 +34,5 @@ this.recursion = 0; this.mask.accepted = NULL; - this.mask.clauses = NULL; + this.mask.data = NULL; this.mask.size = 0; this.dtor_node = NULL; @@ -40,9 +40,7 @@ struct monitor_guard_t { - monitor_desc ** m; - __lock_size_t count; - monitor_desc ** prev_mntrs; - __lock_size_t prev_count; - fptr_t prev_func; + monitor_desc ** m; + __lock_size_t count; + __monitor_group_t prev; }; @@ -51,8 +49,6 @@ struct monitor_dtor_guard_t { - monitor_desc * m; - monitor_desc ** prev_mntrs; - __lock_size_t prev_count; - fptr_t prev_func; + monitor_desc * m; + __monitor_group_t prev; }; @@ -83,4 +79,8 @@ }; +static inline __condition_criterion_t * & get_next( __condition_criterion_t & this ) { + return this.next; +} + struct __condition_node_t { // Thread that needs to be woken when all criteria are met @@ -100,8 +100,7 @@ }; -struct __condition_blocked_queue_t { - __condition_node_t * head; - __condition_node_t ** tail; -}; +static inline __condition_node_t * & get_next( __condition_node_t & this ) { + return this.next; +} void ?{}(__condition_node_t & this, thread_desc * waiting_thread, __lock_size_t count, uintptr_t user_info ); @@ -109,11 +108,7 @@ void ?{}(__condition_criterion_t & this, monitor_desc * target, __condition_node_t * owner ); -void ?{}( __condition_blocked_queue_t & ); -void append( __condition_blocked_queue_t &, __condition_node_t * ); -__condition_node_t * pop_head( __condition_blocked_queue_t & ); - struct condition { // Link list which contains the blocked threads as-well as the information needed to unblock them - __condition_blocked_queue_t blocked; + __queue_t(__condition_node_t) blocked; // Array of monitor pointers (Monitors are NOT contiguous in memory) Index: src/libcfa/concurrency/monitor.c =================================================================== --- src/libcfa/concurrency/monitor.c (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/concurrency/monitor.c (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -280,5 +280,5 @@ static inline void enter( __monitor_group_t monitors ) { for( __lock_size_t i = 0; i < monitors.size; i++) { - __enter_monitor_desc( monitors.list[i], monitors ); + __enter_monitor_desc( monitors[i], monitors ); } } @@ -303,8 +303,8 @@ // Save previous thread context - this.[prev_mntrs, prev_count, prev_func] = this_thread->monitors.[list, size, func]; + this.prev = this_thread->monitors; // Update thread context (needed for conditions) - this_thread->monitors.[list, size, func] = [m, count, func]; + (this_thread->monitors){m, count, func}; // LIB_DEBUG_PRINT_SAFE("MGUARD : enter %d\n", count); @@ -328,5 +328,5 @@ // Restore thread context - this_thread->monitors.[list, size, func] = this.[prev_mntrs, prev_count, prev_func]; + this_thread->monitors = this.prev; } @@ -338,8 +338,8 @@ // Save previous thread context - this.[prev_mntrs, prev_count, prev_func] = this_thread->monitors.[list, size, func]; + this.prev = this_thread->monitors; // Update thread context (needed for conditions) - this_thread->monitors.[list, size, func] = [m, 1, func]; + (this_thread->monitors){m, 1, func}; __enter_monitor_dtor( this.m, func ); @@ -352,5 +352,5 @@ // Restore thread context - this_thread->monitors.[list, size, func] = this.[prev_mntrs, prev_count, prev_func]; + this_thread->monitors = this.prev; } @@ -437,6 +437,6 @@ for(int i = 0; i < this.monitor_count; i++) { - if ( this.monitors[i] != this_thrd->monitors.list[i] ) { - abortf( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors.list[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] ); } } @@ -510,5 +510,5 @@ "Possible cause is not checking if the condition is empty before reading stored data." ); - return this.blocked.head->user_info; + return ((typeof(this.blocked.head))this.blocked.head)->user_info; } @@ -554,9 +554,10 @@ if( next ) { *mask.accepted = index; - if( mask.clauses[index].is_dtor ) { + __acceptable_t& accepted = mask[index]; + if( accepted.is_dtor ) { LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : dtor already there\n"); - verifyf( mask.clauses[index].size == 1 , "ERROR: Accepted dtor has more than 1 mutex parameter." ); - - monitor_desc * mon2dtor = mask.clauses[index].list[0]; + verifyf( accepted.size == 1, "ERROR: Accepted dtor has more than 1 mutex parameter." ); + + monitor_desc * mon2dtor = accepted[0]; verifyf( mon2dtor->dtor_node, "ERROR: Accepted monitor has no dtor_node." ); @@ -596,5 +597,4 @@ LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : accepted %d\n", *mask.accepted); - return; } @@ -671,5 +671,5 @@ static inline void reset_mask( monitor_desc * this ) { this->mask.accepted = NULL; - this->mask.clauses = NULL; + this->mask.data = NULL; this->mask.size = 0; } @@ -697,5 +697,5 @@ static inline bool is_accepted( monitor_desc * this, const __monitor_group_t & group ) { - __acceptable_t * it = this->mask.clauses; // Optim + __acceptable_t * it = this->mask.data; // Optim __lock_size_t count = this->mask.size; @@ -820,10 +820,10 @@ if( !this.monitors ) { // LIB_DEBUG_PRINT_SAFE("Branding\n"); - assertf( thrd->monitors.list != NULL, "No current monitor to brand condition %p", thrd->monitors.list ); + assertf( thrd->monitors.data != NULL, "No current monitor to brand condition %p", thrd->monitors.data ); this.monitor_count = thrd->monitors.size; this.monitors = (monitor_desc **)malloc( this.monitor_count * sizeof( *this.monitors ) ); for( int i = 0; i < this.monitor_count; i++ ) { - this.monitors[i] = thrd->monitors.list[i]; + this.monitors[i] = thrd->monitors[i]; } } @@ -832,5 +832,5 @@ static inline [thread_desc *, int] search_entry_queue( const __waitfor_mask_t & mask, monitor_desc * monitors [], __lock_size_t count ) { - __thread_queue_t & entry_queue = monitors[0]->entry_queue; + __queue_t(thread_desc) & entry_queue = monitors[0]->entry_queue; // For each thread in the entry-queue @@ -841,6 +841,7 @@ // For each acceptable check if it matches int i = 0; - __acceptable_t * end = mask.clauses + mask.size; - for( __acceptable_t * it = mask.clauses; it != end; it++, i++ ) { + __acceptable_t * end = end (mask); + __acceptable_t * begin = begin(mask); + for( __acceptable_t * it = begin; it != end; it++, i++ ) { // Check if we have a match if( *it == (*thrd_it)->monitors ) { @@ -872,5 +873,6 @@ __lock_size_t max = 0; for( __lock_size_t i = 0; i < mask.size; i++ ) { - max += mask.clauses[i].size; + __acceptable_t & accepted = mask[i]; + max += accepted.size; } return max; @@ -880,7 +882,8 @@ __lock_size_t size = 0; for( __lock_size_t i = 0; i < mask.size; i++ ) { - __libcfa_small_sort( mask.clauses[i].list, mask.clauses[i].size ); - for( __lock_size_t j = 0; j < mask.clauses[i].size; j++) { - insert_unique( storage, size, mask.clauses[i].list[j] ); + __acceptable_t & accepted = mask[i]; + __libcfa_small_sort( accepted.data, accepted.size ); + for( __lock_size_t j = 0; j < accepted.size; j++) { + insert_unique( storage, size, accepted[j] ); } } @@ -888,27 +891,4 @@ __libcfa_small_sort( storage, size ); return size; -} - -void ?{}( __condition_blocked_queue_t & this ) { - this.head = NULL; - this.tail = &this.head; -} - -void append( __condition_blocked_queue_t & this, __condition_node_t * c ) { - verify(this.tail != NULL); - *this.tail = c; - this.tail = &c->next; -} - -__condition_node_t * pop_head( __condition_blocked_queue_t & this ) { - __condition_node_t * head = this.head; - if( head ) { - this.head = head->next; - if( !head->next ) { - this.tail = &this.head; - } - head->next = NULL; - } - return head; } Index: src/libcfa/exception.h =================================================================== --- src/libcfa/exception.h (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/exception.h (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -17,5 +17,5 @@ -#ifdef __CFORALL__ +#ifdef __cforall extern "C" { #endif @@ -68,5 +68,5 @@ struct __cfaehm__cleanup_hook {}; -#ifdef __CFORALL__ +#ifdef __cforall } #endif Index: src/libcfa/stdhdr/assert.h =================================================================== --- src/libcfa/stdhdr/assert.h (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/stdhdr/assert.h (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -4,7 +4,7 @@ // The contents of this file are covered under the licence agreement in the // file "LICENCE" distributed with Cforall. -// -// assert.h -- -// +// +// assert.h -- +// // Author : Peter A. Buhr // Created On : Mon Jul 4 23:25:26 2016 @@ -12,9 +12,9 @@ // Last Modified On : Mon Jul 31 23:09:32 2017 // Update Count : 13 -// +// -#ifdef __CFORALL__ +#ifdef __cforall extern "C" { -#endif //__CFORALL__ +#endif //__cforall #include_next @@ -30,7 +30,7 @@ #endif -#ifdef __CFORALL__ +#ifdef __cforall } // extern "C" -#endif //__CFORALL__ +#endif //__cforall // Local Variables: // Index: src/libcfa/virtual.h =================================================================== --- src/libcfa/virtual.h (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/libcfa/virtual.h (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -16,5 +16,5 @@ #pragma once -#ifdef __CFORALL__ +#ifdef __cforall extern "C" { #endif @@ -35,5 +35,5 @@ struct __cfa__parent_vtable const * const * child ); -#ifdef __CFORALL__ +#ifdef __cforall } #endif Index: src/tests/.expect/32/functions.txt =================================================================== --- src/tests/.expect/32/functions.txt (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) +++ src/tests/.expect/32/functions.txt (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -0,0 +1,249 @@ +void __h__F___1(void){ +} +signed int __f__Fi_PFi__PFi_i_PFi__PFi_i_PF____1(signed int (*__anonymous_object0)(void), signed int (*__anonymous_object1)(signed int __anonymous_object2), signed int (*__anonymous_object3)(void), signed int (*__anonymous_object4)(signed int __anonymous_object5), void (*__g__PF___1)(void)){ + __attribute__ ((unused)) signed int ___retval_f__i_1; + ((void)(*__g__PF___1)()); + ((void)__g__PF___1()); + ((void)(__g__PF___1=__h__F___1)); +} +signed int __f1__Fi___1(){ + __attribute__ ((unused)) signed int ___retval_f1__i_1; +} +signed int __f2__Fi___1(){ + __attribute__ ((unused)) signed int ___retval_f2__i_1; +} +signed int (*__f3__FPFi_____1())(){ + __attribute__ ((unused)) signed int (*___retval_f3__PFi___1)(); +} +signed int *__f4__FPi___1(){ + __attribute__ ((unused)) signed int *___retval_f4__Pi_1; +} +signed int (*__f5__FPFi_____1())(){ + __attribute__ ((unused)) signed int (*___retval_f5__PFi___1)(); +} +signed int *__f6__FPi___1(){ + __attribute__ ((unused)) signed int *___retval_f6__Pi_1; +} +signed int *__f7__FPi___1(){ + __attribute__ ((unused)) signed int *___retval_f7__Pi_1; +} +signed int **__f8__FPPi___1(){ + __attribute__ ((unused)) signed int **___retval_f8__PPi_1; +} +signed int *const *__f9__FPCPi___1(){ + __attribute__ ((unused)) signed int *const *___retval_f9__PCPi_1; +} +signed int (*__f10__FPA0i___1())[]{ + __attribute__ ((unused)) signed int (*___retval_f10__PA0i_1)[]; +} +signed int (*__f11__FPA0A0i___1())[][((unsigned int )3)]{ + __attribute__ ((unused)) signed int (*___retval_f11__PA0A0i_1)[][((unsigned int )3)]; +} +signed int (*__f12__FPA0A0i___1())[][((unsigned int )3)]{ + __attribute__ ((unused)) signed int (*___retval_f12__PA0A0i_1)[][((unsigned int )3)]; +} +signed int __fII1__Fi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) signed int ___retval_fII1__i_1; +} +const signed int __fII2__FCi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) const signed int ___retval_fII2__Ci_1; +} +extern signed int __fII3__Fi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) signed int ___retval_fII3__i_1; +} +extern const signed int __fII4__FCi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) const signed int ___retval_fII4__Ci_1; +} +signed int *__fII5__FPi___1(){ + __attribute__ ((unused)) signed int *___retval_fII5__Pi_1; +} +signed int *const __fII6__FCPi___1(){ + __attribute__ ((unused)) signed int *const ___retval_fII6__CPi_1; +} +const signed long int *__fII7__FPCl___1(){ + __attribute__ ((unused)) const signed long int *___retval_fII7__PCl_1; +} +static const signed long int *__fII8__FPCl___1(){ + __attribute__ ((unused)) const signed long int *___retval_fII8__PCl_1; +} +static const signed long int *__fII9__FPCl___1(){ + __attribute__ ((unused)) const signed long int *___retval_fII9__PCl_1; +} +signed int __fO1__Fi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) signed int ___retval_fO1__i_1; +} +signed int __fO2__Fi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) signed int ___retval_fO2__i_1; +} +const signed int __fO3__FCi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) const signed int ___retval_fO3__Ci_1; +} +extern signed int __fO4__Fi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) signed int ___retval_fO4__i_1; +} +extern const signed int __fO5__FCi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) const signed int ___retval_fO5__Ci_1; +} +signed int __f__Fi___1(void); +signed int __f__Fi_i__1(signed int __anonymous_object6); +signed int __f__Fi___1(void){ + __attribute__ ((unused)) signed int ___retval_f__i_1; +} +signed int __f__Fi_i__1(signed int __anonymous_object7){ + __attribute__ ((unused)) signed int ___retval_f__i_1; +} +signed int __f__Fi___1(void); +struct _tuple2_ { +}; +static inline void _layoutof__tuple2_(unsigned long int *_sizeof__tuple2_, unsigned long int *_alignof__tuple2_, unsigned long int *_offsetof__tuple2_, unsigned long int _sizeof_16ttuple_param_2_0, unsigned long int _alignof_16ttuple_param_2_0, unsigned long int _sizeof_16ttuple_param_2_1, unsigned long int _alignof_16ttuple_param_2_1){ + ((void)((*_sizeof__tuple2_)=0)); + ((void)((*_alignof__tuple2_)=1)); + ((void)(_offsetof__tuple2_[0]=(*_sizeof__tuple2_))); + ((void)((*_sizeof__tuple2_)+=_sizeof_16ttuple_param_2_0)); + if ( ((*_alignof__tuple2_)<_alignof_16ttuple_param_2_0) ) ((void)((*_alignof__tuple2_)=_alignof_16ttuple_param_2_0)); + + if ( ((*_sizeof__tuple2_)&(_alignof_16ttuple_param_2_1-1)) ) ((void)((*_sizeof__tuple2_)+=(_alignof_16ttuple_param_2_1-((*_sizeof__tuple2_)&(_alignof_16ttuple_param_2_1-1))))); + + ((void)(_offsetof__tuple2_[1]=(*_sizeof__tuple2_))); + ((void)((*_sizeof__tuple2_)+=_sizeof_16ttuple_param_2_1)); + if ( ((*_alignof__tuple2_)<_alignof_16ttuple_param_2_1) ) ((void)((*_alignof__tuple2_)=_alignof_16ttuple_param_2_1)); + + if ( ((*_sizeof__tuple2_)&((*_alignof__tuple2_)-1)) ) ((void)((*_sizeof__tuple2_)+=((*_alignof__tuple2_)-((*_sizeof__tuple2_)&((*_alignof__tuple2_)-1))))); + +} +struct _conc__tuple2_0 { + signed int field_0; + signed int field_1; +}; +struct _conc__tuple2_0 __f__FTii____1(void); +struct _conc__tuple2_0 __f__FTii__ii__1(signed int __anonymous_object8, signed int __x__i_1); +struct _conc__tuple2_0 __f__FTii____1(void){ + __attribute__ ((unused)) struct _conc__tuple2_0 ___retval_f__Tii__1 = { }; +} +struct _conc__tuple2_0 __f__FTii__ii__1(signed int __anonymous_object9, signed int __x__i_1){ + __attribute__ ((unused)) struct _conc__tuple2_0 ___retval_f__Tii__1 = { }; +} +struct _tuple3_ { +}; +static inline void _layoutof__tuple3_(unsigned long int *_sizeof__tuple3_, unsigned long int *_alignof__tuple3_, unsigned long int *_offsetof__tuple3_, unsigned long int _sizeof_16ttuple_param_3_0, unsigned long int _alignof_16ttuple_param_3_0, unsigned long int _sizeof_16ttuple_param_3_1, unsigned long int _alignof_16ttuple_param_3_1, unsigned long int _sizeof_16ttuple_param_3_2, unsigned long int _alignof_16ttuple_param_3_2){ + ((void)((*_sizeof__tuple3_)=0)); + ((void)((*_alignof__tuple3_)=1)); + ((void)(_offsetof__tuple3_[0]=(*_sizeof__tuple3_))); + ((void)((*_sizeof__tuple3_)+=_sizeof_16ttuple_param_3_0)); + if ( ((*_alignof__tuple3_)<_alignof_16ttuple_param_3_0) ) ((void)((*_alignof__tuple3_)=_alignof_16ttuple_param_3_0)); + + if ( ((*_sizeof__tuple3_)&(_alignof_16ttuple_param_3_1-1)) ) ((void)((*_sizeof__tuple3_)+=(_alignof_16ttuple_param_3_1-((*_sizeof__tuple3_)&(_alignof_16ttuple_param_3_1-1))))); + + ((void)(_offsetof__tuple3_[1]=(*_sizeof__tuple3_))); + ((void)((*_sizeof__tuple3_)+=_sizeof_16ttuple_param_3_1)); + if ( ((*_alignof__tuple3_)<_alignof_16ttuple_param_3_1) ) ((void)((*_alignof__tuple3_)=_alignof_16ttuple_param_3_1)); + + if ( ((*_sizeof__tuple3_)&(_alignof_16ttuple_param_3_2-1)) ) ((void)((*_sizeof__tuple3_)+=(_alignof_16ttuple_param_3_2-((*_sizeof__tuple3_)&(_alignof_16ttuple_param_3_2-1))))); + + ((void)(_offsetof__tuple3_[2]=(*_sizeof__tuple3_))); + ((void)((*_sizeof__tuple3_)+=_sizeof_16ttuple_param_3_2)); + if ( ((*_alignof__tuple3_)<_alignof_16ttuple_param_3_2) ) ((void)((*_alignof__tuple3_)=_alignof_16ttuple_param_3_2)); + + if ( ((*_sizeof__tuple3_)&((*_alignof__tuple3_)-1)) ) ((void)((*_sizeof__tuple3_)+=((*_alignof__tuple3_)-((*_sizeof__tuple3_)&((*_alignof__tuple3_)-1))))); + +} +struct _conc__tuple3_1 { + signed int field_0; + signed int field_1; + signed int field_2; +}; +struct _conc__tuple3_1 __f__FTiii____1(void); +struct _conc__tuple3_1 __f__FTiii__iii__1(signed int __anonymous_object10, signed int __x__i_1, signed int __anonymous_object11); +struct _conc__tuple3_1 __f__FTiii____1(void){ + __attribute__ ((unused)) struct _conc__tuple3_1 ___retval_f__Tiii__1 = { }; +} +struct _conc__tuple3_1 __f__FTiii__iii__1(signed int __anonymous_object12, signed int __x__i_1, signed int __anonymous_object13){ + __attribute__ ((unused)) struct _conc__tuple3_1 ___retval_f__Tiii__1 = { }; +} +struct _conc__tuple3_2 { + signed int field_0; + signed int field_1; + signed int *field_2; +}; +struct _conc__tuple3_2 __f__FTiiPi____1(void); +struct _conc__tuple3_2 __f__FTiiPi__iiPi__1(signed int __anonymous_object14, signed int __x__i_1, signed int *__y__Pi_1); +struct _conc__tuple3_2 __f__FTiiPi____1(void){ + __attribute__ ((unused)) struct _conc__tuple3_2 ___retval_f__TiiPi__1 = { }; +} +struct _conc__tuple3_2 __f__FTiiPi__iiPi__1(signed int __anonymous_object15, signed int __x__i_1, signed int *__y__Pi_1){ + __attribute__ ((unused)) struct _conc__tuple3_2 ___retval_f__TiiPi__1 = { }; +} +signed int __f11__Fi_i__1(signed int __anonymous_object16); +signed int __f12__Fi___1(void); +const double __bar1__FCd___1(); +const double __bar2__FCd_i__1(signed int __anonymous_object17); +const double __bar3__FCd_d__1(double __anonymous_object18); +const double __foo__FCd___1(void); +const double __foo__FCd_i__1(signed int __anonymous_object19); +const double __foo__FCd_d__1(double __anonymous_object20){ + __attribute__ ((unused)) const double ___retval_foo__Cd_1; + ((void)((*((double *)(&___retval_foo__Cd_1)))=3.0) /* ?{} */); + return ___retval_foo__Cd_1; +} +struct S { + signed int __i__i_1; +}; +static inline void ___constructor__F_R2sS_autogen___1(struct S *___dst__R2sS_1); +static inline void ___constructor__F_R2sS2sS_autogen___1(struct S *___dst__R2sS_1, struct S ___src__2sS_1); +static inline void ___destructor__F_R2sS_autogen___1(struct S *___dst__R2sS_1); +static inline struct S ___operator_assign__F2sS_R2sS2sS_autogen___1(struct S *___dst__R2sS_1, struct S ___src__2sS_1); +static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, signed int __i__i_1); +static inline void ___constructor__F_R2sS_autogen___1(struct S *___dst__R2sS_1){ + ((void)((*___dst__R2sS_1).__i__i_1) /* ?{} */); +} +static inline void ___constructor__F_R2sS2sS_autogen___1(struct S *___dst__R2sS_1, struct S ___src__2sS_1){ + ((void)((*___dst__R2sS_1).__i__i_1=___src__2sS_1.__i__i_1) /* ?{} */); +} +static inline void ___destructor__F_R2sS_autogen___1(struct S *___dst__R2sS_1){ + ((void)((*___dst__R2sS_1).__i__i_1) /* ^?{} */); +} +static inline struct S ___operator_assign__F2sS_R2sS2sS_autogen___1(struct S *___dst__R2sS_1, struct S ___src__2sS_1){ + struct S ___ret__2sS_1; + ((void)((*___dst__R2sS_1).__i__i_1=___src__2sS_1.__i__i_1)); + ((void)___constructor__F_R2sS2sS_autogen___1((&___ret__2sS_1), (*___dst__R2sS_1))); + return ___ret__2sS_1; +} +static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, signed int __i__i_1){ + ((void)((*___dst__R2sS_1).__i__i_1=__i__i_1) /* ?{} */); +} +struct S __rtn__F2sS_i__1(signed int __anonymous_object21){ + __attribute__ ((unused)) struct S ___retval_rtn__2sS_1; +} +signed int __f__Fi_PFi_ii_PFi_i___1(signed int (*__anonymous_object22)(signed int __anonymous_object23, signed int __p__i_1), signed int (*__anonymous_object24)(signed int __anonymous_object25)){ + __attribute__ ((unused)) signed int ___retval_f__i_1; + signed int (*(*__pc__PA0A0PA0A0i_2)[][((unsigned int )10)])[][((unsigned int )3)]; + signed int (*(*__p__PA0A0PA0A0i_2)[][((unsigned int )10)])[][((unsigned int )3)]; + signed int (*(*__p__PA0PFi_i__2)[])(signed int __anonymous_object26); +} +static const signed int *__f1__FPCi___1(){ + __attribute__ ((unused)) const signed int *___retval_f1__PCi_1; +} +static const signed int __f2__FCi___1(void){ + __attribute__ ((unused)) const signed int ___retval_f2__Ci_1; +} +static inline signed int *const __f3__FCPi___1(void){ + __attribute__ ((unused)) signed int *const ___retval_f3__CPi_1; +} +struct _conc__tuple2_3 { + signed int *field_0; + signed int field_1; +}; +static inline const struct _conc__tuple2_3 __f4__FCTPii____1(void){ + __attribute__ ((unused)) const struct _conc__tuple2_3 ___retval_f4__CTPii__1; +} +static const struct _conc__tuple2_3 __f5__FCTPiCi____1(void){ + __attribute__ ((unused)) const struct _conc__tuple2_3 ___retval_f5__CTPiCi__1; +} +signed int __f__Fi_PFi__PFPi__PFPPi__PFPCPi__PFCPCPi__PiPiPPiPPiPPPiPPPiPPCPiPPCPiPCPCPiPCPCPi__1(signed int (*__anonymous_object27)(), signed int *(*__anonymous_object28)(), signed int **(*__anonymous_object29)(), signed int *const *(*__anonymous_object30)(), signed int *const *const (*__anonymous_object31)(), signed int *__anonymous_object32, signed int __anonymous_object33[((unsigned int )10)], signed int **__anonymous_object34, signed int *__anonymous_object35[((unsigned int )10)], signed int ***__anonymous_object36, signed int **__anonymous_object37[((unsigned int )10)], signed int *const **__anonymous_object38, signed int *const *__anonymous_object39[((unsigned int )10)], signed int *const *const *__anonymous_object40, signed int *const *const __anonymous_object41[((unsigned int )10)]); +signed int __f__Fi_PFi__PFPi__PFPPi__PFPCPi__PFCPCPi__PiPiPPiPPiPPPiPPPiPPCPiPPCPiPCPCPiPCPCPi__1(signed int (*__anonymous_object42)(), signed int *(*__anonymous_object43)(), signed int **(*__anonymous_object44)(), signed int *const *(*__anonymous_object45)(), signed int *const *const (*__anonymous_object46)(), signed int *__anonymous_object47, signed int __anonymous_object48[((unsigned int )10)], signed int **__anonymous_object49, signed int *__anonymous_object50[((unsigned int )10)], signed int ***__anonymous_object51, signed int **__anonymous_object52[((unsigned int )10)], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[((unsigned int )10)], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[((unsigned int )10)]){ + __attribute__ ((unused)) signed int ___retval_f__i_1; +} +signed int __f__Fi_Pii__1(signed int *__f__Pi_1, signed int __t__i_1){ + __attribute__ ((unused)) signed int ___retval_f__i_1; + signed int __T__i_2; +} Index: src/tests/.expect/64/functions.txt =================================================================== --- src/tests/.expect/64/functions.txt (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) +++ src/tests/.expect/64/functions.txt (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -0,0 +1,249 @@ +void __h__F___1(void){ +} +signed int __f__Fi_PFi__PFi_i_PFi__PFi_i_PF____1(signed int (*__anonymous_object0)(void), signed int (*__anonymous_object1)(signed int __anonymous_object2), signed int (*__anonymous_object3)(void), signed int (*__anonymous_object4)(signed int __anonymous_object5), void (*__g__PF___1)(void)){ + __attribute__ ((unused)) signed int ___retval_f__i_1; + ((void)(*__g__PF___1)()); + ((void)__g__PF___1()); + ((void)(__g__PF___1=__h__F___1)); +} +signed int __f1__Fi___1(){ + __attribute__ ((unused)) signed int ___retval_f1__i_1; +} +signed int __f2__Fi___1(){ + __attribute__ ((unused)) signed int ___retval_f2__i_1; +} +signed int (*__f3__FPFi_____1())(){ + __attribute__ ((unused)) signed int (*___retval_f3__PFi___1)(); +} +signed int *__f4__FPi___1(){ + __attribute__ ((unused)) signed int *___retval_f4__Pi_1; +} +signed int (*__f5__FPFi_____1())(){ + __attribute__ ((unused)) signed int (*___retval_f5__PFi___1)(); +} +signed int *__f6__FPi___1(){ + __attribute__ ((unused)) signed int *___retval_f6__Pi_1; +} +signed int *__f7__FPi___1(){ + __attribute__ ((unused)) signed int *___retval_f7__Pi_1; +} +signed int **__f8__FPPi___1(){ + __attribute__ ((unused)) signed int **___retval_f8__PPi_1; +} +signed int *const *__f9__FPCPi___1(){ + __attribute__ ((unused)) signed int *const *___retval_f9__PCPi_1; +} +signed int (*__f10__FPA0i___1())[]{ + __attribute__ ((unused)) signed int (*___retval_f10__PA0i_1)[]; +} +signed int (*__f11__FPA0A0i___1())[][((unsigned long int )3)]{ + __attribute__ ((unused)) signed int (*___retval_f11__PA0A0i_1)[][((unsigned long int )3)]; +} +signed int (*__f12__FPA0A0i___1())[][((unsigned long int )3)]{ + __attribute__ ((unused)) signed int (*___retval_f12__PA0A0i_1)[][((unsigned long int )3)]; +} +signed int __fII1__Fi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) signed int ___retval_fII1__i_1; +} +const signed int __fII2__FCi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) const signed int ___retval_fII2__Ci_1; +} +extern signed int __fII3__Fi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) signed int ___retval_fII3__i_1; +} +extern const signed int __fII4__FCi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) const signed int ___retval_fII4__Ci_1; +} +signed int *__fII5__FPi___1(){ + __attribute__ ((unused)) signed int *___retval_fII5__Pi_1; +} +signed int *const __fII6__FCPi___1(){ + __attribute__ ((unused)) signed int *const ___retval_fII6__CPi_1; +} +const signed long int *__fII7__FPCl___1(){ + __attribute__ ((unused)) const signed long int *___retval_fII7__PCl_1; +} +static const signed long int *__fII8__FPCl___1(){ + __attribute__ ((unused)) const signed long int *___retval_fII8__PCl_1; +} +static const signed long int *__fII9__FPCl___1(){ + __attribute__ ((unused)) const signed long int *___retval_fII9__PCl_1; +} +signed int __fO1__Fi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) signed int ___retval_fO1__i_1; +} +signed int __fO2__Fi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) signed int ___retval_fO2__i_1; +} +const signed int __fO3__FCi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) const signed int ___retval_fO3__Ci_1; +} +extern signed int __fO4__Fi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) signed int ___retval_fO4__i_1; +} +extern const signed int __fO5__FCi_i__1(signed int __i__i_1){ + __attribute__ ((unused)) const signed int ___retval_fO5__Ci_1; +} +signed int __f__Fi___1(void); +signed int __f__Fi_i__1(signed int __anonymous_object6); +signed int __f__Fi___1(void){ + __attribute__ ((unused)) signed int ___retval_f__i_1; +} +signed int __f__Fi_i__1(signed int __anonymous_object7){ + __attribute__ ((unused)) signed int ___retval_f__i_1; +} +signed int __f__Fi___1(void); +struct _tuple2_ { +}; +static inline void _layoutof__tuple2_(unsigned long int *_sizeof__tuple2_, unsigned long int *_alignof__tuple2_, unsigned long int *_offsetof__tuple2_, unsigned long int _sizeof_16ttuple_param_2_0, unsigned long int _alignof_16ttuple_param_2_0, unsigned long int _sizeof_16ttuple_param_2_1, unsigned long int _alignof_16ttuple_param_2_1){ + ((void)((*_sizeof__tuple2_)=0)); + ((void)((*_alignof__tuple2_)=1)); + ((void)(_offsetof__tuple2_[0]=(*_sizeof__tuple2_))); + ((void)((*_sizeof__tuple2_)+=_sizeof_16ttuple_param_2_0)); + if ( ((*_alignof__tuple2_)<_alignof_16ttuple_param_2_0) ) ((void)((*_alignof__tuple2_)=_alignof_16ttuple_param_2_0)); + + if ( ((*_sizeof__tuple2_)&(_alignof_16ttuple_param_2_1-1)) ) ((void)((*_sizeof__tuple2_)+=(_alignof_16ttuple_param_2_1-((*_sizeof__tuple2_)&(_alignof_16ttuple_param_2_1-1))))); + + ((void)(_offsetof__tuple2_[1]=(*_sizeof__tuple2_))); + ((void)((*_sizeof__tuple2_)+=_sizeof_16ttuple_param_2_1)); + if ( ((*_alignof__tuple2_)<_alignof_16ttuple_param_2_1) ) ((void)((*_alignof__tuple2_)=_alignof_16ttuple_param_2_1)); + + if ( ((*_sizeof__tuple2_)&((*_alignof__tuple2_)-1)) ) ((void)((*_sizeof__tuple2_)+=((*_alignof__tuple2_)-((*_sizeof__tuple2_)&((*_alignof__tuple2_)-1))))); + +} +struct _conc__tuple2_0 { + signed int field_0; + signed int field_1; +}; +struct _conc__tuple2_0 __f__FTii____1(void); +struct _conc__tuple2_0 __f__FTii__ii__1(signed int __anonymous_object8, signed int __x__i_1); +struct _conc__tuple2_0 __f__FTii____1(void){ + __attribute__ ((unused)) struct _conc__tuple2_0 ___retval_f__Tii__1 = { }; +} +struct _conc__tuple2_0 __f__FTii__ii__1(signed int __anonymous_object9, signed int __x__i_1){ + __attribute__ ((unused)) struct _conc__tuple2_0 ___retval_f__Tii__1 = { }; +} +struct _tuple3_ { +}; +static inline void _layoutof__tuple3_(unsigned long int *_sizeof__tuple3_, unsigned long int *_alignof__tuple3_, unsigned long int *_offsetof__tuple3_, unsigned long int _sizeof_16ttuple_param_3_0, unsigned long int _alignof_16ttuple_param_3_0, unsigned long int _sizeof_16ttuple_param_3_1, unsigned long int _alignof_16ttuple_param_3_1, unsigned long int _sizeof_16ttuple_param_3_2, unsigned long int _alignof_16ttuple_param_3_2){ + ((void)((*_sizeof__tuple3_)=0)); + ((void)((*_alignof__tuple3_)=1)); + ((void)(_offsetof__tuple3_[0]=(*_sizeof__tuple3_))); + ((void)((*_sizeof__tuple3_)+=_sizeof_16ttuple_param_3_0)); + if ( ((*_alignof__tuple3_)<_alignof_16ttuple_param_3_0) ) ((void)((*_alignof__tuple3_)=_alignof_16ttuple_param_3_0)); + + if ( ((*_sizeof__tuple3_)&(_alignof_16ttuple_param_3_1-1)) ) ((void)((*_sizeof__tuple3_)+=(_alignof_16ttuple_param_3_1-((*_sizeof__tuple3_)&(_alignof_16ttuple_param_3_1-1))))); + + ((void)(_offsetof__tuple3_[1]=(*_sizeof__tuple3_))); + ((void)((*_sizeof__tuple3_)+=_sizeof_16ttuple_param_3_1)); + if ( ((*_alignof__tuple3_)<_alignof_16ttuple_param_3_1) ) ((void)((*_alignof__tuple3_)=_alignof_16ttuple_param_3_1)); + + if ( ((*_sizeof__tuple3_)&(_alignof_16ttuple_param_3_2-1)) ) ((void)((*_sizeof__tuple3_)+=(_alignof_16ttuple_param_3_2-((*_sizeof__tuple3_)&(_alignof_16ttuple_param_3_2-1))))); + + ((void)(_offsetof__tuple3_[2]=(*_sizeof__tuple3_))); + ((void)((*_sizeof__tuple3_)+=_sizeof_16ttuple_param_3_2)); + if ( ((*_alignof__tuple3_)<_alignof_16ttuple_param_3_2) ) ((void)((*_alignof__tuple3_)=_alignof_16ttuple_param_3_2)); + + if ( ((*_sizeof__tuple3_)&((*_alignof__tuple3_)-1)) ) ((void)((*_sizeof__tuple3_)+=((*_alignof__tuple3_)-((*_sizeof__tuple3_)&((*_alignof__tuple3_)-1))))); + +} +struct _conc__tuple3_1 { + signed int field_0; + signed int field_1; + signed int field_2; +}; +struct _conc__tuple3_1 __f__FTiii____1(void); +struct _conc__tuple3_1 __f__FTiii__iii__1(signed int __anonymous_object10, signed int __x__i_1, signed int __anonymous_object11); +struct _conc__tuple3_1 __f__FTiii____1(void){ + __attribute__ ((unused)) struct _conc__tuple3_1 ___retval_f__Tiii__1 = { }; +} +struct _conc__tuple3_1 __f__FTiii__iii__1(signed int __anonymous_object12, signed int __x__i_1, signed int __anonymous_object13){ + __attribute__ ((unused)) struct _conc__tuple3_1 ___retval_f__Tiii__1 = { }; +} +struct _conc__tuple3_2 { + signed int field_0; + signed int field_1; + signed int *field_2; +}; +struct _conc__tuple3_2 __f__FTiiPi____1(void); +struct _conc__tuple3_2 __f__FTiiPi__iiPi__1(signed int __anonymous_object14, signed int __x__i_1, signed int *__y__Pi_1); +struct _conc__tuple3_2 __f__FTiiPi____1(void){ + __attribute__ ((unused)) struct _conc__tuple3_2 ___retval_f__TiiPi__1 = { }; +} +struct _conc__tuple3_2 __f__FTiiPi__iiPi__1(signed int __anonymous_object15, signed int __x__i_1, signed int *__y__Pi_1){ + __attribute__ ((unused)) struct _conc__tuple3_2 ___retval_f__TiiPi__1 = { }; +} +signed int __f11__Fi_i__1(signed int __anonymous_object16); +signed int __f12__Fi___1(void); +const double __bar1__FCd___1(); +const double __bar2__FCd_i__1(signed int __anonymous_object17); +const double __bar3__FCd_d__1(double __anonymous_object18); +const double __foo__FCd___1(void); +const double __foo__FCd_i__1(signed int __anonymous_object19); +const double __foo__FCd_d__1(double __anonymous_object20){ + __attribute__ ((unused)) const double ___retval_foo__Cd_1; + ((void)((*((double *)(&___retval_foo__Cd_1)))=3.0) /* ?{} */); + return ___retval_foo__Cd_1; +} +struct S { + signed int __i__i_1; +}; +static inline void ___constructor__F_R2sS_autogen___1(struct S *___dst__R2sS_1); +static inline void ___constructor__F_R2sS2sS_autogen___1(struct S *___dst__R2sS_1, struct S ___src__2sS_1); +static inline void ___destructor__F_R2sS_autogen___1(struct S *___dst__R2sS_1); +static inline struct S ___operator_assign__F2sS_R2sS2sS_autogen___1(struct S *___dst__R2sS_1, struct S ___src__2sS_1); +static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, signed int __i__i_1); +static inline void ___constructor__F_R2sS_autogen___1(struct S *___dst__R2sS_1){ + ((void)((*___dst__R2sS_1).__i__i_1) /* ?{} */); +} +static inline void ___constructor__F_R2sS2sS_autogen___1(struct S *___dst__R2sS_1, struct S ___src__2sS_1){ + ((void)((*___dst__R2sS_1).__i__i_1=___src__2sS_1.__i__i_1) /* ?{} */); +} +static inline void ___destructor__F_R2sS_autogen___1(struct S *___dst__R2sS_1){ + ((void)((*___dst__R2sS_1).__i__i_1) /* ^?{} */); +} +static inline struct S ___operator_assign__F2sS_R2sS2sS_autogen___1(struct S *___dst__R2sS_1, struct S ___src__2sS_1){ + struct S ___ret__2sS_1; + ((void)((*___dst__R2sS_1).__i__i_1=___src__2sS_1.__i__i_1)); + ((void)___constructor__F_R2sS2sS_autogen___1((&___ret__2sS_1), (*___dst__R2sS_1))); + return ___ret__2sS_1; +} +static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, signed int __i__i_1){ + ((void)((*___dst__R2sS_1).__i__i_1=__i__i_1) /* ?{} */); +} +struct S __rtn__F2sS_i__1(signed int __anonymous_object21){ + __attribute__ ((unused)) struct S ___retval_rtn__2sS_1; +} +signed int __f__Fi_PFi_ii_PFi_i___1(signed int (*__anonymous_object22)(signed int __anonymous_object23, signed int __p__i_1), signed int (*__anonymous_object24)(signed int __anonymous_object25)){ + __attribute__ ((unused)) signed int ___retval_f__i_1; + signed int (*(*__pc__PA0A0PA0A0i_2)[][((unsigned long int )10)])[][((unsigned long int )3)]; + signed int (*(*__p__PA0A0PA0A0i_2)[][((unsigned long int )10)])[][((unsigned long int )3)]; + signed int (*(*__p__PA0PFi_i__2)[])(signed int __anonymous_object26); +} +static const signed int *__f1__FPCi___1(){ + __attribute__ ((unused)) const signed int *___retval_f1__PCi_1; +} +static const signed int __f2__FCi___1(void){ + __attribute__ ((unused)) const signed int ___retval_f2__Ci_1; +} +static inline signed int *const __f3__FCPi___1(void){ + __attribute__ ((unused)) signed int *const ___retval_f3__CPi_1; +} +struct _conc__tuple2_3 { + signed int *field_0; + signed int field_1; +}; +static inline const struct _conc__tuple2_3 __f4__FCTPii____1(void){ + __attribute__ ((unused)) const struct _conc__tuple2_3 ___retval_f4__CTPii__1; +} +static const struct _conc__tuple2_3 __f5__FCTPiCi____1(void){ + __attribute__ ((unused)) const struct _conc__tuple2_3 ___retval_f5__CTPiCi__1; +} +signed int __f__Fi_PFi__PFPi__PFPPi__PFPCPi__PFCPCPi__PiPiPPiPPiPPPiPPPiPPCPiPPCPiPCPCPiPCPCPi__1(signed int (*__anonymous_object27)(), signed int *(*__anonymous_object28)(), signed int **(*__anonymous_object29)(), signed int *const *(*__anonymous_object30)(), signed int *const *const (*__anonymous_object31)(), signed int *__anonymous_object32, signed int __anonymous_object33[((unsigned long int )10)], signed int **__anonymous_object34, signed int *__anonymous_object35[((unsigned long int )10)], signed int ***__anonymous_object36, signed int **__anonymous_object37[((unsigned long int )10)], signed int *const **__anonymous_object38, signed int *const *__anonymous_object39[((unsigned long int )10)], signed int *const *const *__anonymous_object40, signed int *const *const __anonymous_object41[((unsigned long int )10)]); +signed int __f__Fi_PFi__PFPi__PFPPi__PFPCPi__PFCPCPi__PiPiPPiPPiPPPiPPPiPPCPiPPCPiPCPCPiPCPCPi__1(signed int (*__anonymous_object42)(), signed int *(*__anonymous_object43)(), signed int **(*__anonymous_object44)(), signed int *const *(*__anonymous_object45)(), signed int *const *const (*__anonymous_object46)(), signed int *__anonymous_object47, signed int __anonymous_object48[((unsigned long int )10)], signed int **__anonymous_object49, signed int *__anonymous_object50[((unsigned long int )10)], signed int ***__anonymous_object51, signed int **__anonymous_object52[((unsigned long int )10)], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[((unsigned long int )10)], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[((unsigned long int )10)]){ + __attribute__ ((unused)) signed int ___retval_f__i_1; +} +signed int __f__Fi_Pii__1(signed int *__f__Pi_1, signed int __t__i_1){ + __attribute__ ((unused)) signed int ___retval_f__i_1; + signed int __T__i_2; +} Index: src/tests/Makefile.am =================================================================== --- src/tests/Makefile.am (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/tests/Makefile.am (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -11,6 +11,6 @@ ## Created On : Sun May 31 09:08:15 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Tue Oct 10 14:04:40 2017 -## Update Count : 47 +## Last Modified On : Mon Nov 27 21:34:33 2017 +## Update Count : 48 ############################################################################### @@ -118,4 +118,7 @@ ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@} +functions: functions.c @CFA_BINDIR@/@CFA_NAME@ + ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@} + KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@ ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@} Index: src/tests/Makefile.in =================================================================== --- src/tests/Makefile.in (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/tests/Makefile.in (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -871,4 +871,7 @@ ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@} +functions: functions.c @CFA_BINDIR@/@CFA_NAME@ + ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@} + KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@ ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@} Index: src/tests/designations.c =================================================================== --- src/tests/designations.c (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/tests/designations.c (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -17,5 +17,5 @@ // In particular, since the syntax for designations in Cforall differs from that of C, preprocessor substitution // is used for the designation syntax -#ifdef __CFORALL__ +#ifdef __cforall #define DES : #else Index: src/tests/functions.c =================================================================== --- src/tests/functions.c (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/tests/functions.c (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -10,6 +10,6 @@ // Created On : Wed Aug 17 08:39:58 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Aug 17 08:40:52 2016 -// Update Count : 1 +// Last Modified On : Mon Nov 27 18:08:54 2017 +// Update Count : 11 // @@ -66,42 +66,50 @@ // Cforall extensions -[] f( ); +// [] f( ); [int] f( ); -[] f(int); +// [] f(int); [int] f(int); -[] f( ) {} +// [] f( ) {} [int] f( ) {} -[] f(int) {} +// [] f(int) {} [int] f(int) {} [int x] f( ); -[] f(int x); -[int x] f(int x); -[int x] f( ) {} -[] f(int x) {} -[int x] f(int x) {} +// [] f(int x); +//[int x] f(int x); +//[int x] f( ) {} +// [] f(int x) {} +//[int x] f(int x) {} [int, int x] f( ); -[] f(int, int x); +// [] f(int, int x); [int, int x] f(int, int x); [int, int x] f( ) {} -[] f(int, int x) {} +// [] f(int, int x) {} [int, int x] f(int, int x) {} [int, int x, int] f( ); -[] f(int, int x, int); +// [] f(int, int x, int); [int, int x, int] f(int, int x, int); [int, int x, int] f( ) {} -[] f(int, int x, int) {} +// [] f(int, int x, int) {} [int, int x, int] f(int, int x, int) {} [int, int x, * int y] f( ); -[] f(int, int x, * int y); +// [] f(int, int x, * int y); [int, int x, * int y] f(int, int x, * int y); [int, int x, * int y] f( ) {} -[] f(int, int x, * int y) {} +// [] f(int, int x, * int y) {} [int, int x, * int y] f(int, int x, * int y) {} -[ int ] f11( int ), f12; // => int f11( int ), f12( int ); +// function prototypes + +[ int ] f11( int ), f12(); // => int f11( int ), f12( void ); + +const double bar1(), bar2( int ), bar3( double ); // C version +[const double] foo(), foo( int ), foo( double ) { return 3.0; } // CFA version +struct S { int i; }; +[S] rtn( int ) {} + [int] f( @@ -109,5 +117,5 @@ [int](int) ) { - int (*(*p)[][10])[][3]; + int (*(*pc)[][10])[][3]; * [][10] * [][3] int p; * [] * [int](int) p; Index: src/tests/polymorphism.c =================================================================== --- src/tests/polymorphism.c (revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a) +++ src/tests/polymorphism.c (revision 6c2ba385b7573940622a91ec236a0a6de26c4300) @@ -47,5 +47,5 @@ S s; s.i = i; - assert(s.i == i); + assertf(s.i == i, "struct operation fails in polymorphic context."); B b; @@ -73,6 +73,6 @@ { // test aggregates with polymorphic members - typedef uint32_t x_type; - typedef uint64_t y_type; + typedef __attribute__((aligned(8))) uint32_t x_type; + typedef __attribute__((aligned(8))) uint64_t y_type; x_type x = 3; @@ -89,6 +89,8 @@ // ensure that the size of aggregates with polymorphic members // matches the size of the aggregates in a monomorphic context - assert( struct_size(x, y) == sizeof(S) ); - assert( union_size(x, y) == sizeof(U) ); + size_t ssz = struct_size(x, y); + size_t usz = union_size(x, y); + assertf( ssz == sizeof(S), "struct size differs in polymorphic context: %zd / %zd", ssz, sizeof(S)); + assertf( usz == sizeof(U), "union size differs in polymorphic context: %zd / %zd", usz, sizeof(U)); y_type ?=?(y_type & this, zero_t) { @@ -111,5 +113,5 @@ u.f2 = 0; u.f1 = x; - assert(ret == u.f2); + assertf(ret == u.f2, "union operation fails in polymorphic context."); } }