Index: src/libcfa/Makefile.am =================================================================== --- src/libcfa/Makefile.am (revision 57fc7d8e52dab41458ab2e2f1b8133f73adb8bcf) +++ src/libcfa/Makefile.am (revision 0fc52b6ec9478db4016cce215b928b588385e1aa) @@ -11,6 +11,6 @@ ## Created On : Sun May 31 08:54:01 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Thu Apr 12 14:38:34 2018 -## Update Count : 231 +## Last Modified On : Thu Jul 12 08:04:35 2018 +## Update Count : 234 ############################################################################### @@ -46,5 +46,5 @@ CC = ${abs_top_srcdir}/src/driver/cfa -headers = fstream iostream iterator limits rational time stdlib \ +headers = fstream iostream iterator limits rational time stdlib common \ containers/maybe containers/pair containers/result containers/vector @@ -96,12 +96,11 @@ cfa_includedir = $(CFA_INCDIR) nobase_cfa_include_HEADERS = \ - ${headers} \ - ${stdhdr} \ - math \ - gmp \ - time_t.h \ - clock \ + ${headers} \ + ${stdhdr} \ + math \ + gmp \ + time_t.h \ bits/align.h \ - bits/containers.h \ + bits/containers.h \ bits/defs.h \ bits/debug.h \ Index: src/libcfa/Makefile.in =================================================================== --- src/libcfa/Makefile.in (revision 57fc7d8e52dab41458ab2e2f1b8133f73adb8bcf) +++ src/libcfa/Makefile.in (revision 0fc52b6ec9478db4016cce215b928b588385e1aa) @@ -150,5 +150,5 @@ am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c interpose.c \ bits/debug.c fstream.c iostream.c iterator.c limits.c \ - rational.c time.c stdlib.c containers/maybe.c \ + rational.c time.c stdlib.c common.c containers/maybe.c \ containers/pair.c containers/result.c containers/vector.c \ concurrency/coroutine.c concurrency/thread.c \ @@ -167,4 +167,5 @@ libcfa_d_a-limits.$(OBJEXT) libcfa_d_a-rational.$(OBJEXT) \ libcfa_d_a-time.$(OBJEXT) libcfa_d_a-stdlib.$(OBJEXT) \ + libcfa_d_a-common.$(OBJEXT) \ containers/libcfa_d_a-maybe.$(OBJEXT) \ containers/libcfa_d_a-pair.$(OBJEXT) \ @@ -186,5 +187,5 @@ am__libcfa_a_SOURCES_DIST = libcfa-prelude.c interpose.c bits/debug.c \ fstream.c iostream.c iterator.c limits.c rational.c time.c \ - stdlib.c containers/maybe.c containers/pair.c \ + stdlib.c common.c containers/maybe.c containers/pair.c \ containers/result.c containers/vector.c \ concurrency/coroutine.c concurrency/thread.c \ @@ -201,5 +202,6 @@ libcfa_a-iterator.$(OBJEXT) libcfa_a-limits.$(OBJEXT) \ libcfa_a-rational.$(OBJEXT) libcfa_a-time.$(OBJEXT) \ - libcfa_a-stdlib.$(OBJEXT) containers/libcfa_a-maybe.$(OBJEXT) \ + libcfa_a-stdlib.$(OBJEXT) libcfa_a-common.$(OBJEXT) \ + containers/libcfa_a-maybe.$(OBJEXT) \ containers/libcfa_a-pair.$(OBJEXT) \ containers/libcfa_a-result.$(OBJEXT) \ @@ -263,10 +265,10 @@ esac am__nobase_cfa_include_HEADERS_DIST = fstream iostream iterator limits \ - rational time stdlib containers/maybe containers/pair \ + rational time stdlib common containers/maybe containers/pair \ containers/result containers/vector concurrency/coroutine \ concurrency/thread concurrency/kernel concurrency/monitor \ concurrency/mutex ${shell find stdhdr -type f -printf "%p "} \ - math gmp time_t.h clock bits/align.h bits/containers.h \ - bits/defs.h bits/debug.h bits/locks.h concurrency/invoke.h + math gmp time_t.h bits/align.h bits/containers.h bits/defs.h \ + bits/debug.h bits/locks.h concurrency/invoke.h HEADERS = $(nobase_cfa_include_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) @@ -422,5 +424,5 @@ EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@ AM_CCASFLAGS = @CFA_FLAGS@ -headers = fstream iostream iterator limits rational time stdlib \ +headers = fstream iostream iterator limits rational time stdlib common \ containers/maybe containers/pair containers/result \ containers/vector $(am__append_3) @@ -435,12 +437,11 @@ cfa_includedir = $(CFA_INCDIR) nobase_cfa_include_HEADERS = \ - ${headers} \ - ${stdhdr} \ - math \ - gmp \ - time_t.h \ - clock \ + ${headers} \ + ${stdhdr} \ + math \ + gmp \ + time_t.h \ bits/align.h \ - bits/containers.h \ + bits/containers.h \ bits/defs.h \ bits/debug.h \ @@ -610,4 +611,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-assert.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-common.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-exception.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-fstream.Po@am__quote@ @@ -622,4 +624,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-virtual.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-assert.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-common.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-exception.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-fstream.Po@am__quote@ @@ -826,4 +829,18 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-stdlib.obj `if test -f 'stdlib.c'; then $(CYGPATH_W) 'stdlib.c'; else $(CYGPATH_W) '$(srcdir)/stdlib.c'; fi` +libcfa_d_a-common.o: common.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-common.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-common.Tpo -c -o libcfa_d_a-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-common.Tpo $(DEPDIR)/libcfa_d_a-common.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common.c' object='libcfa_d_a-common.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c + +libcfa_d_a-common.obj: common.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-common.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-common.Tpo -c -o libcfa_d_a-common.obj `if test -f 'common.c'; then $(CYGPATH_W) 'common.c'; else $(CYGPATH_W) '$(srcdir)/common.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-common.Tpo $(DEPDIR)/libcfa_d_a-common.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common.c' object='libcfa_d_a-common.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-common.obj `if test -f 'common.c'; then $(CYGPATH_W) 'common.c'; else $(CYGPATH_W) '$(srcdir)/common.c'; fi` + containers/libcfa_d_a-maybe.o: containers/maybe.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT containers/libcfa_d_a-maybe.o -MD -MP -MF containers/$(DEPDIR)/libcfa_d_a-maybe.Tpo -c -o containers/libcfa_d_a-maybe.o `test -f 'containers/maybe.c' || echo '$(srcdir)/'`containers/maybe.c @@ -1147,4 +1164,18 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-stdlib.obj `if test -f 'stdlib.c'; then $(CYGPATH_W) 'stdlib.c'; else $(CYGPATH_W) '$(srcdir)/stdlib.c'; fi` + +libcfa_a-common.o: common.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-common.o -MD -MP -MF $(DEPDIR)/libcfa_a-common.Tpo -c -o libcfa_a-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-common.Tpo $(DEPDIR)/libcfa_a-common.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common.c' object='libcfa_a-common.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c + +libcfa_a-common.obj: common.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-common.obj -MD -MP -MF $(DEPDIR)/libcfa_a-common.Tpo -c -o libcfa_a-common.obj `if test -f 'common.c'; then $(CYGPATH_W) 'common.c'; else $(CYGPATH_W) '$(srcdir)/common.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-common.Tpo $(DEPDIR)/libcfa_a-common.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common.c' object='libcfa_a-common.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-common.obj `if test -f 'common.c'; then $(CYGPATH_W) 'common.c'; else $(CYGPATH_W) '$(srcdir)/common.c'; fi` containers/libcfa_a-maybe.o: containers/maybe.c Index: src/libcfa/common =================================================================== --- src/libcfa/common (revision 0fc52b6ec9478db4016cce215b928b588385e1aa) +++ src/libcfa/common (revision 0fc52b6ec9478db4016cce215b928b588385e1aa) @@ -0,0 +1,85 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// common -- +// +// Author : Peter A. Buhr +// Created On : Wed Jul 11 17:54:36 2018 +// Last Modified By : Peter A. Buhr +// Last Modified On : Thu Jul 12 08:02:18 2018 +// Update Count : 5 +// + +#pragma once + +//--------------------------------------- + +[ int, int ] div( int num, int denom ); +[ long int, long int ] div( long int num, long int denom ); +[ long long int, long long int ] div( long long int num, long long int denom ); +forall( otype T | { T ?/?( T, T ); T ?%?( T, T ); } ) +[ T, T ] div( T num, T demon ); + +//--------------------------------------- + +extern "C" { + int abs( int ); // stdlib.h + long int labs( long int ); + long long int llabs( long long int ); +} // extern "C" + +static inline { + unsigned char abs( signed char v ) { return abs( (int)v ); } + // use default C routine for int + unsigned long int abs( long int v ) { return labs( v ); } + unsigned long long int abs( long long int v ) { return llabs( v ); } +} // distribution + +extern "C" { + double fabs( double ); // math.h + float fabsf( float ); + long double fabsl( long double ); +} // extern "C" +static inline { + float abs( float x ) { return fabsf( x ); } + double abs( double x ) { return fabs( x ); } + long double abs( long double x ) { return fabsl( x ); } +} // distribution + +extern "C" { + double cabs( double _Complex ); // complex.h + float cabsf( float _Complex ); + long double cabsl( long double _Complex ); +} // extern "C" +static inline { + float abs( float _Complex x ) { return cabsf( x ); } + double abs( double _Complex x ) { return cabs( x ); } + long double abs( long double _Complex x ) { return cabsl( x ); } +} // distribution + +forall( otype T | { void ?{}( T &, zero_t ); int ??( T, T ); } ) + T max( T t1, T t2 ) { return t1 > t2 ? t1 : t2; } + + forall( otype T | { T min( T, T ); T max( T, T ); } ) + T clamp( T value, T min_val, T max_val ) { return max( min_val, min( value, max_val ) ); } + + forall( otype T ) + void swap( T & v1, T & v2 ) { T temp = v1; v1 = v2; v2 = temp; } +} // distribution + +// Local Variables: // +// mode: c // +// tab-width: 4 // +// End: // Index: src/libcfa/common.c =================================================================== --- src/libcfa/common.c (revision 0fc52b6ec9478db4016cce215b928b588385e1aa) +++ src/libcfa/common.c (revision 0fc52b6ec9478db4016cce215b928b588385e1aa) @@ -0,0 +1,31 @@ +// -*- Mode: C -*- +// +// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// common.c -- +// +// Author : Peter A. Buhr +// Created On : Thu Jul 12 08:02:29 2018 +// Last Modified By : Peter A. Buhr +// Last Modified On : Thu Jul 12 08:38:47 2018 +// Update Count : 3 +// + +#include "common" +#include // div_t, *div + +//--------------------------------------- + +[ int, int ] div( int num, int denom ) { div_t qr = div( num, denom ); return [ qr.quot, qr.rem ]; } +[ long int, long int ] div( long int num, long int denom ) { ldiv_t qr = ldiv( num, denom ); return [ qr.quot, qr.rem ]; } +[ long long int, long long int ] div( long long int num, long long int denom ) { lldiv_t qr = lldiv( num, denom ); return [ qr.quot, qr.rem ]; } +forall( otype T | { T ?/?( T, T ); T ?%?( T, T ); } ) +[ T, T ] div( T num, T denom ) { return [ num / denom, num % denom ]; } + +// Local Variables: // +// mode: c // +// tab-width: 4 // +// End: // Index: src/libcfa/math =================================================================== --- src/libcfa/math (revision 57fc7d8e52dab41458ab2e2f1b8133f73adb8bcf) +++ src/libcfa/math (revision 0fc52b6ec9478db4016cce215b928b588385e1aa) @@ -10,6 +10,6 @@ // Created On : Mon Apr 18 23:37:04 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Aug 7 07:51:15 2017 -// Update Count : 108 +// Last Modified On : Wed Jul 11 21:12:54 2018 +// Update Count : 109 // @@ -348,4 +348,8 @@ static inline long double scalbln( long double x, long int exp ) { return scalblnl( x, exp ); } +//--------------------------------------- + +#include "common" + // Local Variables: // // mode: c // Index: src/libcfa/stdlib =================================================================== --- src/libcfa/stdlib (revision 57fc7d8e52dab41458ab2e2f1b8133f73adb8bcf) +++ src/libcfa/stdlib (revision 0fc52b6ec9478db4016cce215b928b588385e1aa) @@ -10,11 +10,11 @@ // Created On : Thu Jan 28 17:12:35 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Jul 5 07:41:03 2018 -// Update Count : 332 +// Last Modified On : Thu Jul 12 08:03:58 2018 +// Update Count : 337 // #pragma once -#include // allocation, strto*, *abs +#include // allocation, strto*, ato* extern "C" { void * memalign( size_t align, size_t size ); // malloc.h @@ -227,46 +227,4 @@ size_t bsearchu( K key, const E * vals, size_t dim ); } // distribution - -//--------------------------------------- - -[ int, int ] div( int num, int denom ); -[ long int, long int ] div( long int num, long int denom ); -[ long long int, long long int ] div( long long int num, long long int denom ); -forall( otype T | { T ?/?( T, T ); T ?%?( T, T ); } ) -[ T, T ] div( T num, T demon ); - -//--------------------------------------- - -extern "C" { int abs( int ); } // use default C routine for int -static inline { - unsigned char abs( signed char v ) { return abs( (int)v ); } - unsigned long int abs( long int v ) { return labs( v ); } - unsigned long long int abs( long long int v ) { return llabs( v ); } -} // distribution - -extern "C" { // use default C routine for int - double fabs( double ); - float fabsf( float ); - long double fabsl( long double ); -} // extern "C" -static inline { - float abs( float x ) { return fabsf( x ); } - double abs( double x ) { return fabs( x ); } - long double abs( long double x ) { return fabsl( x ); } -} // distribution - -extern "C" { // use default C routine for int - double cabs( double _Complex ); - float cabsf( float _Complex ); - long double cabsl( long double _Complex ); -} // extern "C" -static inline { - float abs( float _Complex x ) { return cabsf( x ); } - double abs( double _Complex x ) { return cabs( x ); } - long double abs( long double _Complex x ) { return cabsl( x ); } -} // distribution - -forall( otype T | { void ?{}( T &, zero_t ); int ??( T, T ); } ) - T max( T t1, T t2 ) { return t1 > t2 ? t1 : t2; } - - forall( otype T | { T min( T, T ); T max( T, T ); } ) - T clamp( T value, T min_val, T max_val ) { return max( min_val, min( value, max_val ) ); } - - forall( otype T ) - void swap( T & v1, T & v2 ) { T temp = v1; v1 = v2; v2 = temp; } -} // distribution +#include "common" // Local Variables: // Index: src/libcfa/stdlib.c =================================================================== --- src/libcfa/stdlib.c (revision 57fc7d8e52dab41458ab2e2f1b8133f73adb8bcf) +++ src/libcfa/stdlib.c (revision 0fc52b6ec9478db4016cce215b928b588385e1aa) @@ -10,6 +10,6 @@ // Created On : Thu Jan 28 17:10:29 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jul 3 08:17:30 2018 -// Update Count : 457 +// Last Modified On : Thu Jul 12 08:03:59 2018 +// Update Count : 458 // @@ -241,12 +241,4 @@ //--------------------------------------- -[ int, int ] div( int num, int denom ) { div_t qr = div( num, denom ); return [ qr.quot, qr.rem ]; } -[ long int, long int ] div( long int num, long int denom ) { ldiv_t qr = ldiv( num, denom ); return [ qr.quot, qr.rem ]; } -[ long long int, long long int ] div( long long int num, long long int denom ) { lldiv_t qr = lldiv( num, denom ); return [ qr.quot, qr.rem ]; } -forall( otype T | { T ?/?( T, T ); T ?%?( T, T ); } ) -[ T, T ] div( T num, T denom ) { return [ num / denom, num % denom ]; } - -//--------------------------------------- - extern "C" { // override C version void srandom( unsigned int seed ) { srand48( (long int)seed ); }