From 9a4d574b8d4550f53036dced342022b64e508abf Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 28 Nov 2003 20:55:59 +0000 Subject: 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. --- winsup/cygwin/gentls_offsets | 71 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100755 winsup/cygwin/gentls_offsets (limited to 'winsup/cygwin/gentls_offsets') diff --git a/winsup/cygwin/gentls_offsets b/winsup/cygwin/gentls_offsets new file mode 100755 index 000000000..fe5fab96e --- /dev/null +++ b/winsup/cygwin/gentls_offsets @@ -0,0 +1,71 @@ +#!/usr/bin/perl -s +my $tls = shift; +my $tls_out = shift; +open(TLS, $tls) or die "$0: couldn't open tls file \"$tls\" - $!\n"; +my $struct = ''; +my @fields = (); +my $def = ''; +while () { + next if $struct && (!/gentls_offsets/o && /\(/o); + $def .= $_ if $struct; + last if /^};/o; + /^\s*typedef/o and do { + $def .= $_ ; + next; + }; + if (!s/;.*$//o) { + if (!$struct && /^\s*(?:struct|class)\s*([a-z_0-9]+)/o) { + $def .= $_; + $struct = $1 + } + next; + } + s%/\*\s*gentls_offsets.*/\*\s*gentls_offsets\s*\*/%%og; + s/(?:\[[^\]]*\]|struct|class)//o; + s/^\s+\S+\s+//o; + s/[\*\s()]+//go; + for my $f (split(/,/)) { + push(@fields, $f); + } +} +close TLS; +open(TMP, '>', "/tmp/$$.cc") or die "$0: couldn't open temporary index file \"/tmp/$$.c\" - $!\n"; +print TMP < +#include +#include +typedef void *HANDLE; +$def +int +main(int argc, char **argv) +{ + $struct foo[1]; +# define foo_end ((char *) (foo + 1)) +# define offset(f) (((char *) &(foo->f)) - foo_end) +EOF + print TMP 'puts ("//;# autogenerated: Do not edit.\n");', "\n\n"; + for my $f (@fields) { + print TMP ' printf ("//; $tls::', $f, ' = %d;\n", ', "offset($f));\n"; + } + print TMP ' puts ("//; __DATA__\n");', "\n"; + for my $f (@fields) { + print TMP ' printf ("#define tls_', $f, ' (%d)\n", ', "offset($f));\n"; + } + + print TMP <', $tls_out) or die "$0: couldn't open tls index file \"tls_out\" - $!\n"; +open(OFFS, "/tmp/$$.a.out|") or die "$0: couldn't run \"/tmp/$$.a.out\" - $!\n"; +print TLS_OUT ; +close OFFS; +close TLS_OUT; +# unlink "/tmp/$$.cc", "/tmp/$$.a.out"; +exit(0); -- cgit v1.2.3