Changeset 53ee27e for libcfa/src/concurrency/invoke.h

Timestamp:

Aug 4, 2020, 5:13:51 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

eafec07

Parents:

3f850d7 (diff), 21b0a23 (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

File:

• libcfa/src/concurrency/invoke.h (modified) (3 diffs)

libcfa/src/concurrency/invoke.h

@@ -17 +17 @@
 #include "bits/defs.hfa"
 #include "bits/locks.hfa"
+#include "kernel/fwd.hfa"
 
 #ifdef __cforall
@@ -25 +26 @@
 #ifndef _INVOKE_H_
 #define _INVOKE_H_
-
-#ifdef __ARM_ARCH
-        // function prototypes are only really used by these macros on ARM
-        void disable_global_interrupts();
-        void enable_global_interrupts();
-
-        #define TL_GET( member ) ( { __typeof__( kernelTLS.member ) target; \
-                disable_global_interrupts(); \
-                target = kernelTLS.member; \
-                enable_global_interrupts(); \
-                target; } )
-        #define TL_SET( member, value ) disable_global_interrupts(); \
-                kernelTLS.member = value; \
-                enable_global_interrupts();
-#else
-        #define TL_GET( member ) kernelTLS.member
-        #define TL_SET( member, value ) kernelTLS.member = value;
-#endif
-
-        #ifdef __cforall
-        extern "Cforall" {
-                extern __attribute__((aligned(128))) thread_local struct KernelThreadData {
-                        struct $thread    * volatile this_thread;
-                        struct processor  * volatile this_processor;
-                        struct __stats_t  * volatile this_stats;
-
-                        struct {
-                                volatile unsigned short disable_count;
-                                volatile bool enabled;
-                                volatile bool in_progress;
-                        } preemption_state;
-
-                        #if defined(__SIZEOF_INT128__)
-                                __uint128_t rand_seed;
-                        #else
-                                uint64_t rand_seed;
-                        #endif
-                } kernelTLS __attribute__ ((tls_model ( "initial-exec" )));
-        }
-        #endif
 
         struct __stack_context_t {
@@ -98 +59 @@
 
         enum __Coroutine_State { Halted, Start, Primed, Blocked, Ready, Active };
-        enum __Preemption_Reason { __NO_PREEMPTION, __ALARM_PREEMPTION, __POLL_PREEMPTION, __MANUAL_PREEMPTION };
 
         struct $coroutine {