--- libcoro/coro.c 2010/04/02 19:13:54 1.50 +++ libcoro/coro.c 2010/12/03 19:21:59 1.53 @@ -117,6 +117,8 @@ ".globl coro_transfer\n" ".type coro_transfer, @function\n" "coro_transfer:\n" + /* windows, of course, gives a shit on the amd64 ABI and uses different registers */ + /* http://blogs.msdn.com/freik/archive/2005/03/17/398200.aspx */ #if __amd64 #define NUM_SAVED 6 "\tpush %rbp\n" @@ -126,16 +128,16 @@ "\tpush %r14\n" "\tpush %r15\n" #if CORO_WIN_TIB - "\tpush %fs:0xc\n" - "\tpush %fs:0x8\n" - "\tpush %fs:0x0\n" + "\tpush %gs:0x0\n" + "\tpush %gs:0x8\n" + "\tpush %gs:0xc\n" #endif "\tmov %rsp, (%rdi)\n" "\tmov (%rsi), %rsp\n" #if CORO_WIN_TIB - "\tpop %fs:0x0\n" - "\tpop %fs:0x8\n" - "\tpop %fs:0xc\n" + "\tpop %gs:0xc\n" + "\tpop %gs:0x8\n" + "\tpop %gs:0x0\n" #endif "\tpop %r15\n" "\tpop %r14\n" @@ -150,16 +152,16 @@ "\tpush %esi\n" "\tpush %edi\n" #if CORO_WIN_TIB - "\tpush %fs:8\n" - "\tpush %fs:4\n" "\tpush %fs:0\n" + "\tpush %fs:4\n" + "\tpush %fs:8\n" #endif "\tmov %esp, (%eax)\n" "\tmov (%edx), %esp\n" #if CORO_WIN_TIB - "\tpop %fs:0\n" - "\tpop %fs:4\n" "\tpop %fs:8\n" + "\tpop %fs:4\n" + "\tpop %fs:0\n" #endif "\tpop %edi\n" "\tpop %esi\n" @@ -297,14 +299,15 @@ ctx->sp = (void **)(ssize + (char *)sptr); *--ctx->sp = (void *)abort; /* needed for alignment only */ *--ctx->sp = (void *)coro_init; - ctx->sp -= NUM_SAVED; #if CORO_WIN_TIB - *--ctx->sp = sptr; /* StackLimit */ - *--ctx->sp = (char *)sptr + ssize; /* StackBase */ *--ctx->sp = 0; /* ExceptionList */ + *--ctx->sp = (char *)sptr + ssize; /* StackBase */ + *--ctx->sp = sptr; /* StackLimit */ #endif + ctx->sp -= NUM_SAVED; + # elif CORO_UCONTEXT getcontext (&(ctx->uc)); @@ -401,7 +404,11 @@ args.main = &nctx; pthread_attr_init (&attr); +#if __UCLIBC__ + pthread_attr_setstacksize (&attr, (size_t)ssize); +#else pthread_attr_setstack (&attr, sptr, (size_t)ssize); +#endif pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS); pthread_create (&ctx->id, &attr, coro_init, &args);