--- libcoro/coro.c	2009/07/11 14:24:13	1.46
+++ libcoro/coro.c	2010/04/02 19:04:04	1.49
@@ -118,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"
@@ -133,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"
@@ -145,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
@@ -225,21 +249,24 @@
 # elif CORO_LOSER
 
   coro_setjmp (ctx->env);
-  #if __CYGWIN__
-    ctx->env[7] = (long)((char *)sptr + ssize) - sizeof (long);
-    ctx->env[8] = (long)coro_init;
+  #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[4] = (long)((char *)sptr + ssize) - sizeof (long);
-    ctx->env[5] = (long)coro_init;
+    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
@@ -248,17 +275,17 @@
 
   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
@@ -266,8 +293,8 @@
 # elif CORO_IRIX
 
   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);
+  ctx->env[JB_PC]                      = (__uint64_t)coro_init;
+  ctx->env[JB_SP]                      = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
 
 # elif CORO_ASM