ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libcoro/coro.c
(Generate patch)

Comparing libcoro/coro.c (file contents):
Revision 1.14 by root, Mon Mar 21 14:17:44 2005 UTC vs.
Revision 1.19 by root, Wed Oct 19 19:04:24 2005 UTC

… …
38# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8) 38# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)
39# define STACK_ADJUST_SIZE(sp,ss) ((ss) - 8) 39# define STACK_ADJUST_SIZE(sp,ss) ((ss) - 8)
40# elif __i386__ && CORO_LINUX 40# elif __i386__ && CORO_LINUX
41# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss)) 41# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss))
42# define STACK_ADJUST_SIZE(sp,ss) (ss) 42# define STACK_ADJUST_SIZE(sp,ss) (ss)
43# elif __amd64__ && CORO_LINUX
44# define STACK_ADJUST_PTR(sp,ss) ((char *)(sp) + (ss) - 8)
45# define STACK_ADJUST_SIZE(sp,ss) (ss)
43# else 46# else
44# define STACK_ADJUST_PTR(sp,ss) (sp) 47# define STACK_ADJUST_PTR(sp,ss) (sp)
45# define STACK_ADJUST_SIZE(sp,ss) (ss) 48# define STACK_ADJUST_SIZE(sp,ss) (ss)
46# endif 49# endif
47#endif 50#endif
48 51
49#if CORO_SJLJ || CORO_LOOSE || CORO_LINUX || CORO_IRIX 52#if CORO_SJLJ || CORO_LOSER || CORO_LINUX || CORO_IRIX
53
54#include <stdlib.h>
50 55
51#if CORO_SJLJ 56#if CORO_SJLJ
57# include <stdio.h>
52# include <signal.h> 58# include <signal.h>
59# include <unistd.h>
53#endif 60#endif
54 61
55static volatile coro_func coro_init_func; 62static volatile coro_func coro_init_func;
56static volatile void *coro_init_arg; 63static volatile void *coro_init_arg;
57static volatile coro_context *new_coro, *create_coro; 64static volatile coro_context *new_coro, *create_coro;
… …
102 ctx->uc.uc_stack.ss_size = (size_t) STACK_ADJUST_SIZE (sptr,ssize); 109 ctx->uc.uc_stack.ss_size = (size_t) STACK_ADJUST_SIZE (sptr,ssize);
103 ctx->uc.uc_stack.ss_flags = 0; 110 ctx->uc.uc_stack.ss_flags = 0;
104 111
105 makecontext (&(ctx->uc), (void (*)()) coro, 1, arg); 112 makecontext (&(ctx->uc), (void (*)()) coro, 1, arg);
106 113
107#elif CORO_SJLJ || CORO_LOOSE || CORO_LINUX || CORO_IRIX 114#elif CORO_SJLJ || CORO_LOSER || CORO_LINUX || CORO_IRIX
108 115
109# if CORO_SJLJ 116# if CORO_SJLJ
110 stack_t ostk, nstk; 117 stack_t ostk, nstk;
111 struct sigaction osa, nsa; 118 struct sigaction osa, nsa;
112 sigset_t nsig, osig; 119 sigset_t nsig, osig;
… …
158 abort (); 165 abort ();
159 166
160 if (~ostk.ss_flags & SS_DISABLE) 167 if (~ostk.ss_flags & SS_DISABLE)
161 sigaltstack (&ostk, 0); 168 sigaltstack (&ostk, 0);
162 169
163 sigaction (SIGUSR1, &osa, 0); 170 sigaction (SIGUSR2, &osa, 0);
164 171
165 sigprocmask (SIG_SETMASK, &osig, 0); 172 sigprocmask (SIG_SETMASK, &osig, 0);
166 173
167# elif CORO_LOOSE 174# elif CORO_LOSER
168 175
169 setjmp (ctx->env); 176 setjmp (ctx->env);
170 ctx->env[7] = (long)((char *)sptr + ssize); 177 ctx->env[7] = (long)((char *)sptr + ssize);
171 ctx->env[8] = (long)coro_init; 178 ctx->env[8] = (long)coro_init;
172 179
… …
184#elif defined(__GNU_LIBRARY__) && defined(__i386__) 191#elif defined(__GNU_LIBRARY__) && defined(__i386__)
185 ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init; 192 ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init;
186 ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize); 193 ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize);
187#elif defined(__GNU_LIBRARY__) && defined(__amd64__) 194#elif defined(__GNU_LIBRARY__) && defined(__amd64__)
188 ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init; 195 ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
189 ctx->env[0].__jmpbuf[JB_RSP] = (long)((char *)sptr + ssize); 196 ctx->env[0].__jmpbuf[JB_RSP] = (long)STACK_ADJUST_PTR (sptr,ssize);
190#else 197#else
191#error "linux libc or architecture not supported" 198#error "linux libc or architecture not supported"
192#endif 199#endif
193 200
194# elif CORO_IRIX 201# elif CORO_IRIX

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines