diff options
author | Christopher Faylor <me@cgf.cx> | 2003-11-28 23:55:59 +0300 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2003-11-28 23:55:59 +0300 |
commit | 9a4d574b8d4550f53036dced342022b64e508abf (patch) | |
tree | 79d7ab65654ff5cb2fd2c0c035ac2b98deb1fcc2 /winsup/cygwin/gendef | |
parent | ffe006384344b5d2a86e6bedad96725391cfe88e (diff) |
Eliminate use of sigframe and sigthread throughout.
* Makefile.in (DLL_OFILES): Add sigfe.o. Remove reliance on cygwin.def from
cygwin0.dll dependency since dependence on sigfe.o implies that. Generate def
file on the fly using 'gendef'.
* configure.in: Don't auto-generate cygwin.def.
* configure: Regenerate.
* cygwin.din: Add SIGFE stuff where appropriate.
* dcrt0.cc (dll_crt0_1): Initialize cygwin tls early in process startup. Set
_main_tls to address of the main thread's cygwin tls.
* debug.h: Remove now unneeded WFSO and WFMO declarations.
* exceptions.cc (_last_thread): Define.
(set_thread_state_for_signals): New function.
(reset_thread_exception_for_signals): Ditto.
(init_thread_for_signals): Ditto.
(delete_thread_for_signals): Ditto.
(capture_thread_for_signals): Ditto.
(handle_exceptions): Set return address explicitly for exceptions prior to
calling sig_send.
(interrupt_on_return): Eliminate.
(setup_handler): Add preliminary implementation for dealing with
thread-specific signals by querying _main_tls.
(signal_exit): Use cygthread::main_thread_id instead of mainthread.id.
(call_signal_handler_now): For now, just handle the main thread.
* fork.cc (vfork): Save and restore main _my_tls.
* gendef: New file. Generates def file and sigfe.s file.
* gentls_offsets: New file. Generates offsets for perl to use in sigfe.s.
* how-signals-work.txt: Mention that info is obsolete.
* init.cc (dll_entry): Initialize cygwin tls storage here.
* miscfuncs.cc (low_priority_sleep): Make a C function for easier calling from
asm.
* perthread.h (vfork_save::tls): New element.
* signal.cc (nanosleep): Replace previous use of
sigframe.call_signal_handler_now with straight call to call_signal_handler_now.
(abort): Ditto.
* syscalls.cc (readv): Ditto.
* termios.cc (tcsetattr): Ditto.
* wait.cc (wait4): Ditto.
* sigproc.cc (sig_dispatch_pending): Ditto.
(sig_send): Ditto.
* sigproc.h: Declare call_signal_handler_now.
* thread.cc (pthread::thread_init_wrapper): Initialize cygwin tls. Remove
obsolete and unworking signal stuff.
* thread.h (verifyable_object::sigs): Eliminate.
(verifyable_object::sigmask): Eliminate.
(verifyable_object::sigtodo): Eliminate.
(verifyable_object::exit): Make attribute noreturn.
(verifyable_object::thread_init_wrapper): Ditto.
(pthread_null::exit): Ditto.
* winbase.h (__stackbase): Always define.
* winsup.h (low_priority_sleep): Declare as a "C" function.
* include/cygwin/version.h: Bump API version to reflect sigwait export.
* include/sys/queue.h: Protect SLIST_ENTRY from previous declaration.
* signal.cc (sigwait): Implement.
* select.cc (fhandler_base::ready_for_read): Add debugging output.
* devices.h: Define more device pointers via their storage.
* devices.in: Don't parse things like /dev/inet/tcp, as they really have no
meaning.
* devices.cc: Regenerate.
* gendevices: Set proper protection for output file.
* cygtls.h: New file.
* gendef: New file.
* gentls_offsets: New file.
* tlsoffsets.h: New file. Autogenerated.
* config/i386/longjmp.c: Remove. File subsumed by gendef output.
* config/i386/makefrag: Remove obsolete file.
* fhandler.cc: Remove spurious access_worker declaration.
* spawn.cc (spawnve): Make debugging output more accurate.
* cygwin-gperf: Remove.
* devices.cc: Remove.
Diffstat (limited to 'winsup/cygwin/gendef')
-rwxr-xr-x | winsup/cygwin/gendef | 223 |
1 files changed, 223 insertions, 0 deletions
diff --git a/winsup/cygwin/gendef b/winsup/cygwin/gendef new file mode 100755 index 000000000..df810cb06 --- /dev/null +++ b/winsup/cygwin/gendef @@ -0,0 +1,223 @@ +#!/usr/bin/perl +use strict; +my $in = shift; +my $tls_offsets = shift; +my $out = shift; +my $sigfe = shift; + +$main::first = 0; +if (!defined($in) || !defined($out) || !defined($sigfe)) { + die "usage: $0 deffile.in cygtls.h deffile.def sigfe.s\n"; +} + +require $tls_offsets; + +open(IN, $in) or die "$0: couldn't open \"$in\" - $!\n"; +my @top = (); +while (<IN>) { + push(@top, $_); + last if /^\s*exports\s*$/i; +} +my $libline = <IN>; +my @in = <IN>; +close(IN); + +my %sigfe = (); +my @data = (); +my @nosigfuncs = (); +my @out = (); +for (@in) { + /\sDATA$/o and do { + push(@data, $_); + next; + }; + chomp; + if (/=/o) { + if (s/\s+NOSIGFE\s*$//) { + } elsif (s/ SIGFE$//) { + my $func = (split(' '))[2]; + $sigfe{$func} = '_sigfe_' . $func; + } + } else { + my ($func, $sigfe) = m%^\s*(\S+)(?:\s+((?:NO)?SIGR?FE))?$%o; + if (defined($sigfe) && $sigfe =~ /^NO/o) { + $_ = $func; + } else { + $sigfe ||= 'sigfe'; + $_ = '_' . lc($sigfe) . '_' . $func; + $sigfe{$func} = $_; + $_ = $func . ' = ' . $_; + } + } + s/(\S)\s+(\S)/$1 $2/go; + s/(\S)\s+$/$1/o; + s/^\s+(\S)/$1/o; + push(@out, $_ . "\n"); +} + +for (@out) { + my ($alias, $func) = /^(\S+) = (\S+)\s*$/o; + $_ = $alias . ' = ' . $sigfe{$func} . "\n" + if defined($func) && $sigfe{$func}; +} +open(OUT, '>', $out) or die "$0: couldn't open \"$out\" - $!\n"; +print OUT @top, @data, @out; +close OUT; + +open(SIGFE, '>', $sigfe) or die "$0: couldn't open sigfe file \"$sigfe\" - $!\n"; + +for my $k (sort keys %sigfe) { + print SIGFE fefunc($k, $sigfe{$k}); +} +close SIGFE; + +sub fefunc { + my $func = '_' . shift; + my $fe = '_' . shift; + my $extra; + my $res = <<EOF; + .extern _siglist_index + .extern _siglist + .extern $func + .global $fe +$fe: + pushl \$$func + jmp __sigfe + +EOF + if (!$main::first++) { + $res = <<EOF . longjmp () . $res; + .text + .global __sigbe + .global _sigreturn + .global _sigdelayed + + .stabs "_sigfe:F(0,1)",36,0,0,__sigbe +__sigfe: + pushl %edx + movl %fs:4,%eax + movl \$4,%edx + xadd %edx,$tls::stackptr(%eax) + leal __sigbe,%eax + xchg %eax,8(%esp) + movl %eax,(%edx) + popl %edx + ret + + .stabs "_sigbe:F(0,1)",36,0,0,__sigbe +__sigbe: + pushl %eax + pushl %edx + movl \$-4,%edx +1: movl %fs:4,%eax + xadd %edx,$tls::stackptr(%eax) + xorl %eax,%eax + lock xchg %eax,-4(%edx) + testl %eax,%eax + jnz 2f + call _low_priority_sleep + xorl %edx,%edx + jmp 1b +2: xchg %eax,4(%esp) + popl %edx + ret + + .stabs "sigreturn:F(0,1)",36,0,0,_sigreturn +_sigreturn: + addl \$4,%esp # Remove argument + call _set_process_mask\@4 + + movl %fs:4,%eax + + cmpl \$0,$tls::sig(%eax) # Did a signal come in? + jnz 3f # Yes, if non-zero + +1: popl %edx # saved errno + testl %edx,%edx # Is it < 0 + jl 2f # yup. ignore it + movl $tls::errno_addr(%eax),%eax + movl %edx,(%eax) +2: popl %eax + popl %ebx + popl %ecx + popl %edx + popl %edi + popl %esi + popf + popl %ebp + jmp __sigbe + + .stabs "sigdelayed:F(0,1)",36,0,0,_sigdelayed +_sigdelayed: + pushl %ebp + movl %esp,%ebp + pushf + pushl %esi + pushl %edi + pushl %edx + pushl %ecx + pushl %ebx + pushl %eax + movl %fs:4,%ebx + pushl $tls::saved_errno(%ebx) # saved errno +3: pushl $tls::oldmask(%ebx) # oldmask + pushl $tls::sig(%ebx) # signal argument + pushl \$_sigreturn + + call _reset_signal_arrived\@0 + pushl $tls::func(%ebx) # signal func + pushl $tls::newmask(%ebx) # newmask - eaten by set_process_mask + + call _set_process_mask\@4 + 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 + popl %ebx + jmp *%ebx + +EOF + } + return $res; +} + +sub longjmp { + return <<EOF; + + .globl _longjmp + +_longjmp: + pushl %ebp + movl %esp,%ebp + movl 8(%ebp),%edi + movl 12(%ebp),%eax + testl %eax,%eax + jne 0f + incl %eax +0: + movl %eax,0(%edi) + movl 24(%edi),%ebp + pushfl + popl %ebx + movw 42(%edi),%ax + movw %ax,%ss + movl 28(%edi),%esp + pushl 32(%edi) + pushl %ebx + movw 36(%edi),%ax + movw %ax,%es + movw 40(%edi),%ax + movw %ax,%gs + movl %fs:4,%eax + leal ($tls::stack)(%eax),%edx + movl %edx,($tls::stackptr)(%eax) + movl 0(%edi),%eax + movl 4(%edi),%ebx + movl 8(%edi),%ecx + movl 12(%edi),%edx + movl 16(%edi),%esi + movl 20(%edi),%edi + popfl + ret + +EOF +} |