--- cvsroot/libcoro/coro.c 2008/11/08 04:52:01 1.40 +++ cvsroot/libcoro/coro.c 2010/04/02 19:04:04 1.49 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2008 Marc Alexander Lehmann + * Copyright (c) 2001-2009 Marc Alexander Lehmann * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: @@ -80,12 +80,6 @@ static void *coro_init_arg; static coro_context *new_coro, *create_coro; -/* what we really want to detect here is wether we use a new-enough version of GAS */ -/* with dwarf debug info. instead, check for gcc 3, ELF and GNU/Linux and hope for the best */ -# if __GNUC__ >= 3 && __ELF__ && __linux__ -# define HAVE_CFI 1 -# endif - static void coro_init (void) { @@ -108,21 +102,8 @@ static void trampoline (int sig) { - if ( - #if _XOPEN_UNIX > 0 - _setjmp (new_coro->env) - #else - sigsetjmp (new_coro->env, 0) - #endif - ) { - #if HAVE_CFI - asm (".cfi_startproc"); - #endif - coro_init (); /* start it */ - #if HAVE_CFI - asm (".cfi_endproc"); - #endif - } + if (coro_setjmp (new_coro->env)) + coro_init (); /* start it */ else trampoline_done = 1; } @@ -137,7 +118,14 @@ ".type coro_transfer, @function\n" "coro_transfer:\n" #if __amd64 - #define NUM_SAVED 6 + #if CORO_WIN_TIB + #define NUM_SAVED 6+3 + "\tpush %fs:0x0\n" + "\tpush %fs:0x8\n" + "\tpush %fs:0xc\n" + #else + #define NUM_SAVED 6 + #endif "\tpush %rbp\n" "\tpush %rbx\n" "\tpush %r12\n" @@ -152,8 +140,20 @@ "\tpop %r12\n" "\tpop %rbx\n" "\tpop %rbp\n" + #if CORO_WIN_TIB + "\tpop %fs:0xc\n" + "\tpop %fs:0x8\n" + "\tpop %fs:0x0\n" + #endif #elif __i386 - #define NUM_SAVED 4 + #if CORO_WIN_TIB + #define NUM_SAVED 4+3 + "\tpush %fs:0x0\n" + "\tpush %fs:0x4\n" + "\tpush %fs:0x8\n" + #else + #define NUM_SAVED 4 + #endif "\tpush %ebp\n" "\tpush %ebx\n" "\tpush %esi\n" @@ -164,6 +164,11 @@ "\tpop %esi\n" "\tpop %ebx\n" "\tpop %ebp\n" + #if CORO_WIN_TIB + "\tpop %fs:0x8\n" + "\tpop %fs:0x4\n" + "\tpop %fs:0x0\n" + #endif #else #error unsupported architecture #endif @@ -243,51 +248,57 @@ # elif CORO_LOSER - setjmp (ctx->env); - #if __CYGWIN__ - ctx->env[7] = (long)((char *)sptr + ssize) - sizeof (long); - ctx->env[8] = (long)coro_init; + coro_setjmp (ctx->env); + #if __CYGWIN__ && __i386 + ctx->env[8] = (long) coro_init; + ctx->env[7] = (long) ((char *)sptr + ssize) - sizeof (long); + #elif __CYGWIN__ && __x86_64 + ctx->env[7] = (long) coro_init; + ctx->env[6] = (long) ((char *)sptr + ssize) - sizeof (long); + #elif defined(__MINGW32__) + ctx->env[5] = (long) coro_init; + ctx->env[4] = (long) ((char *)sptr + ssize) - sizeof (long); #elif defined(_M_IX86) - ((_JUMP_BUFFER *)&ctx->env)->Eip = (long)coro_init; - ((_JUMP_BUFFER *)&ctx->env)->Esp = (long)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long); + ((_JUMP_BUFFER *)&ctx->env)->Eip = (long) coro_init; + ((_JUMP_BUFFER *)&ctx->env)->Esp = (long) STACK_ADJUST_PTR (sptr, ssize) - sizeof (long); #elif defined(_M_AMD64) - ((_JUMP_BUFFER *)&ctx->env)->Rip = (__int64)coro_init; - ((_JUMP_BUFFER *)&ctx->env)->Rsp = (__int64)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long); + ((_JUMP_BUFFER *)&ctx->env)->Rip = (__int64) coro_init; + ((_JUMP_BUFFER *)&ctx->env)->Rsp = (__int64) STACK_ADJUST_PTR (sptr, ssize) - sizeof (__int64); #elif defined(_M_IA64) - ((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64)coro_init; - ((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long); + ((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64) coro_init; + ((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64) STACK_ADJUST_PTR (sptr, ssize) - sizeof (__int64); #else #error "microsoft libc or architecture not supported" #endif # elif CORO_LINUX - _setjmp (ctx->env); + coro_setjmp (ctx->env); #if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP) - ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init; - ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long); + ctx->env[0].__jmpbuf[JB_PC] = (long) coro_init; + ctx->env[0].__jmpbuf[JB_SP] = (long) STACK_ADJUST_PTR (sptr, ssize) - sizeof (long); #elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__) ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init; - ctx->env[0].__jmpbuf[0].__sp = (int *)((char *)sptr + ssize) - sizeof (long); + ctx->env[0].__jmpbuf[0].__sp = (int *) ((char *)sptr + ssize) - sizeof (long); #elif defined (__GNU_LIBRARY__) && defined (__i386__) - ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init; - ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize) - sizeof (long); + ctx->env[0].__jmpbuf[0].__pc = (char *) coro_init; + ctx->env[0].__jmpbuf[0].__sp = (void *) ((char *)sptr + ssize) - sizeof (long); #elif defined (__GNU_LIBRARY__) && defined (__amd64__) - ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init; - ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize) - sizeof (long); + ctx->env[0].__jmpbuf[JB_PC] = (long) coro_init; + ctx->env[0].__jmpbuf[0].__sp = (void *) ((char *)sptr + ssize) - sizeof (long); #else #error "linux libc or architecture not supported" #endif # elif CORO_IRIX - sigsetjmp (ctx->env, 0); - ctx->env[JB_PC] = (__uint64_t)coro_init; - ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long); + coro_setjmp (ctx->env, 0); + ctx->env[JB_PC] = (__uint64_t)coro_init; + ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long); # elif CORO_ASM - ctx->sp = (volatile void **)(ssize + (char *)sptr); + ctx->sp = (void **)(ssize + (char *)sptr); *--ctx->sp = (void *)abort; /* needed for alignment only */ *--ctx->sp = (void *)coro_init; ctx->sp -= NUM_SAVED; @@ -355,6 +366,9 @@ { pthread_cond_signal (&next->cv); pthread_cond_wait (&prev->cv, &coro_mutex); +#if __FreeBSD__ /* freebsd is of course broken and needs manual testcancel calls... yay... */ + pthread_testcancel (); +#endif } void