diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-12-24 01:50:20 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-12-24 01:50:20 +0300 |
| commit | dcd0465b2b7d8693d6ba6a4225487b84ef5930a7 (patch) | |
| tree | 1b70ddafbdc6d5f8388fbcc0a66089aa0a315cec /winsup/cygwin/gendef | |
| parent | ede284de5fccecbde8a2b0b70471eec4cc5cd3eb (diff) | |
* cygtls.cc (_cygtls::handle_threadlist_exception): Make an error fatal.
* cygtls.h (sockaddr_in): Use header rather than defining our own structure.
* exceptions.cc (_cygtls::interrupt_setup): Use exact contents of sa_mask
rather than assuming tht current sig should be masked, too.
(_cygtls::call_signal_handler): Use more aggressive locking.
* gendef (_sigbe): Wait until later before releasing incyg.
(_sigreturn): Remove more arguments to accommodate quasi-sa_sigaction support.
(_sigdelayed): Push arguments for sa_sigaction. More work needed here.
* signal.cc (sigaction): Implement SA_NODEFER.
* tlsoffsets.h: Regenerate.
* sigproc.cc (wait_sig): Use default buffer size of Windows 9x complains.
* pinfo.cc (_onreturn::dummy_handle): Remove.
(_onreturn::h): Make this a pointer.
(_onreturn::~_onreturn): Detect whether pointer is NULL rather than value is
NULL.
(_onreturn::_onreturn): Set h to NULL initially.
(_onreturn::no_close_p_handle): Set h to NULL.
(winpids::add): Initialize onreturn with value from p.hProcess immediately.
Diffstat (limited to 'winsup/cygwin/gendef')
| -rwxr-xr-x | winsup/cygwin/gendef | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/winsup/cygwin/gendef b/winsup/cygwin/gendef index 727d4bb5d..a81105c2f 100755 --- a/winsup/cygwin/gendef +++ b/winsup/cygwin/gendef @@ -132,9 +132,9 @@ __sigbe: # return here after cygwin syscall xorl %edx,%edx xchgl %edx,-4(%eax) # get return address from signal stack xchgl %edx,8(%esp) # restore edx/real return address - decl $tls::incyg(%ebx) decl $tls::stacklock(%ebx) # release lock popl %eax + decl $tls::incyg(%ebx) popl %ebx ret @@ -143,7 +143,7 @@ __sigbe: # return here after cygwin syscall _sigreturn: movl %fs:4,%ebx incl $tls::incyg(%ebx) - addl \$4,%esp # Remove argument + addl \$12,%esp # remove arguments call _set_process_mask\@4 1: movl \$1,%eax # potential lock value @@ -193,13 +193,19 @@ _sigdelayed: pushl $tls::saved_errno(%ebx) # saved errno call _set_process_mask_delta pushl %eax - pushl $tls::sig(%ebx) # signal argument - pushl \$_sigreturn + + # fill out handler arguments + xorl %eax,%eax # ucontext_t (currently not set) + pushl %eax + leal $tls::infodata(%ebx),%eax + pushl %eax # siginfo + pushl $tls::sig(%ebx) # signal number call _reset_signal_arrived\@0 + pushl \$_sigreturn # where to return pushl $tls::func(%ebx) # signal func cmpl \$0,$tls::threadkill(%ebx)#pthread_kill signal? - jnz 4f #yes. Callee clears signal number + jnz 4f # yes. callee clears signal number movl \$0,$tls::sig(%ebx) # zero the signal number as a # flag to the signal handler thread # that it is ok to set up sigsave |