Changeset 884f1409 for libcfa/src


Ignore:
Timestamp:
Jul 19, 2019, 4:52:59 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
b5ce31e, fd642d2
Parents:
e723100 (diff), 335d81f (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:software/cfa/cfa-cc

Location:
libcfa/src
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • libcfa/src/Makefile.am

    re723100 r884f1409  
    2222
    2323libdir = ${CFA_LIBDIR}
    24 lib_LTLIBRARIES = libcfa.la
     24lib_LTLIBRARIES = libcfa.la libcfathread.la
    2525
    2626VPATH += :../prelude
    … …  
    4141          containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
    4242
    43 # not all platforms support concurrency, add option do disable it
    44 headers_nosrc += concurrency/invoke.h
    45 headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
    46 
    4743libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
    4844
    4945# not all platforms support concurrency, add option do disable it
    50 libsrc += concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
     46thread_headers_nosrc = concurrency/invoke.h
     47thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
     48thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa ${thread_headers:.hfa=.cfa}
    5149else
    5250headers =
     51thread_headers =
    5352headers_nosrc =
     53thread_headers_nosrc =
    5454libsrc =
    5555endif
    … …  
    6464$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    6565
     66thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
     67$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     68
    6669
    6770# .deps inclusion is not done automatically by automake for new languages
    … …  
    7275
    7376-include $(libdeps)
     77
     78thread_libdeps = $(join \
     79        $(addsuffix $(DEPDIR)/ , $(dir $(thread_libobjs) ) ), \
     80        $(notdir ${thread_libobjs:.lo=.Plo}) \
     81)
     82
     83-include $(thread_libdeps)
     84
    7485
    7586prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    … …  
    8596libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
    8697
     98libcfathread_la_SOURCES = ${thread_libsrc}
     99libcfathread_la_LDFLAGS = -version-info @CFA_VERSION@
     100
    87101stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
    88102
    89103cfa_includedir = $(CFA_INCDIR)
    90 nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
     104nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} ${thread_headers} ${thread_headers_nosrc}
    91105
    92106#----------------------------------------------------------------------------------------------------------------

  • libcfa/src/Makefile.in

    re723100 r884f1409  
    142142        time.cfa stdlib.cfa common.cfa containers/maybe.cfa \
    143143        containers/pair.cfa containers/result.cfa \
    144         containers/vector.cfa concurrency/coroutine.cfa \
    145         concurrency/thread.cfa concurrency/kernel.cfa \
    146         concurrency/monitor.cfa concurrency/mutex.cfa \
    147         concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
    148         concurrency/invoke.c concurrency/preemption.cfa
     144        containers/vector.cfa
    149145am__dirstamp = $(am__leading_dot)dirstamp
    150146@BUILDLIB_TRUE@am__objects_1 = fstream.lo iostream.lo iterator.lo \
    … …  
    152148@BUILDLIB_TRUE@ common.lo containers/maybe.lo \
    153149@BUILDLIB_TRUE@ containers/pair.lo containers/result.lo \
    154 @BUILDLIB_TRUE@ containers/vector.lo concurrency/coroutine.lo \
    155 @BUILDLIB_TRUE@ concurrency/thread.lo concurrency/kernel.lo \
    156 @BUILDLIB_TRUE@ concurrency/monitor.lo concurrency/mutex.lo
     150@BUILDLIB_TRUE@ containers/vector.lo
    157151@BUILDLIB_TRUE@am__objects_2 = startup.lo interpose.lo bits/debug.lo \
    158152@BUILDLIB_TRUE@ assert.lo exception.lo virtual.lo heap.lo \
    159 @BUILDLIB_TRUE@ $(am__objects_1) \
    160 @BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.lo \
    161 @BUILDLIB_TRUE@ concurrency/alarm.lo concurrency/invoke.lo \
    162 @BUILDLIB_TRUE@ concurrency/preemption.lo
     153@BUILDLIB_TRUE@ $(am__objects_1)
    163154am_libcfa_la_OBJECTS = prelude.lo $(am__objects_2)
    164155libcfa_la_OBJECTS = $(am_libcfa_la_OBJECTS)
    … …  
    170161        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    171162        $(libcfa_la_LDFLAGS) $(LDFLAGS) -o $@
     163libcfathread_la_LIBADD =
     164am__libcfathread_la_SOURCES_DIST =  \
     165        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
     166        concurrency/invoke.c concurrency/preemption.cfa \
     167        concurrency/coroutine.cfa concurrency/thread.cfa \
     168        concurrency/kernel.cfa concurrency/monitor.cfa \
     169        concurrency/mutex.cfa
     170@BUILDLIB_TRUE@am__objects_3 = concurrency/coroutine.lo \
     171@BUILDLIB_TRUE@ concurrency/thread.lo concurrency/kernel.lo \
     172@BUILDLIB_TRUE@ concurrency/monitor.lo concurrency/mutex.lo
     173@BUILDLIB_TRUE@am__objects_4 =  \
     174@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.lo \
     175@BUILDLIB_TRUE@ concurrency/alarm.lo concurrency/invoke.lo \
     176@BUILDLIB_TRUE@ concurrency/preemption.lo $(am__objects_3)
     177am_libcfathread_la_OBJECTS = $(am__objects_4)
     178libcfathread_la_OBJECTS = $(am_libcfathread_la_OBJECTS)
     179libcfathread_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
     180        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
     181        $(AM_CFLAGS) $(CFLAGS) $(libcfathread_la_LDFLAGS) $(LDFLAGS) \
     182        -o $@
    172183AM_V_P = $(am__v_P_@AM_V@)
    173184am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    … …  
    214225am__v_CCLD_0 = @echo "  CCLD    " $@;
    215226am__v_CCLD_1 =
    216 SOURCES = $(libcfa_la_SOURCES)
    217 DIST_SOURCES = $(am__libcfa_la_SOURCES_DIST)
     227SOURCES = $(libcfa_la_SOURCES) $(libcfathread_la_SOURCES)
     228DIST_SOURCES = $(am__libcfa_la_SOURCES_DIST) \
     229        $(am__libcfathread_la_SOURCES_DIST)
    218230am__can_run_installinfo = \
    219231  case $$AM_UPDATE_INFO_DIR in \
    … …  
    225237        limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    226238        containers/maybe.hfa containers/pair.hfa containers/result.hfa \
    227         containers/vector.hfa concurrency/coroutine.hfa \
     239        containers/vector.hfa math.hfa gmp.hfa time_t.hfa \
     240        bits/align.hfa bits/containers.hfa bits/defs.hfa \
     241        bits/debug.hfa bits/locks.hfa concurrency/coroutine.hfa \
    228242        concurrency/thread.hfa concurrency/kernel.hfa \
    229         concurrency/monitor.hfa concurrency/mutex.hfa math.hfa gmp.hfa \
    230         time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa \
    231         bits/debug.hfa bits/locks.hfa concurrency/invoke.h
     243        concurrency/monitor.hfa concurrency/mutex.hfa \
     244        concurrency/invoke.h
    232245HEADERS = $(nobase_cfa_include_HEADERS)
    233246am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    … …  
    421434am__v_UPP_0 = @echo "  UPP     " $@;
    422435am__v_UPP_1 =
    423 lib_LTLIBRARIES = libcfa.la
     436lib_LTLIBRARIES = libcfa.la libcfathread.la
    424437
    425438# AM_CFLAGS for all cfa source
    … …  
    433446
    434447#----------------------------------------------------------------------------------------------------------------
     448@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
     449@BUILDLIB_FALSE@headers =
     450@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
     451@BUILDLIB_TRUE@   containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
     452
     453@BUILDLIB_FALSE@libsrc =
     454@BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
     455@BUILDLIB_FALSE@thread_headers_nosrc =
    435456
    436457# not all platforms support concurrency, add option do disable it
    437 @BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa \
    438 @BUILDLIB_TRUE@ bits/align.hfa bits/containers.hfa \
    439 @BUILDLIB_TRUE@ bits/defs.hfa bits/debug.hfa bits/locks.hfa \
    440 @BUILDLIB_TRUE@ concurrency/invoke.h
    441 @BUILDLIB_FALSE@headers =
    442 @BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa \
    443 @BUILDLIB_TRUE@ limits.hfa rational.hfa time.hfa stdlib.hfa \
    444 @BUILDLIB_TRUE@ common.hfa containers/maybe.hfa \
    445 @BUILDLIB_TRUE@ containers/pair.hfa containers/result.hfa \
    446 @BUILDLIB_TRUE@ containers/vector.hfa concurrency/coroutine.hfa \
    447 @BUILDLIB_TRUE@ concurrency/thread.hfa concurrency/kernel.hfa \
    448 @BUILDLIB_TRUE@ concurrency/monitor.hfa concurrency/mutex.hfa
    449 @BUILDLIB_FALSE@libsrc =
    450 
    451 # not all platforms support concurrency, add option do disable it
    452 @BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa \
    453 @BUILDLIB_TRUE@ assert.cfa exception.c virtual.c heap.cfa \
    454 @BUILDLIB_TRUE@ ${headers:.hfa=.cfa} \
    455 @BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.S \
    456 @BUILDLIB_TRUE@ concurrency/alarm.cfa concurrency/invoke.c \
    457 @BUILDLIB_TRUE@ concurrency/preemption.cfa
     458@BUILDLIB_TRUE@thread_headers_nosrc = concurrency/invoke.h
     459@BUILDLIB_FALSE@thread_headers =
     460@BUILDLIB_TRUE@thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
     461@BUILDLIB_TRUE@thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa ${thread_headers:.hfa=.cfa}
    458462
    459463#----------------------------------------------------------------------------------------------------------------
    … …  
    463467# add dependency of cfa files
    464468libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(libsrc))))
     469thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
    465470
    466471# .deps inclusion is not done automatically by automake for new languages
    … …  
    470475)
    471476
     477thread_libdeps = $(join \
     478        $(addsuffix $(DEPDIR)/ , $(dir $(thread_libobjs) ) ), \
     479        $(notdir ${thread_libobjs:.lo=.Plo}) \
     480)
     481
    472482
    473483#----------------------------------------------------------------------------------------------------------------
    474484libcfa_la_SOURCES = prelude.cfa ${libsrc}
    475485libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
     486libcfathread_la_SOURCES = ${thread_libsrc}
     487libcfathread_la_LDFLAGS = -version-info @CFA_VERSION@
    476488stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
    477489cfa_includedir = $(CFA_INCDIR)
    478 nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
     490nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} ${thread_headers} ${thread_headers_nosrc}
    479491all: all-am
    480492
    … …  
    567579containers/vector.lo: containers/$(am__dirstamp) \
    568580        containers/$(DEPDIR)/$(am__dirstamp)
     581
     582libcfa.la: $(libcfa_la_OBJECTS) $(libcfa_la_DEPENDENCIES) $(EXTRA_libcfa_la_DEPENDENCIES)
     583        $(AM_V_CCLD)$(libcfa_la_LINK) -rpath $(libdir) $(libcfa_la_OBJECTS) $(libcfa_la_LIBADD) $(LIBS)
    569584concurrency/$(am__dirstamp):
    570585        @$(MKDIR_P) concurrency
    … …  
    573588        @$(MKDIR_P) concurrency/$(DEPDIR)
    574589        @: > concurrency/$(DEPDIR)/$(am__dirstamp)
     590concurrency/CtxSwitch-@ARCHITECTURE@.lo: concurrency/$(am__dirstamp) \
     591        concurrency/$(DEPDIR)/$(am__dirstamp)
     592concurrency/alarm.lo: concurrency/$(am__dirstamp) \
     593        concurrency/$(DEPDIR)/$(am__dirstamp)
     594concurrency/invoke.lo: concurrency/$(am__dirstamp) \
     595        concurrency/$(DEPDIR)/$(am__dirstamp)
     596concurrency/preemption.lo: concurrency/$(am__dirstamp) \
     597        concurrency/$(DEPDIR)/$(am__dirstamp)
    575598concurrency/coroutine.lo: concurrency/$(am__dirstamp) \
    576599        concurrency/$(DEPDIR)/$(am__dirstamp)
    … …  
    583606concurrency/mutex.lo: concurrency/$(am__dirstamp) \
    584607        concurrency/$(DEPDIR)/$(am__dirstamp)
    585 concurrency/CtxSwitch-@ARCHITECTURE@.lo: concurrency/$(am__dirstamp) \
    586         concurrency/$(DEPDIR)/$(am__dirstamp)
    587 concurrency/alarm.lo: concurrency/$(am__dirstamp) \
    588         concurrency/$(DEPDIR)/$(am__dirstamp)
    589 concurrency/invoke.lo: concurrency/$(am__dirstamp) \
    590         concurrency/$(DEPDIR)/$(am__dirstamp)
    591 concurrency/preemption.lo: concurrency/$(am__dirstamp) \
    592         concurrency/$(DEPDIR)/$(am__dirstamp)
    593 
    594 libcfa.la: $(libcfa_la_OBJECTS) $(libcfa_la_DEPENDENCIES) $(EXTRA_libcfa_la_DEPENDENCIES)
    595         $(AM_V_CCLD)$(libcfa_la_LINK) -rpath $(libdir) $(libcfa_la_OBJECTS) $(libcfa_la_LIBADD) $(LIBS)
     608
     609libcfathread.la: $(libcfathread_la_OBJECTS) $(libcfathread_la_DEPENDENCIES) $(EXTRA_libcfathread_la_DEPENDENCIES)
     610        $(AM_V_CCLD)$(libcfathread_la_LINK) -rpath $(libdir) $(libcfathread_la_OBJECTS) $(libcfathread_la_LIBADD) $(LIBS)
    596611
    597612mostlyclean-compile:
    … …  
    922937        $(am__mv) $$depbase.Tpo $$depbase.Plo
    923938$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     939$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    924940
    925941-include $(libdeps)
     942
     943-include $(thread_libdeps)
    926944
    927945prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@

  • libcfa/src/bits/defs.hfa

    re723100 r884f1409  
    4141}
    4242#endif
     43
     44#if defined(__cforall_thread__)
     45#define OPTIONAL_THREAD
     46#else
     47#define OPTIONAL_THREAD __attribute__((weak))
     48#endif

  • libcfa/src/bits/locks.hfa

    re723100 r884f1409  
    5050#ifdef __cforall
    5151        extern "C" {
    52                 extern void disable_interrupts();
    53                 extern void enable_interrupts_noPoll();
     52                extern void disable_interrupts() OPTIONAL_THREAD;
     53                extern void enable_interrupts_noPoll() OPTIONAL_THREAD;
    5454
    5555                #ifdef __CFA_DEBUG__

  • libcfa/src/concurrency/alarm.cfa

    re723100 r884f1409  
    1313// Update Count     : 67
    1414//
     15
     16#define __cforall_thread__
    1517
    1618extern "C" {

  • libcfa/src/concurrency/coroutine.cfa

    re723100 r884f1409  
    1313// Update Count     : 9
    1414//
     15
     16#define __cforall_thread__
    1517
    1618#include "coroutine.hfa"

  • libcfa/src/concurrency/invoke.c

    re723100 r884f1409  
    1313// Update Count     : 5
    1414//
     15
     16#define __cforall_thread__
    1517
    1618#include <stdbool.h>
    … …  
    3133extern void __finish_creation( struct thread_desc * );
    3234extern void __leave_thread_monitor( struct thread_desc * this );
    33 extern void disable_interrupts();
     35extern void disable_interrupts() OPTIONAL_THREAD;
    3436extern void enable_interrupts( __cfaabi_dbg_ctx_param );
    3537

  • libcfa/src/concurrency/kernel.cfa

    re723100 r884f1409  
    1313// Update Count     : 25
    1414//
     15
     16#define __cforall_thread__
    1517
    1618//C Includes
    … …  
    943945        }
    944946)
     947
     948//-----------------------------------------------------------------------------
     949// Debug
     950bool threading_enabled(void) {
     951        return true;
     952}
    945953// Local Variables: //
    946954// mode: c //

  • libcfa/src/concurrency/kernel_private.hfa

    re723100 r884f1409  
    2626
    2727extern "C" {
    28         void disable_interrupts();
     28        void disable_interrupts() OPTIONAL_THREAD;
    2929        void enable_interrupts_noPoll();
    3030        void enable_interrupts( __cfaabi_dbg_ctx_param );

  • libcfa/src/concurrency/monitor.cfa

    re723100 r884f1409  
    1313// Update Count     : 9
    1414//
     15
     16#define __cforall_thread__
    1517
    1618#include "monitor.hfa"

  • libcfa/src/concurrency/mutex.cfa

    re723100 r884f1409  
    1515// Update Count     : 0
    1616//
     17
     18#define __cforall_thread__
    1719
    1820#include "mutex.hfa"

  • libcfa/src/concurrency/preemption.cfa

    re723100 r884f1409  
    1313// Update Count     : 37
    1414//
     15
     16#define __cforall_thread__
    1517
    1618#include "preemption.hfa"

  • libcfa/src/concurrency/thread.cfa

    re723100 r884f1409  
    1313// Update Count     : 8
    1414//
     15
     16#define __cforall_thread__
    1517
    1618#include "thread.hfa"

  • libcfa/src/stdlib.cfa

    re723100 r884f1409  
    252252long double _Complex random( void ) { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
    253253
     254//---------------------------------------
     255
     256bool threading_enabled(void) __attribute__((weak)) {
     257        return false;
     258}
    254259
    255260// Local Variables: //

  • libcfa/src/stdlib.hfa

    re723100 r884f1409  
    1515
    1616#pragma once
     17
     18#include "bits/defs.hfa"
    1719
    1820#include <stdlib.h>                                                                             // *alloc, strto*, ato*
    … …  
    246248#include "common.hfa"
    247249
     250//---------------------------------------
     251
     252extern bool threading_enabled(void) OPTIONAL_THREAD;
     253
    248254// Local Variables: //
    249255// mode: c //
Note: See TracChangeset for help on using the changeset viewer.