Changeset 04e367c for src/libcfa


Ignore:
Timestamp:
Jul 30, 2018, 4:49:40 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
3537dd7, 3bbd012
Parents:
ba4a1d8 (diff), a4248de1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:
src/libcfa
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • src/libcfa/Makefile.am

    rba4a1d8 r04e367c  
    5555
    5656libobjs = ${headers:=.o}
    57 libsrc = libcfa-prelude.c interpose.c bits/debug.c assert.c exception.c virtual.c heap.c startup.c \
     57libsrc = libcfa-prelude.c startup.c interpose.c bits/debug.c assert.c exception.c virtual.c heap.c \
    5858        ${headers:=.c}
    5959
    … …  
    6464
    6565# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
     66# SKULLDUGGERY in order to make sure this isn't called make the rule always fail but also create a rule for headers
    6667% : %.c
    67         @true
     68        echo "Dummy rule, should never be called"
     69        false
     70
     71# This rule should always match headers and since it has no prerequisite it will never be called
     72$(addprefix $(srcdir)/,$(headers)):
     73        echo "Dummy rule, should never be called"
     74        false
    6875
    6976concurrency/libcfa_a-invoke.o : concurrency/invoke.c

  • src/libcfa/Makefile.in

    rba4a1d8 r04e367c  
    148148libcfa_d_a_AR = $(AR) $(ARFLAGS)
    149149libcfa_d_a_LIBADD =
    150 am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c interpose.c \
    151         bits/debug.c assert.c exception.c virtual.c heap.c startup.c \
    152         fstream.c iostream.c iterator.c limits.c rational.c time.c \
    153         stdlib.c common.c containers/maybe.c containers/pair.c \
     150am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c startup.c interpose.c \
     151        bits/debug.c assert.c exception.c virtual.c heap.c fstream.c \
     152        iostream.c iterator.c limits.c rational.c time.c stdlib.c \
     153        common.c containers/maybe.c containers/pair.c \
    154154        containers/result.c containers/vector.c \
    155155        concurrency/coroutine.c concurrency/thread.c \
    … …  
    177177@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-preemption.$(OBJEXT)
    178178am__objects_4 = libcfa_d_a-libcfa-prelude.$(OBJEXT) \
    179         libcfa_d_a-interpose.$(OBJEXT) bits/libcfa_d_a-debug.$(OBJEXT) \
    180         libcfa_d_a-assert.$(OBJEXT) libcfa_d_a-exception.$(OBJEXT) \
    181         libcfa_d_a-virtual.$(OBJEXT) libcfa_d_a-heap.$(OBJEXT) \
    182         libcfa_d_a-startup.$(OBJEXT) $(am__objects_2) $(am__objects_3)
     179        libcfa_d_a-startup.$(OBJEXT) libcfa_d_a-interpose.$(OBJEXT) \
     180        bits/libcfa_d_a-debug.$(OBJEXT) libcfa_d_a-assert.$(OBJEXT) \
     181        libcfa_d_a-exception.$(OBJEXT) libcfa_d_a-virtual.$(OBJEXT) \
     182        libcfa_d_a-heap.$(OBJEXT) $(am__objects_2) $(am__objects_3)
    183183am_libcfa_d_a_OBJECTS = $(am__objects_4)
    184184libcfa_d_a_OBJECTS = $(am_libcfa_d_a_OBJECTS)
    185185libcfa_a_AR = $(AR) $(ARFLAGS)
    186186libcfa_a_LIBADD =
    187 am__libcfa_a_SOURCES_DIST = libcfa-prelude.c interpose.c bits/debug.c \
    188         assert.c exception.c virtual.c heap.c startup.c fstream.c \
     187am__libcfa_a_SOURCES_DIST = libcfa-prelude.c startup.c interpose.c \
     188        bits/debug.c assert.c exception.c virtual.c heap.c fstream.c \
    189189        iostream.c iterator.c limits.c rational.c time.c stdlib.c \
    190190        common.c containers/maybe.c containers/pair.c \
    … …  
    212212@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-preemption.$(OBJEXT)
    213213am__objects_8 = libcfa_a-libcfa-prelude.$(OBJEXT) \
    214         libcfa_a-interpose.$(OBJEXT) bits/libcfa_a-debug.$(OBJEXT) \
    215         libcfa_a-assert.$(OBJEXT) libcfa_a-exception.$(OBJEXT) \
    216         libcfa_a-virtual.$(OBJEXT) libcfa_a-heap.$(OBJEXT) \
    217         libcfa_a-startup.$(OBJEXT) $(am__objects_6) $(am__objects_7)
     214        libcfa_a-startup.$(OBJEXT) libcfa_a-interpose.$(OBJEXT) \
     215        bits/libcfa_a-debug.$(OBJEXT) libcfa_a-assert.$(OBJEXT) \
     216        libcfa_a-exception.$(OBJEXT) libcfa_a-virtual.$(OBJEXT) \
     217        libcfa_a-heap.$(OBJEXT) $(am__objects_6) $(am__objects_7)
    218218am_libcfa_a_OBJECTS = $(am__objects_8)
    219219libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    … …  
    347347LTLIBOBJS = @LTLIBOBJS@
    348348MACHINE_TYPE = @MACHINE_TYPE@
    349 MAINT = @MAINT@
    350349MAKEINFO = @MAKEINFO@
    351350MKDIR_P = @MKDIR_P@
    … …  
    429428        containers/vector $(am__append_3)
    430429libobjs = ${headers:=.o}
    431 libsrc = libcfa-prelude.c interpose.c bits/debug.c assert.c \
    432         exception.c virtual.c heap.c startup.c ${headers:=.c} \
    433         $(am__append_4)
     430libsrc = libcfa-prelude.c startup.c interpose.c bits/debug.c assert.c \
     431        exception.c virtual.c heap.c ${headers:=.c} $(am__append_4)
    434432libcfa_a_SOURCES = ${libsrc}
    435433libcfa_a_CFLAGS = -nodebug -O2
    … …  
    456454.SUFFIXES:
    457455.SUFFIXES: .S .c .o .obj
    458 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
     456$(srcdir)/Makefile.in: $(srcdir)/Makefile.am  $(am__configure_deps)
    459457        @for dep in $?; do \
    460458          case '$(am__configure_deps)' in \
    … …  
    480478        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    481479
    482 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     480$(top_srcdir)/configure: $(am__configure_deps)
    483481        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    484 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
     482$(ACLOCAL_M4): $(am__aclocal_m4_deps)
    485483        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    486484$(am__aclocal_m4_deps):
    … …  
    709707@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-libcfa-prelude.obj `if test -f 'libcfa-prelude.c'; then $(CYGPATH_W) 'libcfa-prelude.c'; else $(CYGPATH_W) '$(srcdir)/libcfa-prelude.c'; fi`
    710708
     709libcfa_d_a-startup.o: startup.c
     710@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-startup.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-startup.Tpo -c -o libcfa_d_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
     711@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-startup.Tpo $(DEPDIR)/libcfa_d_a-startup.Po
     712@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_d_a-startup.o' libtool=no @AMDEPBACKSLASH@
     713@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     714@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-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
     715
     716libcfa_d_a-startup.obj: startup.c
     717@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-startup.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-startup.Tpo -c -o libcfa_d_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
     718@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-startup.Tpo $(DEPDIR)/libcfa_d_a-startup.Po
     719@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_d_a-startup.obj' libtool=no @AMDEPBACKSLASH@
     720@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     721@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-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
     722
    711723libcfa_d_a-interpose.o: interpose.c
    712724@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-interpose.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-interpose.Tpo -c -o libcfa_d_a-interpose.o `test -f 'interpose.c' || echo '$(srcdir)/'`interpose.c
    … …  
    779791@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-heap.obj `if test -f 'heap.c'; then $(CYGPATH_W) 'heap.c'; else $(CYGPATH_W) '$(srcdir)/heap.c'; fi`
    780792
    781 libcfa_d_a-startup.o: startup.c
    782 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-startup.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-startup.Tpo -c -o libcfa_d_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
    783 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-startup.Tpo $(DEPDIR)/libcfa_d_a-startup.Po
    784 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_d_a-startup.o' libtool=no @AMDEPBACKSLASH@
    785 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    786 @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-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
    787 
    788 libcfa_d_a-startup.obj: startup.c
    789 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-startup.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-startup.Tpo -c -o libcfa_d_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
    790 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-startup.Tpo $(DEPDIR)/libcfa_d_a-startup.Po
    791 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_d_a-startup.obj' libtool=no @AMDEPBACKSLASH@
    792 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    793 @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-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
    794 
    795793libcfa_d_a-fstream.o: fstream.c
    796794@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-fstream.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-fstream.Tpo -c -o libcfa_d_a-fstream.o `test -f 'fstream.c' || echo '$(srcdir)/'`fstream.c
    … …  
    10731071@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-libcfa-prelude.obj `if test -f 'libcfa-prelude.c'; then $(CYGPATH_W) 'libcfa-prelude.c'; else $(CYGPATH_W) '$(srcdir)/libcfa-prelude.c'; fi`
    10741072
     1073libcfa_a-startup.o: startup.c
     1074@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-startup.o -MD -MP -MF $(DEPDIR)/libcfa_a-startup.Tpo -c -o libcfa_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
     1075@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-startup.Tpo $(DEPDIR)/libcfa_a-startup.Po
     1076@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_a-startup.o' libtool=no @AMDEPBACKSLASH@
     1077@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1078@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
     1079
     1080libcfa_a-startup.obj: startup.c
     1081@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-startup.obj -MD -MP -MF $(DEPDIR)/libcfa_a-startup.Tpo -c -o libcfa_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
     1082@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-startup.Tpo $(DEPDIR)/libcfa_a-startup.Po
     1083@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_a-startup.obj' libtool=no @AMDEPBACKSLASH@
     1084@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1085@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
     1086
    10751087libcfa_a-interpose.o: interpose.c
    10761088@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-interpose.o -MD -MP -MF $(DEPDIR)/libcfa_a-interpose.Tpo -c -o libcfa_a-interpose.o `test -f 'interpose.c' || echo '$(srcdir)/'`interpose.c
    … …  
    11421154@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    11431155@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-heap.obj `if test -f 'heap.c'; then $(CYGPATH_W) 'heap.c'; else $(CYGPATH_W) '$(srcdir)/heap.c'; fi`
    1144 
    1145 libcfa_a-startup.o: startup.c
    1146 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-startup.o -MD -MP -MF $(DEPDIR)/libcfa_a-startup.Tpo -c -o libcfa_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
    1147 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-startup.Tpo $(DEPDIR)/libcfa_a-startup.Po
    1148 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_a-startup.o' libtool=no @AMDEPBACKSLASH@
    1149 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1150 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
    1151 
    1152 libcfa_a-startup.obj: startup.c
    1153 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-startup.obj -MD -MP -MF $(DEPDIR)/libcfa_a-startup.Tpo -c -o libcfa_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
    1154 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-startup.Tpo $(DEPDIR)/libcfa_a-startup.Po
    1155 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='startup.c' object='libcfa_a-startup.obj' libtool=no @AMDEPBACKSLASH@
    1156 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1157 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi`
    11581156
    11591157libcfa_a-fstream.o: fstream.c
    … …  
    16781676
    16791677# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
     1678# SKULLDUGGERY in order to make sure this isn't called make the rule always fail but also create a rule for headers
    16801679% : %.c
    1681         @true
     1680        echo "Dummy rule, should never be called"
     1681        false
     1682
     1683# This rule should always match headers and since it has no prerequisite it will never be called
     1684$(addprefix $(srcdir)/,$(headers)):
     1685        echo "Dummy rule, should never be called"
     1686        false
    16821687
    16831688concurrency/libcfa_a-invoke.o : concurrency/invoke.c

  • src/libcfa/heap.c

    rba4a1d8 r04e367c  
    1010// Created On       : Tue Dec 19 21:58:35 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Jul 25 16:42:02 2018
    13 // Update Count     : 438
     12// Last Modified On : Thu Jul 26 22:28:23 2018
     13// Update Count     : 449
    1414//
    1515
    … …  
    111111//      return temp;
    112112// } // prtHeapTermOff
     113
     114
     115#ifdef __CFA_DEBUG__
     116static unsigned int allocfree;                                                  // running total of allocations minus frees
     117static unsigned int appStart;                                                   // storage allocation when application starts
     118
     119static void checkUnfreed() {
     120        unsigned int total = allocfree - appStart;
     121    if ( total != 0 ) {
     122                // DO NOT USE STREAMS AS THEY MAY BE UNAVAILABLE AT THIS POINT.
     123                // char helpText[512];
     124                // int len = snprintf( helpText, 512, "CFA warning (UNIX pid:%ld) : program terminating with %u(0x%x) bytes of storage allocated but not freed.\n"
     125                //                                      "Possible cause is unfreed storage allocated by the program or system/library routines called from the program.\n",
     126                //                                      (long int)getpid(), total, total ); // always print the UNIX pid
     127                // __cfaabi_dbg_bits_write( helpText, len );
     128    } // if
     129} // checkUnfreed
     130
     131extern "C" {
     132void heapAppStart() {                                                                   // called by __cfaabi_appready_startup
     133        appStart = allocfree;
     134} // heapAppStart
     135
     136void heapAppStop() {                                                                    // called by __cfaabi_appready_startdown
     137        checkUnfreed();
     138} // heapAppStop
     139} // extern "C"
     140#endif // __CFA_DEBUG__
    113141
    114142
    … …  
    139167static int mmapFd = -1;                                                                 // fake or actual fd for anonymous file
    140168
    141 static unsigned int allocfree;                                                  // running total of allocations minus frees
    142 static unsigned int appStart;                                                   // storage allocation when application starts
    143 
    144 static void checkUnfreed() {
    145         #ifdef __CFA_DEBUG__
    146         unsigned int total = allocfree - appStart;
    147     if ( total != 0 ) {
    148                 // DO NOT USE STREAMS AS THEY MAY BE UNAVAILABLE AT THIS POINT.
    149                 // char helpText[512];
    150                 // int len = snprintf( helpText, 512, "CFA warning (UNIX pid:%ld) : program terminating with %u(0x%x) bytes of storage allocated but not freed.\n"
    151                 //                                      "Possible cause is unfreed storage allocated by the program or system/library routines called from the program.\n",
    152                 //                                      (long int)getpid(), total, total ); // always print the UNIX pid
    153                 // __cfaabi_dbg_bits_write( helpText, len );
    154     } // if
    155         #endif // __CFA_DEBUG__
    156 } // checkUnfreed
    157 
    158 #ifdef __CFA_DEBUG__
    159 extern "C" {
    160 void heapAppStart() {                                                                   // called by __cfaabi_appready_startup
    161         appStart = allocfree;
    162 } // heapAppStart
    163 
    164 void heapAppStop() {                                                                    // called by __cfaabi_appready_startdown
    165         checkUnfreed();
    166 } // heapAppStop
    167 } // extern "C"
    168 #endif // __CFA_DEBUG__
    169 
    170169
    171170struct HeapManager {
    … …  
    178177                                        union {
    179178                                                struct {                                                // 32-bit word => 64-bit header, 64-bit word => 128-bit header
    180                                                         #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ && __U_WORDSIZE__ == 32
     179                                                        #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ && __SIZEOF_POINTER__ == 4
    181180                                                        uint32_t padding;                       // unused, force home/blocksize to overlay alignment in fake header
    182                                                         #endif // __U_WORDSIZE__ == 32 && __U_WORDSIZE__ == 32
     181                                                        #endif // __ORDER_BIG_ENDIAN__ && __U_WORDSIZE__ == 32
    183182
    184183                                                        union {
    … …  
    191190                                                        };
    192191
    193                                                         #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ && __U_WORDSIZE__ == 32
     192                                                        #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && __SIZEOF_POINTER__ == 4
    194193                                                        uint32_t padding;                       // unused, force home/blocksize to overlay alignment in fake header
    195                                                         #endif // __U_WORDSIZE__ == 32 && __U_WORDSIZE__ == 32
     194                                                        #endif // __ORDER_LITTLE_ENDIAN__ && __U_WORDSIZE__ == 32
    196195
    197196                                                };
    … …  
    204203                                        #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
    205204                                        uint32_t alignment;                                     // low-order bits of home/blockSize used for tricks
    206                                         #endif // __BYTE_ORDER__
     205                                        #endif // __ORDER_LITTLE_ENDIAN__
    207206
    208207                                        uint32_t offset;
    … …  
    210209                                        #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
    211210                                        uint32_t alignment;                                     // low-order bits of home/blockSize used for tricks
    212                                         #endif // __BYTE_ORDER__
     211                                        #endif // __ORDER_BIG_ENDIAN__
    213212                                } fake;
    214213                        } kind;
    … …  
    305304        #endif // __CFA_DEBUG__
    306305
     306        assert( heapManager.heapBegin == 0 );
    307307        heapManager{};
    308308} // memory_startup
    … …  
    672672
    673673static inline void * malloc2( size_t size ) {                   // necessary for malloc statistics
    674     assert( heapManager.heapBegin != 0 ) ;                              // heap started
     674        assert( heapManager.heapBegin != 0 );
    675675    void * area = doMalloc( size );
    676676    if ( unlikely( area == 0 ) ) errno = ENOMEM;                // POSIX

  • src/libcfa/startup.c

    rba4a1d8 r04e367c  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // startup.c -- 
    8 // 
     6//
     7// startup.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Tue Jul 24 16:21:57 2018
    … …  
    1212// Last Modified On : Wed Jul 25 16:42:01 2018
    1313// Update Count     : 11
    14 // 
     14//
    1515
    1616#include "startup.h"
    … …  
    3939} // extern "C"
    4040
     41struct __spinlock_t;
     42void __cfaabi_dbg_record(struct __spinlock_t & this, const char * prev_name) __attribute__(( weak )) {}
     43
    4144// Local Variables: //
    4245// mode: c //

  • src/libcfa/stdlib

    rba4a1d8 r04e367c  
    1010// Created On       : Thu Jan 28 17:12:35 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Jul 23 07:44:47 2018
    13 // Update Count     : 341
     12// Last Modified On : Fri Jul 27 07:21:36 2018
     13// Update Count     : 345
    1414//
    1515
    … …  
    1919extern "C" {
    2020        void * memalign( size_t align, size_t size );           // malloc.h
    21         void * memset( void * dest, int c, size_t size );       // string.h
     21        void * memset( void * dest, int fill, size_t size ); // string.h
    2222        void * memcpy( void * dest, const void * src, size_t size ); // string.h
    2323    void * cmemalign( size_t alignment, size_t noOfElems, size_t elemSize ); // CFA
    … …  
    127127        // data, non-array types
    128128
    129         T * memset( T * dest, char c ) {
    130                 return (T *)memset( dest, c, sizeof(T) );
     129        T * memset( T * dest, char fill ) {
     130                return (T *)memset( dest, fill, sizeof(T) );
    131131        } // memset
    132132
    … …  
    139139        // data, array types
    140140
    141         T * memset( T dest[], size_t dim, char c ) {
    142                 return (T *)(void *)memset( dest, c, dim * sizeof(T) ); // C memset
    143         } // memset
    144 
    145         T * memcpy( T dest[], const T src[], size_t dim ) {
     141        T * amemset( T dest[], char fill, size_t dim ) {
     142                return (T *)(void *)memset( dest, fill, dim * sizeof(T) ); // C memset
     143        } // amemset
     144
     145        T * amemcpy( T dest[], const T src[], size_t dim ) {
    146146                return (T *)(void *)memcpy( dest, src, dim * sizeof(T) ); // C memcpy
    147         } // memcpy
     147        } // amemcpy
    148148} // distribution
    149149
    … …  
    203203        E * bsearchu( E key, const E * vals, size_t dim );
    204204        size_t bsearchu( E key, const E * vals, size_t dim );
    205 
    206         void qsort( E * vals, size_t dim );
    207205} // distribution
    208206
    … …  
    214212        E * bsearchu( K key, const E * vals, size_t dim );
    215213        size_t bsearchu( K key, const E * vals, size_t dim );
     214} // distribution
     215
     216forall( otype E | { int ?<?( E, E ); } ) {
     217        void qsort( E * vals, size_t dim );
    216218} // distribution
    217219
Note: See TracChangeset for help on using the changeset viewer.