Changeset d9c44c3

Timestamp:

Dec 6, 2016, 4:16:47 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

fa66f4e

Parents:

e4745d7a

Message:

Implemented coroutine for i386 and added coroutines to tests

Location:

src

Files:

• libcfa/assert (modified) (2 diffs)
• libcfa/concurrency/invoke.c (modified) (5 diffs)
• libcfa/concurrency/threads.c (modified) (2 diffs)
• libcfa/libhdr/libdebug.h (modified) (1 diff)
• libcfa/stdhdr/assert.h (modified) (1 diff)
• tests/.expect/coroutine.txt (added)
• tests/coroutine.c (moved) (moved from src/examples/coroutine.c) (2 diffs)

src/libcfa/assert

@@ -17 +17 @@
 #define __ASSERT_H__
 
+#ifdef __CFORALL__
 extern "C" {
+#endif //__CFORALL__
+
         #include <assert.h>
 
@@ -29 +32 @@
                 void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) __attribute__((noreturn));
         #endif
-}
+        
+#ifdef __CFORALL__
+} // extern "C"
+#endif //__CFORALL__
 
 #endif // __ASSERT_H__

src/libcfa/concurrency/invoke.c

@@ -4 +4 @@
 #include <stdio.h>
 
+#include "libhdr.h"
 #include "invoke.h"
 
@@ -18 +19 @@
 void __invokeCoroutine__F_P9scoVtablePv__1(struct coVtable *vtable, void* vthis)
 {
-      printf("Invoke : Received %p (v %p)\n", vthis, vtable);
+      LIB_DEBUG_PRINTF("Invoke : Received %p (v %p)\n", vthis, vtable);
 
       struct coroutine* cor = vtable->this_coroutine(vthis);
@@ -34 +35 @@
       void (*invoke)(struct coVtable *, void *)
 ) {
-
-      #if ! defined( __x86_64__ ) && ! defined( __i386__ )
-            #error Only __x86_64__ and __i386__ is supported for threads in cfa
-      #endif
-
-      #if defined( __U_SWAPCONTEXT__ )
-            #error __U_SWAPCONTEXT__ should not be defined for __x86_64__
-      #endif
+      LIB_DEBUG_PRINTF("StartCoroutine : Passing in %p (v %p) to %p\n", vthis, vtable, invoke);
 
       struct coVtable * vtable = get_vtable( vthis );
@@ -47 +41 @@
       struct coStack_t* stack = &this->stack;
 
+#if defined( __i386__ )
+
+        struct FakeStack {
+            void *fixedRegisters[3];                    // fixed registers ebx, edi, esi (popped on 1st uSwitch, values unimportant)
+            void *rturn;                                      // where to go on return from uSwitch
+            void *dummyReturn;                          // fake return compiler would have pushed on call to uInvoke
+            void *argument[2];                          // for 16-byte ABI, 16-byte alignment starts here
+            void *padding[2];                           // padding to force 16-byte alignment, as "base" is 16-byte aligned
+        };
+
+        ((struct machine_context_t *)stack->context)->SP = (char *)stack->base - sizeof( struct FakeStack );
+        ((struct machine_context_t *)stack->context)->FP = NULL;                // terminate stack with NULL fp
+
+        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->dummyReturn = NULL;
+        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->argument[0] = vtable; // argument to invoke
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->argument[1] = vthis;  // argument to invoke
+        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = invoke;
+
+#elif defined( __x86_64__ )
+
       struct FakeStack {
             void *fixedRegisters[5];                    // fixed registers rbx, r12, r13, r14, r15
             void *rturn;                                        // where to go on return from uSwitch
             void *dummyReturn;                          // NULL return address to provide proper alignment
-      }; // FakeStack
+      };
 
       ((struct machine_context_t *)stack->context)->SP = (char *)stack->base - sizeof( struct FakeStack );
       ((struct machine_context_t *)stack->context)->FP = NULL;          // terminate stack with NULL fp
-
-      fprintf(stderr, "StartCoroutine : Passing in %p (v %p) to %p\n", vthis, vtable, invoke);
 
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->dummyReturn = NULL;
@@ -63 +75 @@
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = vthis;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[2] = invoke;
+#else
+      #error Only __i386__ and __x86_64__ is supported for threads in cfa
+#endif
 }

src/libcfa/concurrency/threads.c

@@ -166 +166 @@
         coroutine* dst = this_coroutine(cor);
 
-        fprintf(stderr, "Resuming %p from %p\n", dst, src);
         if ( src != dst ) {                             // not resuming self ?
                 assertf( dst->notHalted , 
@@ -172 +171 @@
                         "Possible cause is terminated coroutine's main routine has already returned.",
                         src->name, src, dst->name, dst );
-                fprintf(stderr, "Assigning last pointer\n");
                 dst->last = src;                                        // set last resumer
         } // if

src/libcfa/libhdr/libdebug.h

@@ -25 +25 @@
 #endif
 
+#ifdef __CFA_DEBUG_PRINT__
+      #define LIB_DEBUG_PRINTF(...)   printf (__VA_ARGS__)
+      #define LIB_DEBUG_FPRINTF(...) fprintf (stderr, __VA_ARGS__)
+#else
+      #define LIB_DEBUG_PRINTF(...)  ((void)0)
+      #define LIB_DEBUG_FPRINTF(...) ((void)0)
+#endif
+
 #endif //__LIB_DEBUG_H__
 

src/libcfa/stdhdr/assert.h

@@ -14 +14 @@
 // 
 
+#ifdef __CFORALL__
 extern "C" {
-#include_next <assert.h>                                                                // has internal check for multiple expansion
+#endif //__CFORALL__
+
+// has internal check for multiple expansion
+#include_next <assert.h>
+
+#ifdef __CFORALL__
 } // extern "C"
+#endif //__CFORALL__
 
 // Local Variables: //

src/tests/coroutine.c

@@ -28 +28 @@
 
 void co_main(Fibonacci* this) {
+#ifdef MORE_DEBUG
       sout | "Starting main of coroutine " | this | endl;
       sout | "Started from " | this_coroutine(this)->last | endl;
+#endif
       int fn1, fn2;             // retained between resumes
       this->fn = 0;
@@ -62 +64 @@
 
 int main() {
-      Fibonacci f1;
-      sout | "User coroutine : " | &f1 | endl;
+      Fibonacci f1, f2;
+#ifdef MORE_DEBUG      
+      sout | "User coroutines : " | &f1 | ' ' | &f1 | endl;
+#endif
       for ( int i = 1; i <= 10; i += 1 ) {
-            sout | next(&f1) | endl;
+            sout | next(&f1) | ' ' | next(&f2) | endl;
       }