diff options
author | Christopher Faylor <me@cgf.cx> | 2003-11-28 20:55:59 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2003-11-28 20:55:59 +0000 |
commit | 9a4d574b8d4550f53036dced342022b64e508abf (patch) | |
tree | 79d7ab65654ff5cb2fd2c0c035ac2b98deb1fcc2 /winsup/cygwin/cygwin-gperf | |
parent | ffe006384344b5d2a86e6bedad96725391cfe88e (diff) | |
download | cygnal-9a4d574b8d4550f53036dced342022b64e508abf.tar.gz cygnal-9a4d574b8d4550f53036dced342022b64e508abf.tar.bz2 cygnal-9a4d574b8d4550f53036dced342022b64e508abf.zip |
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/cygwin-gperf')
-rwxr-xr-x | winsup/cygwin/cygwin-gperf | 153 |
1 files changed, 0 insertions, 153 deletions
diff --git a/winsup/cygwin/cygwin-gperf b/winsup/cygwin/cygwin-gperf deleted file mode 100755 index 4599e90ca..000000000 --- a/winsup/cygwin/cygwin-gperf +++ /dev/null @@ -1,153 +0,0 @@ -#!/usr/bin/perl -use strict; -sub read_devices($%); -my $infile = shift; -my $incfile = shift; -open(GPERF, "gperf -c --key-positions='5-8,1-2,9-10' -r -t -C -E " . - "-T -L 'ANSI-C' -Hdevhash -N'device::lookup' -Z devstring " . - "-7 -G $infile |"); -my @lines = <GPERF>; -my $ix = 0; -my $i = 0; -my $n = -1; -my $findclose = 0; -my $add_device = ''; -my %fh_static; -my %fh_declare = ( - 'cygdrive' => 'dev_cygdrive_storage', - 'fs' => 'dev_fs_storage', - 'proc' => 'dev_proc_storage', - 'registry' => 'dev_registry_storage', - 'process' => 'dev_process_storage', - 'piper' => 'dev_piper_storage', - 'pipew' => 'dev_pipew_storage', - 'tcp' => 'dev_tcp_storage', - 'udp' => 'dev_udp_storage', - 'icmp' => 'dev_icmp_storage', - 'unix' => 'dev_unix_storage', - 'stream' => 'dev_stream_storage', - 'dgram' => 'dev_dgram_storage' -); - -foreach (@lines) { - $i++; - s/\[(str\[[^\]]*\])\]/[(unsigned) cyg_tolower ($1)]/o and next; - s/static (.* )wordlist/static NO_COPY $1wordlist/o and do { - $findclose = 1; - }; - s/([ ]*)if \(\*str.*$/$1if (strncasematch (str, s, len))/o and next; - $findclose and /};/o and do { - $_ .= "\n"; - $_ .=<<'EOF'; -const device dev_cygdrive_storage = - {"/cygdrive", FH_CYGDRIVE, "/cygdrive", 0, 0, 0, 0}; - -const device dev_fs_storage = - {"", FH_FS, "", 0, 0, 0, 0}; - -const device dev_proc_storage = - {"", FH_PROC, "", 0, 0, 0, 0}; - -const device dev_registry_storage = - {"", FH_REGISTRY, "", 0, 0, 0, 0}; - -const device dev_process_storage = - {"", FH_PROCESS, "", 0, 0, 0, 0}; - -const device dev_tcp_storage = - {"/dev/inet/tcp", FH_TCP, "", 0, 0, 0, 0}; - -const device dev_udp_storage = - {"/dev/inet/udp", FH_UCP, "", 0, 0, 0, 0}; - -const device dev_icmp_storage = - {"/dev/inet/icmp", FH_ICMP, "", 0, 0, 0, 0}; - -const device dev_unix_storage = - {"/dev/inet/unix", FH_UNIX, "", 0, 0, 0, 0}; - -const device dev_stream_storage = - {"/dev/inet/stream", FH_STREAM, "", 0, 0, 0, 0}; - -const device dev_dgram_storage = - {"/dev/inet/dgram", FH_DGRAM, "", 0, 0, 0, 0}; - -const device dev_piper_storage = - {"", FH_PIPER, "", 0, 0, 0, 0}; - -const device dev_pipew_storage = - {"", FH_PIPEW, "", 0, 0, 0, 0}; - -const device dev_fs = - {"", FH_FS, "", 0, 0, 0, 0}; -EOF - for my $f (sort keys %fh_declare) { - $_ .= 'const device dev_' . $f . "_storage = $fh_declare{$f};\n" - if $fh_declare{$f} !~ /_storage/; - } - $_ .= "\n"; - $_ .= read_devices($incfile, %fh_declare); - $findclose = 0; - }; - /^(\s+)(\{".*)/ or next; - my $indent = $1; - my $rest = $2; - for my $f ($rest =~ /\{([^}]+)\}/g) { - $f eq '""' and do { - $ix++; - next; - }; - my ($str, $fh) = (split(/, /, $f))[0..1]; - if ($str !~ m!^"(?:/dev|:bad:)!) { - $ix++; - } else { - my $what = lc(($fh =~ /FH_(.+)/o)[0]); - my $addon = ''; - while (defined $fh_static{$what . $addon} && - $fh_static{$what . $addon} ne $f) { - $addon++; - } - $what .= $addon; - $fh_static{$what} = $f; - $fh_declare{$what} = "wordlist[$ix]"; - $ix++; - } - } -} - -print @lines; - -sub read_devices($%) { - my $fn = shift; - my %fh_declare = @_; - open(F, "$fn") or die "$0: couldn't open $fn - $!\n"; - my (%dev, %fh); - local $_; - while (<F>) { - /^\s*DEV_([A-Z_0-9]+)_MAJOR\s*=\s*(\d+)/ and do { - my $dev = lc($1); - next unless $fh_declare{$dev}; - my $a = sprintf "%08d", $2; - $dev{$2} = '&' . $fh_declare{$dev} . " /* \L$1 */"; - next; - }; - /^\s*FH_([A-Z_0-9]+)\s*=\s*FHDEV\s*\((\d+),\s*(\d+)\)/ and do { - my $a = sprintf "%08d.%08d", $2, $3; - $fh{$a} = '&' . $fh_declare{lc($1)} . " /* \L$1 */"; - }; - }; - close F; - my $toprint = ''; - $toprint = "const device *unit_devices[] =\n{"; - for my $f (sort keys %dev) { - $toprint .= "\n $dev{$f}," if length($dev{$f}); - } - chop $toprint; - $toprint .= "\n};\n\nconst device *uniq_devices[] = \n{"; - for my $f (sort keys %fh) { - $toprint .= "\n $fh{$f},"; - } - chop $toprint; - $toprint .= "\n};\n"; - return $toprint; -} |