Changeset 7a560c1 for src/libcfa/concurrency

Timestamp:

Feb 2, 2017, 4:06:26 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

6215a5c, 7d6639d

Parents:

fa2de95 (diff), 99b75cab (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:

src/libcfa/concurrency

Files:

• CtxSwitch-x86_64.S (modified) (2 diffs)
• coroutines (modified) (2 diffs)
• invoke.c (modified) (2 diffs)
• kernel.c (modified) (1 diff)
• threads (modified) (1 diff)

src/libcfa/concurrency/CtxSwitch-x86_64.S

@@ -49 +49 @@
         // Save volatile registers on the stack.
 
+        subq   $8,%rsp
+        stmxcsr 0(%rsp)         // 4 bytes
+        fnstcw  4(%rsp)         // 2 bytes
         pushq %r15
         pushq %r14
@@ -72 +75 @@
         popq %r14
         popq %r15
+        fldcw   4(%rsp)
+        ldmxcsr 0(%rsp)
+        addq $8,%rsp
 
         // Return to thread.

src/libcfa/concurrency/coroutines

@@ -30 +30 @@
 };
 
-#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this);
+#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this)
 
 //-----------------------------------------------------------------------------
@@ -110 +110 @@
 }
 
+static inline void resume(coroutine * dst) {
+        coroutine * src = this_coroutine();             // optimization
+
+      // not resuming self ?
+        if ( src != dst ) {
+                assertf( dst->notHalted ,
+                        "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
+                        "Possible cause is terminated coroutine's main routine has already returned.",
+                        src->name, src, dst->name, dst );
+
+            // set last resumer
+                dst->last = src;
+        } // if
+
+      // always done for performance testing
+        CoroutineCtxSwitch( src, dst );
+}
+
 #endif //COROUTINES_H
 

src/libcfa/concurrency/invoke.c

@@ -109 +109 @@
       struct FakeStack {
             void *fixedRegisters[5];                    // fixed registers rbx, r12, r13, r14, r15
-            void *rturn;                                        // where to go on return from uSwitch
+            uint32_t mxcr;                                  // SSE Status and Control bits (control bits are preserved across function calls)
+            uint16_t fcw;                                   // X97 FPU control word (preserved across function calls)
+            void *rturn;                                      // where to go on return from uSwitch
             void *dummyReturn;                          // NULL return address to provide proper alignment
       };
@@ -120 +122 @@
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = this;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->mxcr = 0x1F80; //Vol. 2A 3-520
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7 
 #else
       #error Only __i386__ and __x86_64__ is supported for threads in cfa

src/libcfa/concurrency/kernel.c

@@ -43 +43 @@
 };
 
-DECL_COROUTINE(processorCtx_t)
+DECL_COROUTINE(processorCtx_t);
 
 #define KERNEL_STORAGE(T,X) static char X##_storage[sizeof(T)]

src/libcfa/concurrency/threads

@@ -32 +32 @@
 };
 
-#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this);
+#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this)
 
 forall( dtype T | is_thread(T) )