--- libcoro/coro.c	2010/04/02 19:04:04	1.49
+++ libcoro/coro.c	2011/05/30 02:21:54	1.55
@@ -117,58 +117,56 @@
        ".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
-         #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
+         #define NUM_SAVED 6
          "\tpush %rbp\n"
          "\tpush %rbx\n"
          "\tpush %r12\n"
          "\tpush %r13\n"
          "\tpush %r14\n"
          "\tpush %r15\n"
+         #if CORO_WIN_TIB
+           "\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  %gs:0xc\n"
+           "\tpop  %gs:0x8\n"
+           "\tpop  %gs:0x0\n"
+         #endif
          "\tpop  %r15\n"
          "\tpop  %r14\n"
          "\tpop  %r13\n"
          "\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
-         #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
+         #define NUM_SAVED 4
          "\tpush %ebp\n"
          "\tpush %ebx\n"
          "\tpush %esi\n"
          "\tpush %edi\n"
+         #if CORO_WIN_TIB
+           "\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:8\n"
+           "\tpop  %fs:4\n"
+           "\tpop  %fs:0\n"
+         #endif
          "\tpop  %edi\n"
          "\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
@@ -214,8 +212,8 @@
     }
 
   /* set the new stack */
-  nstk.ss_sp    = STACK_ADJUST_PTR (sptr,ssize); /* yes, some platforms (IRIX) get this wrong. */
-  nstk.ss_size  = STACK_ADJUST_SIZE (sptr,ssize);
+  nstk.ss_sp    = STACK_ADJUST_PTR (sptr, ssize); /* yes, some platforms (IRIX) get this wrong. */
+  nstk.ss_size  = STACK_ADJUST_SIZE (sptr, ssize);
   nstk.ss_flags = 0;
 
   if (sigaltstack (&nstk, &ostk) < 0)
@@ -301,7 +299,15 @@
   ctx->sp = (void **)(ssize + (char *)sptr);
   *--ctx->sp = (void *)abort; /* needed for alignment only */
   *--ctx->sp = (void *)coro_init;
+
+  #if CORO_WIN_TIB
+  *--ctx->sp = 0;                    /* ExceptionList */
+  *--ctx->sp = (char *)sptr + ssize; /* StackBase */
+  *--ctx->sp = sptr;                 /* StackLimit */
+  #endif
+
   ctx->sp -= NUM_SAVED;
+  memset (ctx->sp, 0, sizeof (*ctx->sp) * NUM_SAVED);
 
 # elif CORO_UCONTEXT
 
@@ -399,7 +405,12 @@
       args.main = &nctx;
 
       pthread_attr_init (&attr);
+#if __UCLIBC__
+      /* exists, but is borked */
+      /*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);