--- cvsroot/libcoro/coro.c	2005/08/30 21:32:17	1.17
+++ cvsroot/libcoro/coro.c	2006/11/30 18:21:14	1.23
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2005 Marc Alexander Lehmann <schmorp@schmorp.de>
+ * Copyright (c) 2001-2006 Marc Alexander Lehmann <schmorp@schmorp.de>
  * 
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
@@ -40,12 +40,19 @@
 # elif __i386__ && CORO_LINUX
 #  define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss))
 #  define STACK_ADJUST_SIZE(sp,ss) (ss)
+# elif __amd64__ && CORO_LINUX
+#  define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)
+#  define STACK_ADJUST_SIZE(sp,ss) (ss)
 # else
 #  define STACK_ADJUST_PTR(sp,ss) (sp)
 #  define STACK_ADJUST_SIZE(sp,ss) (ss)
 # endif
 #endif
 
+#if CORO_UCONTEXT
+# include <stddef.h>
+#endif
+
 #if CORO_SJLJ || CORO_LOSER || CORO_LINUX || CORO_IRIX
 
 #include <stdlib.h>
@@ -93,9 +100,9 @@
 #endif
 
 /* initialize a machine state */
-void coro_create(coro_context *ctx,
-                 coro_func coro, void *arg,
-                 void *sptr, long ssize)
+void coro_create (coro_context *ctx,
+                  coro_func coro, void *arg,
+                  void *sptr, long ssize)
 {
 #if CORO_UCONTEXT
 
@@ -135,7 +142,10 @@
   nsa.sa_flags = SA_ONSTACK;
 
   if (sigaction (SIGUSR2, &nsa, &osa))
-    perror ("sigaction");
+    {
+      perror ("sigaction");
+      abort ();
+    }
 
   /* set the new stack */
   nstk.ss_sp    = STACK_ADJUST_PTR (sptr,ssize); /* yes, some platforms (IRIX) get this wrong. */
@@ -143,7 +153,10 @@
   nstk.ss_flags = 0;
 
   if (sigaltstack (&nstk, &ostk) < 0)
-    perror ("sigaltstack");
+    {
+      perror ("sigaltstack");
+      abort ();
+    }
 
   trampoline_count = 0;
   kill (getpid (), SIGUSR2);
@@ -164,19 +177,32 @@
   if (~ostk.ss_flags & SS_DISABLE)
     sigaltstack (&ostk, 0);
 
-  sigaction (SIGUSR1, &osa, 0);
+  sigaction (SIGUSR2, &osa, 0);
 
   sigprocmask (SIG_SETMASK, &osig, 0);
 
 # elif CORO_LOSER
 
   setjmp (ctx->env);
+#if __CYGWIN__
   ctx->env[7] = (long)((char *)sptr + ssize);
   ctx->env[8] = (long)coro_init;
+#elif defined(_M_IX86)
+  ((_JUMP_BUFFER *)&ctx->env)->Eip   = (long)coro_init;
+  ((_JUMP_BUFFER *)&ctx->env)->Esp   = (long)STACK_ADJUST_PTR (sptr,ssize);
+#elif defined(_M_AMD64)
+  ((_JUMP_BUFFER *)&ctx->env)->Rip   = (__int64)coro_init;
+  ((_JUMP_BUFFER *)&ctx->env)->Rsp   = (__int64)STACK_ADJUST_PTR (sptr,ssize);
+#elif defined(_M_IA64)
+  ((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64)coro_init;
+  ((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64)STACK_ADJUST_PTR (sptr,ssize);
+#else
+#error "microsoft libc or architecture not supported"
+#endif
 
 # elif CORO_LINUX
 
-  setjmp (ctx->env);
+  _setjmp (ctx->env);
 #if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
     && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined(JB_PC) && defined(JB_SP)
   ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
@@ -190,7 +216,7 @@
   ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize);
 #elif defined(__GNU_LIBRARY__) && defined(__amd64__)
   ctx->env[0].__jmpbuf[JB_PC]  = (long)coro_init;
-  ctx->env[0].__jmpbuf[JB_RSP] = (long)((char *)sptr + ssize);
+  ctx->env[0].__jmpbuf[JB_RSP] = (long)STACK_ADJUST_PTR (sptr,ssize);
 #else
 #error "linux libc or architecture not supported"
 #endif