Changes in / [9617533:447b0d2b]

Files:

• doc/man/cfa.1 (modified) (6 diffs)
• driver/cfa.cc (modified) (2 diffs)
• libcfa/src/heap.cfa (modified) (5 diffs)

doc/man/cfa.1

@@ -11 +11 @@
 .\" Created On       : Wed Jul 26 22:34:47 2017
 .\" Last Modified By : Peter A. Buhr
-.\" Last Modified On : Wed Sep  2 17:59:53 2020
-.\" Update Count     : 78
+.\" Last Modified On : Thu Jul 27 10:29:29 2017
+.\" Update Count     : 44
 .\" 
 .\" nroff -man cfa.1
@@ -23 +23 @@
 .ds Cf "Cforall
 .\" 
-.TH CFA 1 "2020-09-2" cfa-\*(Mg "\*(Cf Project"
+.TH cfa 1 2017-07-27 cfa-\*(Mg
 .SH NAME
-cfa \- \*(Cf project translator and runtime library to enhance C
+cfa \- \*(Cf Translator and Runtime Library
 .SH SYNOPSIS
-cfa [cfa/gcc-options]
-    [cfa/c source-files]
-    [assembler/loader files]
+cfa [gcc-options] [C/\*(Cf source-files] [assembler/loader files]
 .SH DESCRIPTION
-\*(Cf (C-for-all) is an open-source project extending ISO C with modern safety and productivity features, while still ensuring backwards compatibility with C and its programmers.
-
 The cfa command compiles C and \*(Cf source files and links C/\*(Cf object
 files named on the command line.
@@ -38 +34 @@
 The cfa command introduces a translator pass over the specified source files
 after the C preprocessor but before the C compilation.  The translator converts
-new \*(Cf constructs into C statements.  The cfa command also provides a fully
-concurrent (user-level threads) runtime library, which is linked with the
-\*(Cf application.
+new \*(Cf constructs into C statements.  The cfa command also provides the
+runtime library, which is linked with each \*(Cf application.
 
 The command line options depend on the particular C compiler used (gcc/clang
 supported).  As with most C compilers, the output is sent to the file a.out(5)
 unless the -o option is present on the command line.  See the reference pages
-for gcc(1) for more information on command line options.
+for gcc(1) for more information.
 .SH OPTIONS
 When multiple conflicting options appear on the command line, e.g.,
@@ -55 +50 @@
 All of the options available to the gcc compiler are available to the cfa
 translator.  The following gcc flags are implicitly turned on:
-.IP "-std=gnu11" 3
-The 2011 C standard plus GNU extensions.
-.IP "-fgnu89-inline"
-Use the traditional GNU semantics for inline routines in C11 mode, which allows inline routines in header files.
-.IP "-imacros stdbool.h"
-Include stdbool.h to get defines for bool/true/false.
-.IP "-latomic -lm"
-Provide access to double-wide CAS instruction and math library.
+.IP -std=gnu99 3
+The 1999 C standard plus GNU extensions.
+.IP -fgnu89-inline
+Use the traditional GNU semantics for inline routines in C99 mode, which allows inline routines in header files.
 .LP
 The following additional options are available:
-.IP "-CFA" 3
+.IP -CFA 3
 Only the C preprocessor and the \*(Cf translator steps are performed and the transformed program is written to standard output, which makes it possible to examine the code generated by the \*(Cf translator.
 The generated code starts with the standard \*(Cf prelude.
-.IP "-debug"
+.IP -debug
 The program is linked with the debugging version of the runtime system.
 The debug version performs runtime checks to help during the debugging phase of a \*(Cf program, but can substantially slow program execution.
 The runtime checks should only be removed after the program is completely debugged.
 .B This option is the default.
-.IP "-nodebug"
+.IP -nodebug
 The program is linked with the non-debugging version of the runtime system, so the execution of the program is faster.
 .I However, no runtime checks or asserts are performed so errors usually result in abnormal program behaviour or termination.
-.IP "-help"
+.IP -help
 Information about the set of \*(Cf compilation flags is printed.
-.IP "-nohelp"
+.IP -nohelp
 Information about the set of \*(Cf compilation flags is not printed.
 .B This option is the default.
-.IP "-quiet"
+.IP -quiet
 The \*(Cf compilation message is not printed at the beginning of a compilation.
-.IP "-noquiet"
+.IP -noquiet
 The \*(Cf compilation message is printed at the beginning of a compilation.
 .B This option is the default.
@@ -90 +81 @@
 available.  These variables allow conditional compilation of programs that must
 work differently in these situations.
-.IP "__CFA_MAJOR__" 3
+.IP __CFA_MAJOR__ 3
 is available during preprocessing and its value is the major version number of \*(Cf.
-.IP "__CFA_MINOR__"
+.IP __CFA_MINOR__
 is available during preprocessing and its value is the minor version number of \*(Cf.
-.IP "__CFA_PATCH__"
+.IP __CFA_PATCH__
 is available during preprocessing and its value is the patch level number of \*(Cf.
 .IP "__CFA__, __CFORALL__, and __cforall"
 are always available during preprocessing and have no value.
-.IP "__CFA_DEBUG__"
+.IP __CFA_DEBUG__
 is available during preprocessing if the -debug compilation option is
 specified.
@@ -125 +116 @@
 .SH REFERENCES
 .HP 3
-.I \*(Cf Home Page
+\*(Cf Reference and Rational Manual
 .br
-https://cforall.uwaterloo.ca
+http://plg.uwaterloo.ca/~cforall/refrat.pdf
 .HP
 .I \*(Cf User Manual
 .br
-https://cforall.uwaterloo.ca/doc/user.pdf
-.SH BUILDS
-Nightly builds are available here https://cforall.uwaterloo.ca/jenkins
+http://plg.uwaterloo.ca/~cforall/user.pdf
 .SH BUGS
-Bugs reportss are available here https://cforall.uwaterloo.ca/trac
+Bugs should be reported to trac@plg.cs.uwaterloo.ca.
 .SH COPYRIGHT
 \*(Cf is covered under the licence agreement in the distribution.
 .SH AUTHORS
 Andrew Beach, Richard Bilson, Peter A. Buhr, Thierry Delisle, Glen Ditchfield,
-Rodolfo G. Esteves, Aaron Moss, Rob Schluntz, Mubeen Zulfiqar
+Rodolfo G. Esteves, Aaron Moss, Rob Schluntz

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep  2 17:59:20 2020
-// Update Count     : 438
+// Last Modified On : Thu Aug 20 23:43:59 2020
+// Update Count     : 436
 //
 
@@ -437 +437 @@
                 #endif // __x86_64__
                 args[nargs++] = "-ldl";
+                args[nargs++] = "-lrt";
                 args[nargs++] = "-lm";
         } // if

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Sep  3 16:22:54 2020
-// Update Count     : 943
+// Last Modified On : Tue Sep  1 21:58:36 2020
+// Update Count     : 927
 //
 
@@ -29 +29 @@
 #include "math.hfa"                                                                             // ceiling
 #include "bitmanip.hfa"                                                                 // is_pow2, ceiling2
+
+#define MIN(x, y) (y > x ? x : y)
 
 static bool traceHeap = false;
@@ -954 +956 @@
 
                 headers( "realloc", naddr, header, freeElem, bsize, oalign );
-                memcpy( naddr, oaddr, min( osize, size ) );             // copy bytes
+                memcpy( naddr, oaddr, MIN( osize, size ) );             // copy bytes
                 free( oaddr );
 
@@ -1231 +1233 @@
         } // if
 
-        // Attempt to reuse existing storage.
-        HeapManager.Storage.Header * header = headerAddr( oaddr );
-        if ( header->kind.fake.alignment & 1 == 1 ) {           // old fake header ?
-                if ( unlikely( (uintptr_t)oaddr % nalign == 0) && // lucky match ?
-                         header->kind.fake.alignment <= nalign &&       // ok to leave LSB at 1
-                         nalign <= 128 ) {                                                      // not too much alignment storage wasted ?
-
-                        HeapManager.FreeHeader * freeElem;
-                        size_t bsize, oalign;
-                        headers( "resize", oaddr, header, freeElem, bsize, oalign );
-                        size_t odsize = dataStorage( bsize, oaddr, header ); // data storage available in bucket
-
-                        if ( size <= odsize && odsize <= size * 2 ) { // allow 50% wasted data storage
-                                headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
-
-                                header->kind.real.blockSize &= -2;              // turn off 0 fill
-                                header->kind.real.size = size;                  // reset allocation size
-                                return oaddr;
-                        } // if
-                } // if
-        } else {                                                                                        // no old fake header
-                if ( nalign == libAlign() ) {                                   // no new fake header needed => try to reuse storage
-                        HeapManager.FreeHeader * freeElem;
-                        size_t bsize, oalign;
-                        headers( "resize", oaddr, header, freeElem, bsize, oalign );
-                        size_t odsize = dataStorage( bsize, oaddr, header ); // data storage available in bucket
-
-                        if ( size <= odsize && odsize <= size * 2 ) { // allow 50% wasted data storage
-                                header->kind.real.blockSize &= -2;              // turn off 0 fill
-                                header->kind.real.size = size;                  // reset allocation size
-                                return oaddr;
-                        } // if
+        HeapManager.Storage.Header * header;
+        HeapManager.FreeHeader * freeElem;
+        size_t bsize, oalign;
+        headers( "resize", oaddr, header, freeElem, bsize, oalign );
+        size_t odsize = dataStorage( bsize, oaddr, header ); // data storage available in bucket
+
+        if ( oalign == nalign && size <= odsize && odsize <= size * 2 ) { // <= alignment and new alignment are same, allow 50% wasted storage for smaller size
+                header->kind.real.blockSize &= -2;                      // turn off 0 fill
+                header->kind.real.size = size;                          // reset allocation size
+                return oaddr;
+        } // if
+        if ( oalign < nalign && (uintptr_t)oaddr % nalign == 0 && oalign > libAlign() ) { // <= alignment and new alignment happens to match, and oaddr has a fake header
+                headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
+                if ( size <= odsize && odsize <= size * 2 ) {   // allow 50% wasted storage for smaller size
+                        header->kind.real.blockSize &= -2;                      // turn off 0 fill
+                        header->kind.real.size = size;                          // reset allocation size
+                        return oaddr;
                 } // if
         } // if
@@ -1319 +1306 @@
 
         headers( "realloc", naddr, header, freeElem, bsize, oalign );
-        memcpy( naddr, oaddr, min( osize, size ) );                     // copy bytes
+        memcpy( naddr, oaddr, MIN( osize, size ) );                     // copy bytes
         free( oaddr );