OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge. See ChangeLog. 

From-SVN: r5125
This commit is contained in:
Per Bothner 1993-08-09 18:59:37 -07:00
parent 690ddf3e4e
commit e9cd0b2518
3 changed files with 209 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gcc/fix-header.c
View File

@ -198,7 +198,7 @@ read_scan_file (scan_file)
struct partial_proto *partial;
struct fn_decl *fn;
int ch;
char *ptr, *fname, *extern_C, *rtype, *args, *file_seen, *line_seen;
char *ptr, *fname, *kind, *rtype, *args, *file_seen, *line_seen;
line.ptr = line.base;
ch = read_upto (scan_file, &line, '\n');
if (ch == EOF)
@ -207,11 +207,11 @@ read_scan_file (scan_file)
fname = line.base;
for (ptr = fname; *ptr != ';'; ) ptr++;
*ptr = 0;
extern_C = ptr + 1;
for (ptr = extern_C; *ptr != ';'; ) ptr++;
kind = ptr + 1;
for (ptr = kind; *ptr != ';'; ) ptr++;
*ptr = 0;
if (*extern_C == 'X')
if (*kind == 'X')
{
switch (special_file_handling)
{
@ -222,7 +222,7 @@ read_scan_file (scan_file)
continue;
}
if (*extern_C == 'M')
if (*kind == 'M')
{
/* The original include file defines fname as a macro. */
fn = lookup_std_proto (fname);
@ -273,7 +273,7 @@ read_scan_file (scan_file)
for (ptr = line_seen; *ptr != ';'; ) ptr++;
*ptr = 0;
if (extern_C[0] == 'f')
if (kind[0] == 'f')
missing_extern_C_count++;
fn = lookup_std_proto (fname);
@ -289,6 +289,9 @@ read_scan_file (scan_file)
if (args[0] != '\0')
continue;
if (kind[0] == 'I') /* don't edit inline function */
continue;
/* If the partial prototype was included from some other file,
we don't need to patch it up (in this run). */
i = strlen (file_seen);
@ -298,7 +301,7 @@ read_scan_file (scan_file)
if (fn == NULL)
continue;
if (fn->fname[0] == '\0' || strcmp(fn->fname, "void") == 0)
if (fn->params[0] == '\0' || strcmp(fn->params, "void") == 0)
continue;
/* We only have a partial function declaration,
@ -329,15 +332,21 @@ read_scan_file (scan_file)
fprintf (stderr, "%s: OK, nothing needs to be done.\n", inc_filename);
exit (0);
}
if (required_unseen_count)
fprintf (stderr, "%s: %d missing function declarations.\n",
inc_filename, required_unseen_count);
if (partial_count)
fprintf (stderr, "%s: %d non-prototype function declarations.\n",
inc_filename, partial_count);
if (missing_extern_C_count)
fprintf (stderr, "%s: %d declarations not protected by extern \"C\".\n",
inc_filename, missing_extern_C_count);
if (!verbose)
fprintf (stderr, "%s: fixing %s\n", progname, inc_filename);
else
{
if (required_unseen_count)
fprintf (stderr, "%s: %d missing function declarations.\n",
inc_filename, required_unseen_count);
if (partial_count)
fprintf (stderr, "%s: %d non-prototype function declarations.\n",
inc_filename, partial_count);
if (missing_extern_C_count)
fprintf (stderr,
"%s: %d declarations not protected by extern \"C\".\n",
inc_filename, missing_extern_C_count);
}
}
write_rbrac ()
@ -652,7 +661,7 @@ main(argc, argv)
}
}
else
putc (c, outf);
fprintf (outf, " %c", c);
}
}
else

224
gcc/fixproto
View File

@ -54,9 +54,8 @@
progname=$0
progname=`basename $progname`
original_dir=`pwd`
CC=gcc
CPP=${CPP-./cpp}
#CPP="${CC} -E"
if [ `echo $1 | wc -w` = 0 ] ; then
echo $progname\: usage\: $progname target-dir \[ source-dir \.\.\. \]
exit 1
@ -70,6 +69,17 @@ else
abs_target_dir=$rel_target_dir
fi
# Determine whether this system has symbolic links.
if ln -s X $rel_target_dir/ShouldNotExist 2>/dev/null; then
rm -f $rel_target_dir/ShouldNotExist
LINKS=true
elif ln -s X /tmp/ShouldNotExist 2>/dev/null; then
rm -f /tmp/ShouldNotExist
LINKS=true
else
LINKS=false
fi
if [ \! -d $abs_target_dir ] ; then
echo $progname\: creating directory $rel_target_dir
mkdir $abs_target_dir
@ -77,44 +87,6 @@ fi
echo $progname\: populating \`$rel_target_dir\'
required_ctype_h="isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper"
required_dirent_h="closedir opendir readdir rewinddir"
extra_check_errno_h="errno"
required_curses_h="box delwin endwin getcurx getcury initscr mvcur mvwprintw mvwscanw newwin overlay overwrite scroll subwin touchwin waddstr wclear wclrtobot wclrtoeol waddch wdelch wdeleteln werase wgetch wgetstr winsch winsertln wmove wprintw wrefresh wscanw wstandend wstandout"
required_fcntl_h="creat fcntl open"
# required_float_h=...
required_grp_h="getgrgid getgrnam"
# Maybe also "getgrent fgetgrent setgrent endgrent" */
# required_limit_h= /* Lots of macros */
required_locale_h="localeconv setlocale"
required_math_h="acos asin atan atan2 ceil cos cosh exp fabs floor fmod frexp ldexp log10 log modf pow sin sinh sqrt tan tanh"
extra_check_math_h="HUGE_VAL"
required_pwd_h="getpwnam getpwuid"
required_setjmp_h="longjmp setjmp siglongjmp sigsetjmp"
required_signal_h="kill raise sigaction sigaddset sigdelset sigemptyset sigfillset sigismember signal sigpending sigprocmask sigsuspend"
# *stdarg_h *stddef.h - supplied by gcc
required_stdio_h="clearerr fclose feof ferror fflush fgetc fgetpos fgets fopen fprintf fputc fputs fread freopen fscanf fseek fsetpos ftell fwrite getc getchar gets perror printf putc putchar puts remove rename rewind scanf setbuf setvbuf sprintf sscanf tmpfile tmpnam ungetc vfprintf vprintf vsprintf"
# Should perhaps also handle NULL, EOF, ... ?
required_stdlib_h="abort abs atexit atof atoi atol bsearch calloc exit free getenv labs malloc qsort rand realloc srand strtod strtol strtoul system"
# "div ldiv", - ignored because these depend on div_t, ldiv_t
# ignore these: "mblen mbstowcs mbstowc wcstombs wctomb"
# Should perhaps also add NULL
required_string_h="memchr memcmp memcpy memmove memset strcat strchr strcmp strcoll strcpy strcspn strerror strlen strncat strncmp"
# Should perhaps also add NULL and size_t
required_sys_stat_h="chmod fstat mkdir mkfifo stat umask"
extra_check_sys_stat_h="S_ISDIR S_ISBLK S_ISCHR S_ISFIFO S_ISREG S_ISLNK S_IFDIR S_IFBLK S_IFCHR S_IFIFO S_IFREG S_IFLNK"
required_sys_times_h="times"
# "sys_types.h" add types (not in old g++-include)
required_sys_resource_h="getrusage getrlimit setrlimit getpriority setpriority"
required_sys_utsname_h="uname"
required_sys_wait_h="wait waitpid"
extra_check_sys_wait_h="WEXITSTATUS WIFEXITED WIFSIGNALED WIFSTOPPED WSTOPSIG WTERMSIG WNOHANG WNOTRACED"
# required_tar.h=
required_termios_h="cfgetispeed cfgetospeed cfsetispeed cfsetospeed tcdrain tcflow tcflush tcgetattr tcsendbreak tcsetattr"
required_time_h="asctime clock ctime difftime gmtime localtime mktime strftime time tzset"
required_unistd_h="_exit access alarm chdir chown close ctermid cuserid dup dup2 execl execle execlp execv execve execvp fork fpathconf getcwd getegid geteuid getgid getgroups getlogin getpgrp getpid getppid getuid isatty link lseek pathconf pause pipe read rmdir setgid setpgid setsid setuid sleep sysconf tcgetpgrp tcsetpgrp ttyname unlink write"
include_path=""
if [ `echo $* | wc -w` != 0 ] ; then
@ -128,8 +100,14 @@ if [ `echo $* | wc -w` != 0 ] ; then
done
fi
required_stdlib_h="abort abs atexit atof atoi atol bsearch calloc exit free getenv labs malloc qsort rand realloc srand strtod strtol strtoul system"
# "div ldiv", - ignored because these depend on div_t, ldiv_t
# ignore these: "mblen mbstowcs mbstowc wcstombs wctomb"
# Should perhaps also add NULL
required_unistd_h="_exit access alarm chdir chown close ctermid cuserid dup dup2 execl execle execlp execv execve execvp fork fpathconf getcwd getegid geteuid getgid getgroups getlogin getpgrp getpid getppid getuid isatty link lseek pathconf pause pipe read rmdir setgid setpgid setsid setuid sleep sysconf tcgetpgrp tcsetpgrp ttyname unlink write"
done_dirs=""
done_files=""
echo "" >fixproto.list
if [ `echo $* | wc -w` != 0 ] ; then
for rel_source_dir in $* ; do
@ -142,63 +120,145 @@ if [ `echo $* | wc -w` != 0 ] ; then
echo $progname\: warning\: no such directory\: \`$rel_source_dir\'
continue
fi
rel_source_subdirs=`cd $abs_source_dir; find . -type d -print | sed -e 's%^\./%%' -e 's/\.//'`
if [ `echo $rel_source_subdirs | wc -w` != 0 ] ; then
for rel_source_subdir in $rel_source_subdirs; do
abs_target_subdir=$abs_target_dir/$rel_source_subdir
if [ \! -d $abs_target_subdir ] ; then
mkdir $abs_target_subdir
fi
dirs="."
levels=2
subdirs="."
while $LINKS && test -n "$dirs" -a $levels -gt 0
do
levels=`expr $levels - 1`
newdirs=
for d in $dirs ; do
# Find all directories under $d, relative to $d, excluding $d itself.
subdirs="$subdirs "`cd $abs_source_dir/$d; find . -type d -print | \
sed -e '/^\.$/d' -e "s|^\./|${d}/|" -e 's|^\./||'`
links=
links=`cd $abs_source_dir; find $d/. -type l -print | \
sed -e "s|$d/./|$d/|" -e 's|^\./||'`
for link in $links --dummy-- ; do
if test -d $abs_source_dir/$link/. ; then
newdirs="$newdirs $link"
fi
done
done
fi
dirs="$newdirs"
subdirs="$subdirs $newdirs"
done
rel_source_files=`cd $abs_source_dir; find . '!' -type d -name \*.h -print | sed 's%^\./%%'`
for rel_source_subdir in $subdirs; do
abs_target_subdir=${abs_target_dir}/${rel_source_subdir}
if [ \! -d $abs_target_subdir ] ; then
mkdir $abs_target_subdir
fi
# Append "/"; remove initial "./". Hence "." -> "" and "sys" -> "sys/".
rel_source_prefix=`echo $rel_source_subdir | sed -e 's|$|/|' -e 's|^./||'`
if [ `echo $rel_source_files | wc -w` != 0 ] ; then
for rel_source_file in $rel_source_files; do
# The 'sed' is in case the *.h matches nothing, which yields "*.h"
# which would then get re-globbed in the current directory. Sigh.
rel_source_files=`cd ${abs_source_dir}/${rel_source_subdir}; echo *.h | sed -e 's|[*].h|NONE|'`
for filename in $rel_source_files ; do
rel_source_file=${rel_source_prefix}${filename}
abs_source_file=$abs_source_dir/$rel_source_file
abs_target_file=$abs_target_dir/$rel_source_file
if test "$filename" = 'NONE' ; then
echo "(No *.h files in $abs_source_dir/$rel_source_subdir)"
# If target file exists, check if was written while processing one
# of the earlier source directories; if so ignore it.
if test -f $abs_target_file -a -n "$done_dirs" \
&& echo " $done_files " |grep " $rel_source_file " >/dev/null
then
echo $abs_target_file exists, $abs_source_file is ignored
elif test -f $abs_target_file -a -n "$done_dirs" \
&& grep "$rel_source_file" fixproto.list >/dev/null
then true
# echo $abs_target_file exists, $abs_source_file is ignored
else
# echo doing $rel_source_file from $abs_source_dir
rel_source_ident=`echo $rel_source_file | tr ./--- ___`
required_list=`eval echo '${required_'${rel_source_ident}'-}'`
extra_check_list=`eval echo '${extra_check_'${rel_source_ident}'-}'`
rm -f tmp.c tmp.i
echo "#include <${rel_source_file}>" >tmp.c
required_list=
extra_check_list=
case $rel_source_file in
ctype.h)
required_list="isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper" ;;
dirent.h)
required_list="closedir opendir readdir rewinddir" ;;
errno.h)
extra_check_list="errno" ;;
curses.h)
required_list="box delwin endwin getcurx getcury initscr mvcur mvwprintw mvwscanw newwin overlay overwrite scroll subwin touchwin waddstr wclear wclrtobot wclrtoeol waddch wdelch wdeleteln werase wgetch wgetstr winsch winsertln wmove wprintw wrefresh wscanw wstandend wstandout" ;;
fcntl.h)
required_list="creat fcntl open" ;;
grp.h)
#Maybe also "getgrent fgetgrent setgrent endgrent" */
required_list="getgrgid getgrnam" ;;
limit.h)
required_list= /* Lots of macros */ ;;
locale.h)
required_list="localeconv setlocale" ;;
math.h)
required_list="acos asin atan atan2 ceil cos cosh exp fabs floor fmod frexp ldexp log10 log modf pow sin sinh sqrt tan tanh"
extra_check_list="HUGE_VAL" ;;
pwd.h)
required_list="getpwnam getpwuid" ;;
setjmp.h)
required_list="longjmp setjmp siglongjmp sigsetjmp" ;;
signal.h)
required_list="kill raise sigaction sigaddset sigdelset sigemptyset sigfillset sigismember sigpending sigprocmask sigsuspend" ;;
# Left out signal() - its prototype is too complex for us!
stdio.h)
required_list="clearerr fclose feof ferror fflush fgetc fgetpos fgets fopen fprintf fputc fputs fread freopen fscanf fseek fsetpos ftell fwrite getc getchar gets perror printf putc putchar puts remove rename rewind scanf setbuf setvbuf sprintf sscanf tmpfile tmpnam ungetc vfprintf vprintf vsprintf"
if grep _flsbuf <$abs_source_file >/dev/null ; then
required_list="$required_list _flsbuf _filbuf"
fi
# Should perhaps also handle NULL, EOF, ... ?
;;
stdlib.h)
required_list="$required_stdlib_h" ;;
string.h)
required_list="memchr memcmp memcpy memmove memset strcat strchr strcmp strcoll strcpy strcspn strerror strlen strncat strncmp" ;;
# Should perhaps also add NULL and size_t
sys/stat.h)
required_list="chmod fstat mkdir mkfifo stat umask"
extra_check_list="S_ISDIR S_ISBLK S_ISCHR S_ISFIFO S_ISREG S_ISLNK S_IFDIR S_IFBLK S_IFCHR S_IFIFO S_IFREG S_IFLNK" ;;
sys/times.h)
required_list="times" ;;
# "sys/types.h" add types (not in old g++-include)
sys/resource.h)
required_list="getrusage getrlimit setrlimit getpriority setpriority" ;;
sys/utsname.h)
required_list="uname" ;;
sys/wait.h)
required_list="wait waitpid"
extra_check_list="WEXITSTATUS WIFEXITED WIFSIGNALED WIFSTOPPED WSTOPSIG WTERMSIG WNOHANG WNOTRACED" ;;
tar.h)
required_list= ;;
termios.h)
required_list="cfgetispeed cfgetospeed cfsetispeed cfsetospeed tcdrain tcflow tcflush tcgetattr tcsendbreak tcsetattr" ;;
time.h)
required_list="asctime clock ctime difftime gmtime localtime mktime strftime time tzset" ;;
unistd.h)
required_list="$required_unistd_h" ;;
esac
rm -f fixtmp.c fixtmp.i
echo "#include <${rel_source_file}>" >fixtmp.c
for macro in ${required_list} ${extra_check_list}
do
echo "#ifdef ${macro}" >>tmp.c
echo "__DEFINED_MACRO_${macro};" >>tmp.c
echo "#endif" >>tmp.c
echo "#ifdef ${macro}" >>fixtmp.c
echo "__DEFINED_MACRO_${macro};" >>fixtmp.c
echo "#endif" >>fixtmp.c
done
if ${CPP} -D__STDC__ -D__cplusplus -D_POSIX_SOURCE $include_path tmp.c >tmp.i
if ${CPP} -D__STDC__ -D__cplusplus -D_POSIX_SOURCE $include_path fixtmp.c >fixtmp.i 2>/dev/null
then
case $rel_source_file in
stdio.h)
if grep _flsbuf <$abs_source_file >/dev/null ; then
required_list="$required_list _flsbuf _filbuf"
fi ;;
esac
cat $abs_source_file >tmp.c
# echo Doing: "$original_dir/scan-decls <tmp.i | $original_dir/patch-header $rel_source_file tmp.c $abs_target_file \"$required_list\""
cat $abs_source_file >fixtmp.c
# echo Doing: "$original_dir/scan-decls <fixtmp.i | $original_dir/patch-header $rel_source_file fixtmp.c $abs_target_file \"$required_list\""
$original_dir/scan-decls <tmp.i | \
$original_dir/patch-header $rel_source_file tmp.c $abs_target_file "$required_list"
$original_dir/scan-decls <fixtmp.i | \
$original_dir/patch-header $rel_source_file fixtmp.c $abs_target_file "$required_list"
else
echo "${progname}: ${CPP} couldn't grok ${abs_source_file}"
echo "${progname}: cpp could not parse ${abs_source_file} (ignored)"
fi
done_files="${done_files} ${rel_source_file}"
echo "${rel_source_file}" >>fixproto.list
fi
done
rm -f tmp.c tmp.i
fi
rm -f fixtmp.c fixtmp.i
done
# check for broken assert.h that needs stdio.h
if test -f $abs_source_dir/assert.h -a \! -f $abs_target_dir/assert.h \
&& grep 'stderr' $abs_source_dir/assert.h >/dev/null
@ -215,13 +275,15 @@ if [ `echo $* | wc -w` != 0 ] ; then
done
fi
# This might be more cleanly moved into the main loop, by adding
# a <dummy> source directory at the end. FIXME!
for rel_source_file in unistd.h stdlib.h
do
if echo " $done_files " | grep " $rel_source_file " >/dev/null
if grep "$rel_source_file" fixproto.list >/dev/null
then true
else
echo Adding missing $rel_source_file
rel_source_ident=`echo $rel_source_file | tr ./--- ___`
rel_source_ident=`echo $rel_source_file | tr ./ __`
required_list=`eval echo '${required_'${rel_source_ident}'-}'`
cat >tmp.h <<EOF
#ifndef ${rel_source_ident}

48
gcc/scan-decls.c
View File

@ -21,8 +21,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
NAME;C;RTYPE;ARGS;FILENAME;LINENO;
NAME is the function's name.
C is "F" if the declaration is nested inside 'extern "C"' braces;
otherwise "f".
C is "I" if the function is declared as inline; "F" if the
declaration is nested inside 'extern "C"' braces; otherwise "f".
RTYPE is the function's return type.
ARGS is the function's argument list.
FILENAME and LINENO is where the declarations was seen
@ -58,18 +58,36 @@ char extern_C_braces[20];
prefixed by extern "C". */
int current_extern_C = 0;
static void
skip_to_closing_brace (fp)
FILE *fp;
{
int nesting = 1;
for (;;)
{
int c = get_token (fp, &buf);
if (c == EOF)
break;
if (c == '{')
nesting++;
if (c == '}' && --nesting == 0)
break;
}
}
int
main ()
{
FILE *fp = stdin;
int c;
int saw_extern;
int saw_extern, saw_inline;
new_statement:
c = get_token (fp, &buf);
handle_statement:
current_extern_C = 0;
saw_extern = 0;
saw_inline = 0;
if (c == '}')
{
/* pop an 'extern "C"' nesting level, if appropriate */
@ -97,6 +115,11 @@ main ()
fprintf (stdout, "%s;M;\n", buf.base+16);
goto new_statement;
}
if (strcmp (buf.base, "inline") == 0)
{
saw_inline = 1;
c = get_token (fp, &buf);
}
if (strcmp (buf.base, "extern") == 0)
{
saw_extern = 1;
@ -117,6 +140,10 @@ main ()
for (;;)
{
int followingc = getc (fp); /* char following token in buf */
MAKE_SSTRING_SPACE(&rtype, 1);
*rtype.ptr = 0;
if (c == IDENTIFIER_TOKEN)
{
int nextc = skip_spaces (fp, followingc);
@ -124,12 +151,10 @@ main ()
{
int nesting = 1;
MAKE_SSTRING_SPACE(&rtype, 1);
*rtype.ptr = 0;
fprintf (stdout, "%s;%s;%s;",
buf.base,
in_extern_C_brace || current_extern_C ? "F" : "f",
saw_inline ? "I"
: in_extern_C_brace || current_extern_C ? "F" : "f",
rtype.base);
c = skip_spaces (fp, ' ');
for (;;)
@ -148,7 +173,14 @@ main ()
}
fprintf (stdout, ";%s;%d;\n",
source_filename.base, source_lineno);
goto new_statement;
c = get_token (fp, &buf);
if (c == '{')
{
/* skip body of (normally) inline function */
skip_to_closing_brace (fp);
goto new_statement;
}
goto handle_statement;
}
else if (nextc == ';' && saw_extern)
{