893ac8e03c
everywhere. Leave some thread.cc stuff alone for now. * cygtls.h: Kludge some definitions to avoid including a problematic windows header. (_cygtls::_myfault): New entry. (_cygtls::_myfault_errno): Ditto. (_cygtls::fault_guarded): New function. (_cygtls::setup_fault): Ditto. (_cygtls::return_from_fault): Ditto. (_cygtls::clear_fault): Ditto. (myfault): New class. * exceptions.cc (handle_exceptions): Handle case of guarded fault in system routine. * gendef: Add another entry point for setjmp that the compiler doesn't know about and won't complain about. * gentls_offsets: Just include windows.h rather than kludging a HANDLE def. * miscfuncs.cc (check_null_str): Delete. (check_null_empty_str): Ditto. (check_null_empty_str_errno): Ditto. (check_null_str_errno): Ditto. (__check_null_invalid_struct): Ditto. (__check_null_invalid_struct_errno): Ditto. (__check_invalid_read_ptr): Ditto. (__check_invalid_read_ptr_errno): Ditto. (dummytest): New function. (check_iovec_for_read): Delete. (chec_iovec): Rename from check_iovec_for_write. Take a read/write parameter. * tlsoffsets.h: Regenerate. * winsup.h: Remove check_* declarations. (check_iovec_for_read): Delete declaration. Turn into a define instead. (check_iovec_for_write): Ditto. (check_iovec): New declaration. * thread.h: Use ifdef guard name consistent with other header files.
84 lines
2.4 KiB
Perl
Executable File
84 lines
2.4 KiB
Perl
Executable File
#!/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 = '';
|
|
$tls = join('', <TLS>);
|
|
$tls =~ s/\n[^\n]*gentls_offsets[^\n]*\n(.+)\Z/$1/os;
|
|
my $pre = $`;
|
|
substr($tls, 0, length($pre)) = '';
|
|
$pre =~ s/\n#ifndef _[^\n]+\n/\n/os;
|
|
$pre .= "\n//*/";
|
|
$tls =~ s%/\*\s*gentls_offsets.*?/\*\s*gentls_offsets\s*\*/%%ogs;
|
|
foreach ($tls =~ /^.*\n/mg) {
|
|
$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/(?:\[[^\]]*\]|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 <<EOF;
|
|
#define __INSIDE_CYGWIN__
|
|
#define __attribute__(X)
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <signal.h>
|
|
#include <windows.h>
|
|
$pre
|
|
$def
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
$struct foo[1];
|
|
# define foo_end ((char *) (foo + 1))
|
|
# define offset(f) (((char *) &(foo->f)) - foo_end)
|
|
# define poffset(f) (((char *) &(foo->f)) - ((char *) foo))
|
|
EOF
|
|
print TMP 'puts ("//;# autogenerated: Do not edit.\n");', "\n\n";
|
|
print TMP "printf (\"//; \$tls::sizeof_$struct = %d;\\n\", sizeof($struct\));\n";
|
|
for my $f (@fields) {
|
|
print TMP ' printf ("//; $tls::', $f, ' = %d;\n", ', "offset($f));\n";
|
|
print TMP ' printf ("//; $tls::p', $f, ' = %d;\n", ', "poffset($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 ' printf ("#define tls_p', $f, ' (%d)\n", ', "poffset($f));\n";
|
|
}
|
|
|
|
print TMP <<EOF;
|
|
|
|
exit (0);
|
|
}
|
|
EOF
|
|
close TMP;
|
|
system @ARGV, '-o', "/tmp/$$-1.cc", '-E', "/tmp/$$.cc";
|
|
system 'g++', '-m32', '-o', "/tmp/$$.a.out", "/tmp/$$-1.cc" and
|
|
($? == 127 && system 'c++', '-m32', '-o', "/tmp/$$.a.out", "/tmp/$$-1.cc") and
|
|
die "$0: couldn't generate executable for offset calculation \"/tmp/$$.a.out\" - $!\n";
|
|
open(TLS_OUT, '>', $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 <OFFS>;
|
|
close OFFS;
|
|
close TLS_OUT;
|
|
unlink "/tmp/$$.cc", "/tmp/$$.a.out";
|
|
exit(0);
|