Skip to content

R
riscv-gcc-1
Commit cf633f5b by Andreas Jaeger Committed by Andreas Jaeger
Options

mips-tfile.c: Convert prototypes to ISO C90. 


	* mips-tfile.c: Convert prototypes to ISO C90.
	* mips-tdump.c: Convert prototypes to ISO C90.

From-SVN: r69048
parent 0cea056b
Showing with 244 additions and 359 deletions
gcc/ChangeLog
2003-07-07 Andreas Jaeger <aj@suse.de>
* mips-tfile.c: Convert prototypes to ISO C90.
* mips-tdump.c: Convert prototypes to ISO C90.
2003-07-07 Nathan Sidwell <nathan@codesourcery.com> 2003-07-07 Nathan Sidwell <nathan@codesourcery.com>
* rtl.h (emit_line_note): Take a location_t. * rtl.h (emit_line_note): Take a location_t.
......
gcc/mips-tdump.c
...@@ -234,19 +234,19 @@ ulong *rfile_desc; /* relative file tables */ ...@@ -234,19 +234,19 @@ ulong *rfile_desc; /* relative file tables */
PDR *proc_desc; /* procedure tables */ PDR *proc_desc; /* procedure tables */
/* Forward reference for functions. */ /* Forward reference for functions. */
static void *read_seek PARAMS ((void *, size_t, off_t, const char *)); static void *read_seek (void *, size_t, off_t, const char *);
static void read_tfile PARAMS ((void)); static void read_tfile (void);
static void print_global_hdr PARAMS ((struct filehdr *)); static void print_global_hdr (struct filehdr *);
static void print_sym_hdr PARAMS ((HDRR *)); static void print_sym_hdr (HDRR *);
static void print_file_desc PARAMS ((FDR *, int)); static void print_file_desc (FDR *, int);
static void print_symbol PARAMS ((SYMR *, int, const char *, AUXU *, int, FDR *)); static void print_symbol (SYMR *, int, const char *, AUXU *, int, FDR *);
static void print_aux PARAMS ((AUXU, int, int)); static void print_aux (AUXU, int, int);
static void emit_aggregate PARAMS ((char *, AUXU, AUXU, const char *, FDR *)); static void emit_aggregate (char *, AUXU, AUXU, const char *, FDR *);
static const char *st_to_string PARAMS ((st_t)); static const char *st_to_string (st_t);
static const char *sc_to_string PARAMS ((sc_t)); static const char *sc_to_string (sc_t);
static const char *glevel_to_string PARAMS ((glevel_t)); static const char *glevel_to_string (glevel_t);
static const char *lang_to_string PARAMS ((lang_t)); static const char *lang_to_string (lang_t);
static const char *type_to_string PARAMS ((AUXU *, int, FDR *)); static const char *type_to_string (AUXU *, int, FDR *);
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
...@@ -269,14 +269,13 @@ static const struct option options[] = ...@@ -269,14 +269,13 @@ static const struct option options[] =
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
/* Read some bytes at a specified location, and return a pointer. */ /* Read some bytes at a specified location, and return a pointer.
Read_seek takes a pointer PTR to a buffer or NULL and reads SIZE
bytes from offset OFFSET. In case of errors CONTEXT is used as
error message. */
static void * static void *
read_seek (ptr, size, offset, context) read_seek (void *ptr, size_t size, off_t offset, const char *context)
void *ptr; /* pointer to buffer or NULL */
size_t size; /* # bytes to read */
off_t offset; /* offset to read at */
const char *context; /* context for error message */
{ {
long read_size = 0; long read_size = 0;
...@@ -308,8 +307,7 @@ read_seek (ptr, size, offset, context) ...@@ -308,8 +307,7 @@ read_seek (ptr, size, offset, context)
/* Convert language code to string format. */ /* Convert language code to string format. */
static const char * static const char *
lang_to_string (lang) lang_to_string (lang_t lang)
lang_t lang;
{ {
switch (lang) switch (lang)
{ {
...@@ -331,8 +329,7 @@ lang_to_string (lang) ...@@ -331,8 +329,7 @@ lang_to_string (lang)
/* Convert storage class to string. */ /* Convert storage class to string. */
static const char * static const char *
sc_to_string(storage_class) sc_to_string (sc_t storage_class)
sc_t storage_class;
{ {
switch(storage_class) switch(storage_class)
{ {
...@@ -369,8 +366,7 @@ sc_to_string(storage_class) ...@@ -369,8 +366,7 @@ sc_to_string(storage_class)
/* Convert symbol type to string. */ /* Convert symbol type to string. */
static const char * static const char *
st_to_string(symbol_type) st_to_string (st_t symbol_type)
st_t symbol_type;
{ {
switch(symbol_type) switch(symbol_type)
{ {
...@@ -410,8 +406,7 @@ st_to_string(symbol_type) ...@@ -410,8 +406,7 @@ st_to_string(symbol_type)
/* Convert debug level to string. */ /* Convert debug level to string. */
static const char * static const char *
glevel_to_string (g_level) glevel_to_string (glevel_t g_level)
glevel_t g_level;
{ {
switch(g_level) switch(g_level)
{ {
...@@ -423,15 +418,12 @@ glevel_to_string (g_level) ...@@ -423,15 +418,12 @@ glevel_to_string (g_level)
return "??"; return "??";
} }
/* Convert the type information to string format. */ /* Convert the type information to string format. */
static const char * static const char *
type_to_string (aux_ptr, index, fdp) type_to_string (AUXU *aux_ptr, int index, FDR *fdp)
AUXU *aux_ptr;
int index;
FDR *fdp;
{ {
AUXU u; AUXU u;
struct qual { struct qual {
...@@ -741,8 +733,7 @@ type_to_string (aux_ptr, index, fdp) ...@@ -741,8 +733,7 @@ type_to_string (aux_ptr, index, fdp)
/* Print out the global file header for object files. */ /* Print out the global file header for object files. */
static void static void
print_global_hdr (ptr) print_global_hdr (struct filehdr *ptr)
struct filehdr *ptr;
{ {
char *time = ctime ((time_t *)&ptr->f_timdat); char *time = ctime ((time_t *)&ptr->f_timdat);
ushort flags = ptr->f_flags; ushort flags = ptr->f_flags;
...@@ -796,8 +787,7 @@ print_global_hdr (ptr) ...@@ -796,8 +787,7 @@ print_global_hdr (ptr)
/* Print out the symbolic header. */ /* Print out the symbolic header. */
static void static void
print_sym_hdr (sym_ptr) print_sym_hdr (HDRR *sym_ptr)
HDRR *sym_ptr;
{ {
int width = 20; int width = 20;
...@@ -870,13 +860,8 @@ print_sym_hdr (sym_ptr) ...@@ -870,13 +860,8 @@ print_sym_hdr (sym_ptr)
/* Print out a symbol. */ /* Print out a symbol. */
static void static void
print_symbol (sym_ptr, number, strbase, aux_base, ifd, fdp) print_symbol (SYMR *sym_ptr, int number, const char *strbase, AUXU *aux_base,
SYMR *sym_ptr; int ifd, FDR *fdp)
int number;
const char *strbase;
AUXU *aux_base;
int ifd;
FDR *fdp;
{ {
sc_t storage_class = (sc_t) sym_ptr->sc; sc_t storage_class = (sc_t) sym_ptr->sc;
st_t symbol_type = (st_t) sym_ptr->st; st_t symbol_type = (st_t) sym_ptr->st;
...@@ -1050,10 +1035,7 @@ print_symbol (sym_ptr, number, strbase, aux_base, ifd, fdp) ...@@ -1050,10 +1035,7 @@ print_symbol (sym_ptr, number, strbase, aux_base, ifd, fdp)
/* Print out a word from the aux. table in various formats. */ /* Print out a word from the aux. table in various formats. */
static void static void
print_aux (u, auxi, used) print_aux (AUXU u, int auxi, int used)
AUXU u;
int auxi;
int used;
{ {
printf ("\t%s#%-5d %11ld, [%4ld/%7ld], [%2d %1d:%1d %1x:%1x:%1x:%1x:%1x:%1x]\n", printf ("\t%s#%-5d %11ld, [%4ld/%7ld], [%2d %1d:%1d %1x:%1x:%1x:%1x:%1x:%1x]\n",
(used) ? " " : "* ", (used) ? " " : "* ",
...@@ -1076,20 +1058,15 @@ print_aux (u, auxi, used) ...@@ -1076,20 +1058,15 @@ print_aux (u, auxi, used)
/* Write aggregate information to a string. */ /* Write aggregate information to a string. */
static void static void
emit_aggregate (string, u, u2, which, fdp) emit_aggregate (char *string, AUXU u, AUXU u2, const char *which, FDR *fdp)
char *string;
AUXU u;
AUXU u2;
const char *which;
FDR *fdp;
{ {
unsigned int ifd = u.rndx.rfd; unsigned int ifd = u.rndx.rfd;
unsigned int index = u.rndx.index; unsigned int index = u.rndx.index;
const char *name; const char *name;
if (ifd == ST_RFDESCAPE) if (ifd == ST_RFDESCAPE)
ifd = u2.isym; ifd = u2.isym;
/* An ifd of -1 is an opaque type. An escaped index of 0 is a /* An ifd of -1 is an opaque type. An escaped index of 0 is a
struct return type of a procedure compiled without -g. */ struct return type of a procedure compiled without -g. */
if (ifd == 0xffffffff if (ifd == 0xffffffff
...@@ -1105,7 +1082,7 @@ emit_aggregate (string, u, u2, which, fdp) ...@@ -1105,7 +1082,7 @@ emit_aggregate (string, u, u2, which, fdp)
fdp = &file_desc[rfile_desc[fdp->rfdBase + ifd]]; fdp = &file_desc[rfile_desc[fdp->rfdBase + ifd]];
name = &l_strings[fdp->issBase + l_symbols[index + fdp->isymBase].iss]; name = &l_strings[fdp->issBase + l_symbols[index + fdp->isymBase].iss];
} }
sprintf (string, sprintf (string,
"%s %s { ifd = %u, index = %u }", "%s %s { ifd = %u, index = %u }",
which, name, ifd, index); which, name, ifd, index);
...@@ -1116,24 +1093,22 @@ emit_aggregate (string, u, u2, which, fdp) ...@@ -1116,24 +1093,22 @@ emit_aggregate (string, u, u2, which, fdp)
procedures, and line numbers within it. */ procedures, and line numbers within it. */
static void static void
print_file_desc (fdp, number) print_file_desc (FDR *fdp, int number)
FDR *fdp;
int number;
{ {
char *str_base; char *str_base;
AUXU *aux_base; AUXU *aux_base;
int symi, pdi; int symi, pdi;
int width = 20; int width = 20;
char *used_base; char *used_base;
str_base = l_strings + fdp->issBase; str_base = l_strings + fdp->issBase;
aux_base = aux_symbols + fdp->iauxBase; aux_base = aux_symbols + fdp->iauxBase;
used_base = aux_used + (aux_base - aux_symbols); used_base = aux_used + (aux_base - aux_symbols);
printf ("\nFile #%d, \"%s\"\n\n", printf ("\nFile #%d, \"%s\"\n\n",
number, number,
fdp->rss != issNil ? str_base + fdp->rss : "<unknown>"); fdp->rss != issNil ? str_base + fdp->rss : "<unknown>");
printf (" Name index = %-10ld Readin = %s\n", printf (" Name index = %-10ld Readin = %s\n",
(long) fdp->rss, (fdp->fReadin) ? "Yes" : "No"); (long) fdp->rss, (fdp->fReadin) ? "Yes" : "No");
...@@ -1203,7 +1178,7 @@ print_file_desc (fdp, number) ...@@ -1203,7 +1178,7 @@ print_file_desc (fdp, number)
if (want_scope && cur_scope != (scope_t *) 0) if (want_scope && cur_scope != (scope_t *) 0)
printf ("\n Warning scope does not start at 0!\n"); printf ("\n Warning scope does not start at 0!\n");
/* /*
* print the info about the symbol table. * print the info about the symbol table.
*/ */
printf ("\n There are %lu local symbols, starting at %lu\n", printf ("\n There are %lu local symbols, starting at %lu\n",
...@@ -1256,7 +1231,7 @@ print_file_desc (fdp, number) ...@@ -1256,7 +1231,7 @@ print_file_desc (fdp, number)
} }
} }
/* /*
* do the procedure descriptors. * do the procedure descriptors.
*/ */
printf ("\n There are %lu procedure descriptor entries, ", (ulong) fdp->cpd); printf ("\n There are %lu procedure descriptor entries, ", (ulong) fdp->cpd);
...@@ -1344,7 +1319,7 @@ print_file_desc (fdp, number) ...@@ -1344,7 +1319,7 @@ print_file_desc (fdp, number)
/* Read in the portions of the .T file that we will print out. */ /* Read in the portions of the .T file that we will print out. */
static void static void
read_tfile () read_tfile (void)
{ {
short magic; short magic;
off_t sym_hdr_offset = 0; off_t sym_hdr_offset = 0;
...@@ -1436,12 +1411,10 @@ read_tfile () ...@@ -1436,12 +1411,10 @@ read_tfile ()
extern int main PARAMS ((int, char **)); extern int main (int, char **);
int int
main (argc, argv) main (int argc, char **argv)
int argc;
char **argv;
{ {
int i, opt; int i, opt;
...@@ -1546,7 +1519,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" ...@@ -1546,7 +1519,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"
for (i = 0; i < sym_hdr.ifdMax; i++) for (i = 0; i < sym_hdr.ifdMax; i++)
print_file_desc (&file_desc[i], i); print_file_desc (&file_desc[i], i);
/* /*
* Print the external symbols. * Print the external symbols.
*/ */
want_scope = 0; /* scope info is meaning for extern symbols */ want_scope = 0; /* scope info is meaning for extern symbols */
......
gcc/mips-tfile.c
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
Copyright (C) 1991, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, Copyright (C) 1991, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
2002, 2003 Free Software Foundation, Inc. 2002, 2003 Free Software Foundation, Inc.
Contributed by Michael Meissner (meissner@cygnus.com). Contributed by Michael Meissner (meissner@cygnus.com).
This file is part of GCC. This file is part of GCC.
GCC is free software; you can redistribute it and/or modify it under GCC is free software; you can redistribute it and/or modify it under
...@@ -98,31 +98,31 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA ...@@ -98,31 +98,31 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
array, pointer, function, etc. qualifiers. The array, pointer, function, etc. qualifiers. The
current base types that I have documentation for are: current base types that I have documentation for are:
btNil -- undefined btNil -- undefined
btAdr -- address - integer same size as ptr btAdr -- address - integer same size as ptr
btChar -- character btChar -- character
btUChar -- unsigned character btUChar -- unsigned character
btShort -- short btShort -- short
btUShort -- unsigned short btUShort -- unsigned short
btInt -- int btInt -- int
btUInt -- unsigned int btUInt -- unsigned int
btLong -- long btLong -- long
btULong -- unsigned long btULong -- unsigned long
btFloat -- float (real) btFloat -- float (real)
btDouble -- Double (real) btDouble -- Double (real)
btStruct -- Structure (Record) btStruct -- Structure (Record)
btUnion -- Union (variant) btUnion -- Union (variant)
btEnum -- Enumerated btEnum -- Enumerated
btTypedef -- defined via a typedef isymRef btTypedef -- defined via a typedef isymRef
btRange -- subrange of int btRange -- subrange of int
btSet -- pascal sets btSet -- pascal sets
btComplex -- fortran complex btComplex -- fortran complex
btDComplex -- fortran double complex btDComplex -- fortran double complex
btIndirect -- forward or unnamed typedef btIndirect -- forward or unnamed typedef
btFixedDec -- Fixed Decimal btFixedDec -- Fixed Decimal
btFloatDec -- Float Decimal btFloatDec -- Float Decimal
btString -- Varying Length Character String btString -- Varying Length Character String
btBit -- Aligned Bit String btBit -- Aligned Bit String
btPicture -- Picture btPicture -- Picture
btVoid -- Void (MIPS cc revision >= 2.00) btVoid -- Void (MIPS cc revision >= 2.00)
...@@ -130,12 +130,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA ...@@ -130,12 +130,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
current type qualifier fields I have documentation for current type qualifier fields I have documentation for
are: are:
tqNil -- no more qualifiers tqNil -- no more qualifiers
tqPtr -- pointer tqPtr -- pointer
tqProc -- procedure tqProc -- procedure
tqArray -- array tqArray -- array
tqFar -- 8086 far pointers tqFar -- 8086 far pointers
tqVol -- volatile tqVol -- volatile
The dense number table is used in the front ends, and disappears by The dense number table is used in the front ends, and disappears by
...@@ -244,7 +244,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA ...@@ -244,7 +244,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
} }
Mips-tdump produces the following information: Mips-tdump produces the following information:
Global file header: Global file header:
magic number 0x162 magic number 0x162
# sections 2 # sections 2
...@@ -253,12 +253,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA ...@@ -253,12 +253,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
symbolic header size 96 symbolic header size 96
optional header 56 optional header 56
flags 0x0 flags 0x0
Symbolic header, magic number = 0x7009, vstamp = 1.31: Symbolic header, magic number = 0x7009, vstamp = 1.31:
Info Offset Number Bytes Info Offset Number Bytes
==== ====== ====== ===== ==== ====== ====== =====
Line numbers 380 4 4 [13] Line numbers 380 4 4 [13]
Dense numbers 0 0 0 Dense numbers 0 0 0
Procedures Tables 384 1 52 Procedures Tables 384 1 52
...@@ -270,14 +270,14 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA ...@@ -270,14 +270,14 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
File Tables 1008 2 144 File Tables 1008 2 144
Relative Files 0 0 0 Relative Files 0 0 0
External Symbols 1152 20 320 External Symbols 1152 20 320
File #0, "hello2.c" File #0, "hello2.c"
Name index = 1 Readin = No Name index = 1 Readin = No
Merge = No Endian = LITTLE Merge = No Endian = LITTLE
Debug level = G2 Language = C Debug level = G2 Language = C
Adr = 0x00000000 Adr = 0x00000000
Info Start Number Size Offset Info Start Number Size Offset
==== ===== ====== ==== ====== ==== ===== ====== ==== ======
Local strings 0 15 15 784 Local strings 0 15 15 784
...@@ -287,7 +287,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA ...@@ -287,7 +287,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
Procedures 0 1 52 384 Procedures 0 1 52 384
Auxiliary symbols 0 14 56 628 Auxiliary symbols 0 14 56 628
Relative Files 0 0 0 0 Relative Files 0 0 0 0
There are 6 local symbols, starting at 436 There are 6 local symbols, starting at 436
Symbol# 0: "hello2.c" Symbol# 0: "hello2.c"
...@@ -636,13 +636,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA ...@@ -636,13 +636,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* The following might be called from obstack or malloc, /* The following might be called from obstack or malloc,
so they can't be static. */ so they can't be static. */
extern void pfatal_with_name extern void pfatal_with_name (const char *) ATTRIBUTE_NORETURN;
PARAMS ((const char *)) ATTRIBUTE_NORETURN; extern void fancy_abort (void) ATTRIBUTE_NORETURN;
extern void fancy_abort PARAMS ((void)) ATTRIBUTE_NORETURN; extern void botch (const char *) ATTRIBUTE_NORETURN;
void botch PARAMS ((const char *)) ATTRIBUTE_NORETURN;
extern void fatal PARAMS ((const char *format, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; extern void fatal (const char *format, ...) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
extern void error PARAMS ((const char *format, ...)) ATTRIBUTE_PRINTF_1; extern void error (const char *format, ...) ATTRIBUTE_PRINTF_1;
#ifndef MIPS_DEBUGGING_INFO #ifndef MIPS_DEBUGGING_INFO
...@@ -654,7 +653,7 @@ static const char *progname; ...@@ -654,7 +653,7 @@ static const char *progname;
static const char *input_name; static const char *input_name;
int int
main () main (void)
{ {
fprintf (stderr, "Mips-tfile should only be run on a MIPS computer!\n"); fprintf (stderr, "Mips-tfile should only be run on a MIPS computer!\n");
exit (1); exit (1);
...@@ -953,7 +952,7 @@ typedef struct varray { ...@@ -953,7 +952,7 @@ typedef struct varray {
#define INITIALIZE_VARRAY(x,type) \ #define INITIALIZE_VARRAY(x,type) \
do { \ do { \
(x)->object_size = sizeof (type); \ (x)->object_size = sizeof (type); \
(x)->objects_per_page = OBJECTS_PER_PAGE (type); \ (x)->objects_per_page = OBJECTS_PER_PAGE (type); \
(x)->objects_last_page = OBJECTS_PER_PAGE (type); \ (x)->objects_last_page = OBJECTS_PER_PAGE (type); \
} while (0) } while (0)
...@@ -1508,8 +1507,8 @@ static char *cur_line_ptr = (char *) 0; /* ptr within current line */ ...@@ -1508,8 +1507,8 @@ static char *cur_line_ptr = (char *) 0; /* ptr within current line */
static unsigned cur_line_nbytes = 0; /* # bytes for current line */ static unsigned cur_line_nbytes = 0; /* # bytes for current line */
static unsigned cur_line_alloc = 0; /* # bytes total in buffer */ static unsigned cur_line_alloc = 0; /* # bytes total in buffer */
static long line_number = 0; /* current input line number */ static long line_number = 0; /* current input line number */
static int debug = 0; /* trace functions */ static int debug = 0; /* trace functions */
static int version = 0; /* print version # */ static int version = 0; /* print version # */
static int verbose = 0; static int verbose = 0;
static int had_errors = 0; /* != 0 if errors were found */ static int had_errors = 0; /* != 0 if errors were found */
static int rename_output = 0; /* != 0 if rename output file*/ static int rename_output = 0; /* != 0 if rename output file*/
...@@ -1531,109 +1530,64 @@ static const char stabs_symbol[] = STABS_SYMBOL; ...@@ -1531,109 +1530,64 @@ static const char stabs_symbol[] = STABS_SYMBOL;
#define STATIC static #define STATIC static
#endif #endif
STATIC int out_of_bounds PARAMS ((symint_t, symint_t, const char *, int)); STATIC int out_of_bounds (symint_t, symint_t, const char *, int);
STATIC shash_t *hash_string (const char *, Ptrdiff_t, shash_t **, symint_t *);
STATIC shash_t *hash_string PARAMS ((const char *, STATIC symint_t add_string (varray_t *, shash_t **, const char *, const char *,
Ptrdiff_t, shash_t **);
shash_t **, STATIC symint_t add_local_symbol (const char *, const char *, st_t, sc_t,
symint_t *)); symint_t, symint_t);
STATIC symint_t add_ext_symbol (EXTR *, int);
STATIC symint_t add_string PARAMS ((varray_t *, STATIC symint_t add_aux_sym_symint (symint_t);
shash_t **, STATIC symint_t add_aux_sym_rndx (int, symint_t);
const char *, STATIC symint_t add_aux_sym_tir (type_info_t *, hash_state_t, thash_t **);
const char *, STATIC tag_t * get_tag (const char *, const char *, symint_t, bt_t);
shash_t **)); STATIC void add_unknown_tag (tag_t *);
STATIC void add_procedure (const char *, const char *);
STATIC symint_t add_local_symbol STATIC void initialize_init_file (void);
PARAMS ((const char *, STATIC void add_file (const char *, const char *);
const char *, STATIC void add_bytes (varray_t *, char *, Size_t);
st_t, STATIC void add_varray_page (varray_t *);
sc_t, STATIC void update_headers (void);
symint_t, STATIC void write_varray (varray_t *, off_t, const char *);
symint_t)); STATIC void write_object (void);
STATIC const char *st_to_string (st_t);
STATIC symint_t add_ext_symbol PARAMS ((EXTR *, STATIC const char *sc_to_string (sc_t);
int)); STATIC char *read_line (void);
STATIC void parse_input (void);
STATIC symint_t add_aux_sym_symint STATIC void mark_stabs (const char *);
PARAMS ((symint_t)); STATIC void parse_begin (const char *);
STATIC void parse_bend (const char *);
STATIC symint_t add_aux_sym_rndx STATIC void parse_def (const char *);
PARAMS ((int, symint_t)); STATIC void parse_end (const char *);
STATIC void parse_ent (const char *);
STATIC symint_t add_aux_sym_tir PARAMS ((type_info_t *, STATIC void parse_file (const char *);
hash_state_t, STATIC void parse_stabs_common (const char *, const char *, const char *);
thash_t **)); STATIC void parse_stabs (const char *);
STATIC void parse_stabn (const char *);
STATIC tag_t * get_tag PARAMS ((const char *, STATIC page_t *read_seek (Size_t, off_t, const char *);
const char *, STATIC void copy_object (void);
symint_t,
bt_t)); STATIC void catch_signal (int) ATTRIBUTE_NORETURN;
STATIC page_t *allocate_page (void);
STATIC void add_unknown_tag PARAMS ((tag_t *)); STATIC page_t *allocate_multiple_pages (Size_t);
STATIC void free_multiple_pages (page_t *, Size_t);
STATIC void add_procedure PARAMS ((const char *,
const char *));
STATIC void initialize_init_file PARAMS ((void));
STATIC void add_file PARAMS ((const char *,
const char *));
STATIC void add_bytes PARAMS ((varray_t *,
char *,
Size_t));
STATIC void add_varray_page PARAMS ((varray_t *));
STATIC void update_headers PARAMS ((void));
STATIC void write_varray PARAMS ((varray_t *, off_t, const char *));
STATIC void write_object PARAMS ((void));
STATIC const char *st_to_string PARAMS ((st_t));
STATIC const char *sc_to_string PARAMS ((sc_t));
STATIC char *read_line PARAMS ((void));
STATIC void parse_input PARAMS ((void));
STATIC void mark_stabs PARAMS ((const char *));
STATIC void parse_begin PARAMS ((const char *));
STATIC void parse_bend PARAMS ((const char *));
STATIC void parse_def PARAMS ((const char *));
STATIC void parse_end PARAMS ((const char *));
STATIC void parse_ent PARAMS ((const char *));
STATIC void parse_file PARAMS ((const char *));
STATIC void parse_stabs_common
PARAMS ((const char *, const char *, const char *));
STATIC void parse_stabs PARAMS ((const char *));
STATIC void parse_stabn PARAMS ((const char *));
STATIC page_t *read_seek PARAMS ((Size_t, off_t, const char *));
STATIC void copy_object PARAMS ((void));
STATIC void catch_signal PARAMS ((int)) ATTRIBUTE_NORETURN;
STATIC page_t *allocate_page PARAMS ((void));
STATIC page_t *allocate_multiple_pages
PARAMS ((Size_t));
STATIC void free_multiple_pages
PARAMS ((page_t *, Size_t));
#ifndef MALLOC_CHECK #ifndef MALLOC_CHECK
STATIC page_t *allocate_cluster STATIC page_t *allocate_cluster (Size_t);
PARAMS ((Size_t));
#endif #endif
STATIC forward_t *allocate_forward PARAMS ((void)); STATIC forward_t *allocate_forward (void);
STATIC scope_t *allocate_scope PARAMS ((void)); STATIC scope_t *allocate_scope (void);
STATIC shash_t *allocate_shash PARAMS ((void)); STATIC shash_t *allocate_shash (void);
STATIC tag_t *allocate_tag PARAMS ((void)); STATIC tag_t *allocate_tag (void);
STATIC thash_t *allocate_thash PARAMS ((void)); STATIC thash_t *allocate_thash (void);
STATIC thead_t *allocate_thead PARAMS ((void)); STATIC thead_t *allocate_thead (void);
STATIC vlinks_t *allocate_vlinks PARAMS ((void)); STATIC vlinks_t *allocate_vlinks (void);
STATIC void free_forward PARAMS ((forward_t *)); STATIC void free_forward (forward_t *);
STATIC void free_scope PARAMS ((scope_t *)); STATIC void free_scope (scope_t *);
STATIC void free_tag PARAMS ((tag_t *)); STATIC void free_tag (tag_t *);
STATIC void free_thead PARAMS ((thead_t *)); STATIC void free_thead (thead_t *);
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
...@@ -1647,7 +1601,7 @@ extern int opterr; ...@@ -1647,7 +1601,7 @@ extern int opterr;
typedef struct _pseudo_ops { typedef struct _pseudo_ops {
const char *const name; /* pseudo-op in ascii */ const char *const name; /* pseudo-op in ascii */
const int len; /* length of name to compare */ const int len; /* length of name to compare */
void (*const func) PARAMS ((const char *)); /* function to handle line */ void (*const func) (const char *); /* function to handle line */
} pseudo_ops_t; } pseudo_ops_t;
static const pseudo_ops_t pseudo_ops[] = { static const pseudo_ops_t pseudo_ops[] = {
...@@ -1677,8 +1631,7 @@ static const struct option options[] = ...@@ -1677,8 +1631,7 @@ static const struct option options[] =
/* Add a page to a varray object. */ /* Add a page to a varray object. */
STATIC void STATIC void
add_varray_page (vp) add_varray_page (varray_t *vp)
varray_t *vp; /* varray to add page to */
{ {
vlinks_t *new_links = allocate_vlinks (); vlinks_t *new_links = allocate_vlinks ();
...@@ -1711,11 +1664,8 @@ add_varray_page (vp) ...@@ -1711,11 +1664,8 @@ add_varray_page (vp)
#define HASHBITS 30 #define HASHBITS 30
STATIC shash_t * STATIC shash_t *
hash_string (text, hash_len, hash_tbl, ret_hash_index) hash_string (const char *text, Ptrdiff_t hash_len, shash_t **hash_tbl,
const char *text; /* ptr to text to hash */ symint_t *ret_hash_index)
Ptrdiff_t hash_len; /* length of the text */
shash_t **hash_tbl; /* hash table */
symint_t *ret_hash_index; /* ptr to store hash index */
{ {
unsigned long hi; unsigned long hi;
Ptrdiff_t i; Ptrdiff_t i;
...@@ -1743,16 +1693,15 @@ hash_string (text, hash_len, hash_tbl, ret_hash_index) ...@@ -1743,16 +1693,15 @@ hash_string (text, hash_len, hash_tbl, ret_hash_index)
/* Add a string (and null pad) to one of the string tables. A /* Add a string (and null pad) to one of the string tables. A
consequence of hashing strings, is that we don't let strings consequence of hashing strings, is that we don't let strings cross
cross page boundaries. The extra nulls will be ignored. */ page boundaries. The extra nulls will be ignored. VP is a string
virtual array, HASH_TBL a pointer to the hash table, the string
starts at START and the position one byte after the string is given
with END_P1, the resulting hash pointer is returned in RET_HASH. */
STATIC symint_t STATIC symint_t
add_string (vp, hash_tbl, start, end_p1, ret_hash) add_string (varray_t *vp, shash_t **hash_tbl, const char *start,
varray_t *vp; /* string virtual array */ const char *end_p1, shash_t **ret_hash)
shash_t **hash_tbl; /* ptr to hash table */
const char *start; /* 1st byte in string */
const char *end_p1; /* 1st byte after string */
shash_t **ret_hash; /* return hash pointer */
{ {
Ptrdiff_t len = end_p1 - start; Ptrdiff_t len = end_p1 - start;
shash_t *hash_ptr; shash_t *hash_ptr;
...@@ -1797,16 +1746,14 @@ add_string (vp, hash_tbl, start, end_p1, ret_hash) ...@@ -1797,16 +1746,14 @@ add_string (vp, hash_tbl, start, end_p1, ret_hash)
} }
/* Add a local symbol. */ /* Add a local symbol. The symbol string starts at STR_START and the
first byte after it is makred by STR_END_P1. The symbol has type
TYPE and storage class STORAGE and value VALUE. INDX is an index
to local/aux. symbols. */
STATIC symint_t STATIC symint_t
add_local_symbol (str_start, str_end_p1, type, storage, value, indx) add_local_symbol (const char *str_start, const char *str_end_p1, st_t type,
const char *str_start; /* first byte in string */ sc_t storage, symint_t value, symint_t indx)
const char *str_end_p1; /* first byte after string */
st_t type; /* symbol type */
sc_t storage; /* storage class */
symint_t value; /* value of symbol */
symint_t indx; /* index to local/aux. syms */
{ {
symint_t ret; symint_t ret;
SYMR *psym; SYMR *psym;
...@@ -1975,12 +1922,11 @@ add_local_symbol (str_start, str_end_p1, type, storage, value, indx) ...@@ -1975,12 +1922,11 @@ add_local_symbol (str_start, str_end_p1, type, storage, value, indx)
} }
/* Add an external symbol. */ /* Add an external symbol with symbol pointer ESYM and file index
IFD. */
STATIC symint_t STATIC symint_t
add_ext_symbol (esym, ifd) add_ext_symbol (EXTR *esym, int ifd)
EXTR *esym; /* symbol pointer */
int ifd; /* file index */
{ {
const char *str_start; /* first byte in string */ const char *str_start; /* first byte in string */
const char *str_end_p1; /* first byte after string */ const char *str_end_p1; /* first byte after string */
...@@ -2032,8 +1978,7 @@ add_ext_symbol (esym, ifd) ...@@ -2032,8 +1978,7 @@ add_ext_symbol (esym, ifd)
/* Add an auxiliary symbol (passing a symint). */ /* Add an auxiliary symbol (passing a symint). */
STATIC symint_t STATIC symint_t
add_aux_sym_symint (aux_word) add_aux_sym_symint (symint_t aux_word)
symint_t aux_word; /* auxiliary information word */
{ {
AUXU *aux_ptr; AUXU *aux_ptr;
efdr_t *file_ptr = cur_file_ptr; efdr_t *file_ptr = cur_file_ptr;
...@@ -2052,9 +1997,7 @@ add_aux_sym_symint (aux_word) ...@@ -2052,9 +1997,7 @@ add_aux_sym_symint (aux_word)
/* Add an auxiliary symbol (passing a file/symbol index combo). */ /* Add an auxiliary symbol (passing a file/symbol index combo). */
STATIC symint_t STATIC symint_t
add_aux_sym_rndx (file_index, sym_index) add_aux_sym_rndx (int file_index, symint_t sym_index)
int file_index;
symint_t sym_index;
{ {
AUXU *aux_ptr; AUXU *aux_ptr;
efdr_t *file_ptr = cur_file_ptr; efdr_t *file_ptr = cur_file_ptr;
...@@ -2075,10 +2018,7 @@ add_aux_sym_rndx (file_index, sym_index) ...@@ -2075,10 +2018,7 @@ add_aux_sym_rndx (file_index, sym_index)
type qualifiers). */ type qualifiers). */
STATIC symint_t STATIC symint_t
add_aux_sym_tir (t, state, hash_tbl) add_aux_sym_tir (type_info_t *t, hash_state_t state, thash_t **hash_tbl)
type_info_t *t; /* current type information */
hash_state_t state; /* whether to hash type or not */
thash_t **hash_tbl; /* pointer to hash table to use */
{ {
AUXU *aux_ptr; AUXU *aux_ptr;
efdr_t *file_ptr = cur_file_ptr; efdr_t *file_ptr = cur_file_ptr;
...@@ -2162,7 +2102,7 @@ add_aux_sym_tir (t, state, hash_tbl) ...@@ -2162,7 +2102,7 @@ add_aux_sym_tir (t, state, hash_tbl)
ret = vp->num_allocated++; ret = vp->num_allocated++;
/* Add bitfield length if it exists. /* Add bitfield length if it exists.
NOTE: Mips documentation claims bitfield goes at the end of the NOTE: Mips documentation claims bitfield goes at the end of the
AUX record, but the DECstation compiler emits it here. AUX record, but the DECstation compiler emits it here.
(This would only make a difference for enum bitfields.) (This would only make a difference for enum bitfields.)
...@@ -2237,11 +2177,11 @@ add_aux_sym_tir (t, state, hash_tbl) ...@@ -2237,11 +2177,11 @@ add_aux_sym_tir (t, state, hash_tbl)
/* Add a tag to the tag table (unless it already exists). */ /* Add a tag to the tag table (unless it already exists). */
STATIC tag_t * STATIC tag_t *
get_tag (tag_start, tag_end_p1, indx, basic_type) get_tag (const char *tag_start, /* 1st byte of tag name */
const char *tag_start; /* 1st byte of tag name */ const char *tag_end_p1, /* 1st byte after tag name */
const char *tag_end_p1; /* 1st byte after tag name */ symint_t indx, /* index of tag start block */
symint_t indx; /* index of tag start block */ bt_t basic_type) /* bt_Struct, bt_Union, or bt_Enum */
bt_t basic_type; /* bt_Struct, bt_Union, or bt_Enum */
{ {
shash_t *hash_ptr; shash_t *hash_ptr;
tag_t *tag_ptr; tag_t *tag_ptr;
...@@ -2289,8 +2229,7 @@ get_tag (tag_start, tag_end_p1, indx, basic_type) ...@@ -2289,8 +2229,7 @@ get_tag (tag_start, tag_end_p1, indx, basic_type)
/* Add an unknown {struct, union, enum} tag. */ /* Add an unknown {struct, union, enum} tag. */
STATIC void STATIC void
add_unknown_tag (ptag) add_unknown_tag (tag_t *ptag)
tag_t *ptag; /* pointer to tag information */
{ {
shash_t *hash_ptr = ptag->hash_ptr; shash_t *hash_ptr = ptag->hash_ptr;
char *name_start = hash_ptr->string; char *name_start = hash_ptr->string;
...@@ -2349,9 +2288,8 @@ add_unknown_tag (ptag) ...@@ -2349,9 +2288,8 @@ add_unknown_tag (ptag)
this procedure, use that to initialize the current PDR. */ this procedure, use that to initialize the current PDR. */
STATIC void STATIC void
add_procedure (func_start, func_end_p1) add_procedure (const char *func_start, /* 1st byte of func name */
const char *func_start; /* 1st byte of func name */ const char *func_end_p1) /* 1st byte after func name */
const char *func_end_p1; /* 1st byte after func name */
{ {
PDR *new_proc_ptr; PDR *new_proc_ptr;
efdr_t *file_ptr = cur_file_ptr; efdr_t *file_ptr = cur_file_ptr;
...@@ -2413,7 +2351,7 @@ add_procedure (func_start, func_end_p1) ...@@ -2413,7 +2351,7 @@ add_procedure (func_start, func_end_p1)
/* Initialize the init_file structure. */ /* Initialize the init_file structure. */
STATIC void STATIC void
initialize_init_file () initialize_init_file (void)
{ {
memset ((void*) &init_file, 0, sizeof (init_file)); memset ((void*) &init_file, 0, sizeof (init_file));
...@@ -2438,9 +2376,8 @@ initialize_init_file () ...@@ -2438,9 +2376,8 @@ initialize_init_file ()
where the current file structure lives. */ where the current file structure lives. */
STATIC void STATIC void
add_file (file_start, file_end_p1) add_file (const char *file_start, /* first byte in string */
const char *file_start; /* first byte in string */ const char *file_end_p1) /* first byte after string */
const char *file_end_p1; /* first byte after string */
{ {
static char zero_bytes[2] = { '\0', '\0' }; static char zero_bytes[2] = { '\0', '\0' };
...@@ -2521,10 +2458,9 @@ add_file (file_start, file_end_p1) ...@@ -2521,10 +2458,9 @@ add_file (file_start, file_end_p1)
/* Add a stream of random bytes to a varray. */ /* Add a stream of random bytes to a varray. */
STATIC void STATIC void
add_bytes (vp, input_ptr, nitems) add_bytes (varray_t *vp, /* virtual array to add too */
varray_t *vp; /* virtual array to add too */ char *input_ptr, /* start of the bytes */
char *input_ptr; /* start of the bytes */ Size_t nitems) /* # items to move */
Size_t nitems; /* # items to move */
{ {
Size_t move_items; Size_t move_items;
Size_t move_bytes; Size_t move_bytes;
...@@ -2560,8 +2496,7 @@ add_bytes (vp, input_ptr, nitems) ...@@ -2560,8 +2496,7 @@ add_bytes (vp, input_ptr, nitems)
/* Convert storage class to string. */ /* Convert storage class to string. */
STATIC const char * STATIC const char *
sc_to_string (storage_class) sc_to_string (sc_t storage_class)
sc_t storage_class;
{ {
switch (storage_class) switch (storage_class)
{ {
...@@ -2598,8 +2533,7 @@ sc_to_string (storage_class) ...@@ -2598,8 +2533,7 @@ sc_to_string (storage_class)
/* Convert symbol type to string. */ /* Convert symbol type to string. */
STATIC const char * STATIC const char *
st_to_string (symbol_type) st_to_string (st_t symbol_type)
st_t symbol_type;
{ {
switch (symbol_type) switch (symbol_type)
{ {
...@@ -2635,7 +2569,7 @@ st_to_string (symbol_type) ...@@ -2635,7 +2569,7 @@ st_to_string (symbol_type)
semi-colon, and return each logical line independently. */ semi-colon, and return each logical line independently. */
STATIC char * STATIC char *
read_line () read_line (void)
{ {
static int line_split_p = 0; static int line_split_p = 0;
int string_p = 0; int string_p = 0;
...@@ -2711,8 +2645,7 @@ read_line () ...@@ -2711,8 +2645,7 @@ read_line ()
which gives the location of the start of the block. */ which gives the location of the start of the block. */
STATIC void STATIC void
parse_begin (start) parse_begin (const char *start)
const char *start; /* start of directive */
{ {
const char *end_p1; /* end of label */ const char *end_p1; /* end of label */
int ch; int ch;
...@@ -2763,8 +2696,7 @@ parse_begin (start) ...@@ -2763,8 +2696,7 @@ parse_begin (start)
which gives the location of the end of the block. */ which gives the location of the end of the block. */
STATIC void STATIC void
parse_bend (start) parse_bend (const char *start)
const char *start; /* start of directive */
{ {
const char *end_p1; /* end of label */ const char *end_p1; /* end of label */
int ch; int ch;
...@@ -2822,8 +2754,7 @@ parse_bend (start) ...@@ -2822,8 +2754,7 @@ parse_bend (start)
.tag specify a tag for a struct, union, or enum. */ .tag specify a tag for a struct, union, or enum. */
STATIC void STATIC void
parse_def (name_start) parse_def (const char *name_start)
const char *name_start; /* start of directive */
{ {
const char *dir_start; /* start of current directive*/ const char *dir_start; /* start of current directive*/
const char *dir_end_p1; /* end+1 of current directive*/ const char *dir_end_p1; /* end+1 of current directive*/
...@@ -3142,7 +3073,7 @@ parse_def (name_start) ...@@ -3142,7 +3073,7 @@ parse_def (name_start)
class, symbol type, etc. */ class, symbol type, etc. */
else else
{ {
shash_t *orig_hash_ptr; /* hash within orig sym table*/ shash_t *orig_hash_ptr; /* hash within orig sym table*/
shash_t *ext_hash_ptr; /* hash within ext. sym table*/ shash_t *ext_hash_ptr; /* hash within ext. sym table*/
ext_hash_ptr = hash_string (arg_start, ext_hash_ptr = hash_string (arg_start,
...@@ -3397,8 +3328,7 @@ bomb_out: ...@@ -3397,8 +3328,7 @@ bomb_out:
/* Parse .end directives. */ /* Parse .end directives. */
STATIC void STATIC void
parse_end (start) parse_end (const char *start)
const char *start; /* start of directive */
{ {
const char *start_func, *end_func_p1; const char *start_func, *end_func_p1;
int ch; int ch;
...@@ -3460,8 +3390,7 @@ parse_end (start) ...@@ -3460,8 +3390,7 @@ parse_end (start)
/* Parse .ent directives. */ /* Parse .ent directives. */
STATIC void STATIC void
parse_ent (start) parse_ent (const char *start)
const char *start; /* start of directive */
{ {
const char *start_func, *end_func_p1; const char *start_func, *end_func_p1;
int ch; int ch;
...@@ -3498,8 +3427,7 @@ parse_ent (start) ...@@ -3498,8 +3427,7 @@ parse_ent (start)
/* Parse .file directives. */ /* Parse .file directives. */
STATIC void STATIC void
parse_file (start) parse_file (const char *start)
const char *start; /* start of directive */
{ {
char *p; char *p;
char *start_name, *end_name_p1; char *start_name, *end_name_p1;
...@@ -3526,8 +3454,7 @@ parse_file (start) ...@@ -3526,8 +3454,7 @@ parse_file (start)
/* Make sure the @stabs symbol is emitted. */ /* Make sure the @stabs symbol is emitted. */
static void static void
mark_stabs (start) mark_stabs (const char *start ATTRIBUTE_UNUSED)
const char *start ATTRIBUTE_UNUSED; /* Start of directive (ignored) */
{ {
if (!stabs_seen) if (!stabs_seen)
{ {
...@@ -3571,10 +3498,9 @@ mark_stabs (start) ...@@ -3571,10 +3498,9 @@ mark_stabs (start)
value a numeric value or an address. */ value a numeric value or an address. */
STATIC void STATIC void
parse_stabs_common (string_start, string_end, rest) parse_stabs_common (const char *string_start, /* start of string or NULL */
const char *string_start; /* start of string or NULL */ const char *string_end, /* end+1 of string or NULL */
const char *string_end; /* end+1 of string or NULL */ const char *rest) /* rest of the directive. */
const char *rest; /* rest of the directive. */
{ {
efdr_t *save_file_ptr = cur_file_ptr; efdr_t *save_file_ptr = cur_file_ptr;
symint_t code; symint_t code;
...@@ -3770,8 +3696,7 @@ parse_stabs_common (string_start, string_end, rest) ...@@ -3770,8 +3696,7 @@ parse_stabs_common (string_start, string_end, rest)
STATIC void STATIC void
parse_stabs (start) parse_stabs (const char *start)
const char *start; /* start of directive */
{ {
const char *end = strchr (start+1, '"'); const char *end = strchr (start+1, '"');
...@@ -3786,8 +3711,7 @@ parse_stabs (start) ...@@ -3786,8 +3711,7 @@ parse_stabs (start)
STATIC void STATIC void
parse_stabn (start) parse_stabn (const char *start)
const char *start; /* start of directive */
{ {
parse_stabs_common ((const char *) 0, (const char *) 0, start); parse_stabs_common ((const char *) 0, (const char *) 0, start);
} }
...@@ -3797,7 +3721,7 @@ parse_stabn (start) ...@@ -3797,7 +3721,7 @@ parse_stabn (start)
if needed. */ if needed. */
STATIC void STATIC void
parse_input () parse_input (void)
{ {
char *p; char *p;
Size_t i; Size_t i;
...@@ -3860,7 +3784,7 @@ parse_input () ...@@ -3860,7 +3784,7 @@ parse_input ()
to write out the .T file. */ to write out the .T file. */
STATIC void STATIC void
update_headers () update_headers (void)
{ {
symint_t i; symint_t i;
efdr_t *file_ptr; efdr_t *file_ptr;
...@@ -3916,7 +3840,7 @@ update_headers () ...@@ -3916,7 +3840,7 @@ update_headers ()
hash_ptr = hash_string (str, hash_ptr = hash_string (str,
(Ptrdiff_t) len, (Ptrdiff_t) len,
&file_ptr->shash_head[0], &file_ptr->shash_head[0],
(symint_t *) 0); (symint_t *) 0);
if (hash_ptr == (shash_t *) 0) if (hash_ptr == (shash_t *) 0)
{ {
(void) add_local_symbol (str, str + len, (void) add_local_symbol (str, str + len,
...@@ -4046,10 +3970,9 @@ update_headers () ...@@ -4046,10 +3970,9 @@ update_headers ()
/* Write out a varray at a given location. */ /* Write out a varray at a given location. */
STATIC void STATIC void
write_varray (vp, offset, str) write_varray (varray_t *vp, /* virtual array */
varray_t *vp; /* virtual array */ off_t offset, /* offset to write varray to */
off_t offset; /* offset to write varray to */ const char *str) /* string to print out when tracing */
const char *str; /* string to print out when tracing */
{ {
int num_write, sys_write; int num_write, sys_write;
vlinks_t *ptr; vlinks_t *ptr;
...@@ -4064,7 +3987,7 @@ write_varray (vp, offset, str) ...@@ -4064,7 +3987,7 @@ write_varray (vp, offset, str)
fprintf (stderr, ", offset = %7lu, size = %7lu, %s\n", fprintf (stderr, ", offset = %7lu, size = %7lu, %s\n",
(unsigned long) offset, vp->num_allocated * vp->object_size, str); (unsigned long) offset, vp->num_allocated * vp->object_size, str);
} }
if (file_offset != (unsigned long) offset if (file_offset != (unsigned long) offset
&& fseek (object_stream, (long) offset, SEEK_SET) < 0) && fseek (object_stream, (long) offset, SEEK_SET) < 0)
pfatal_with_name (object_name); pfatal_with_name (object_name);
...@@ -4093,7 +4016,7 @@ write_varray (vp, offset, str) ...@@ -4093,7 +4016,7 @@ write_varray (vp, offset, str)
/* Write out the symbol table in the object file. */ /* Write out the symbol table in the object file. */
STATIC void STATIC void
write_object () write_object (void)
{ {
int sys_write; int sys_write;
efdr_t *file_ptr; efdr_t *file_ptr;
...@@ -4332,10 +4255,9 @@ write_object () ...@@ -4332,10 +4255,9 @@ write_object ()
/* Read some bytes at a specified location, and return a pointer. */ /* Read some bytes at a specified location, and return a pointer. */
STATIC page_t * STATIC page_t *
read_seek (size, offset, str) read_seek (Size_t size, /* # bytes to read */
Size_t size; /* # bytes to read */ off_t offset, /* offset to read at */
off_t offset; /* offset to read at */ const char *str) /* name for tracing */
const char *str; /* name for tracing */
{ {
page_t *ptr; page_t *ptr;
long sys_read = 0; long sys_read = 0;
...@@ -4402,7 +4324,7 @@ read_seek (size, offset, str) ...@@ -4402,7 +4324,7 @@ read_seek (size, offset, str)
symbol table. */ symbol table. */
STATIC void STATIC void
copy_object () copy_object (void)
{ {
char buffer[ PAGE_SIZE ]; char buffer[ PAGE_SIZE ];
int sys_read; int sys_read;
...@@ -4771,12 +4693,10 @@ copy_object () ...@@ -4771,12 +4693,10 @@ copy_object ()
/* Ye olde main program. */ /* Ye olde main program. */
extern int main PARAMS ((int, char **)); extern int main (int, char **);
int int
main (argc, argv) main (int argc, char **argv)
int argc;
char **argv;
{ {
int iflag = 0; int iflag = 0;
char *p = strrchr (argv[0], '/'); char *p = strrchr (argv[0], '/');
...@@ -4873,7 +4793,7 @@ main (argc, argv) ...@@ -4873,7 +4793,7 @@ main (argc, argv)
fputs (_("Copyright (C) 2003 Free Software Foundation, Inc.\n"), stdout); fputs (_("Copyright (C) 2003 Free Software Foundation, Inc.\n"), stdout);
fputs (_("This is free software; see the source for copying conditions. There is NO\n\ fputs (_("This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"), warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"),
stdout); stdout);
exit (0); exit (0);
} }
...@@ -5009,8 +4929,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" ...@@ -5009,8 +4929,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"
/* Catch a signal and exit without dumping core. */ /* Catch a signal and exit without dumping core. */
STATIC void STATIC void
catch_signal (signum) catch_signal (int signum)
int signum;
{ {
(void) signal (signum, SIG_DFL); /* just in case... */ (void) signal (signum, SIG_DFL); /* just in case... */
fatal ("%s", strsignal (signum)); fatal ("%s", strsignal (signum));
...@@ -5020,8 +4939,7 @@ catch_signal (signum) ...@@ -5020,8 +4939,7 @@ catch_signal (signum)
Also include a system error message based on `errno'. */ Also include a system error message based on `errno'. */
void void
pfatal_with_name (msg) pfatal_with_name (const char *msg)
const char *msg;
{ {
int save_errno = errno; /* just in case.... */ int save_errno = errno; /* just in case.... */
if (line_number > 0) if (line_number > 0)
...@@ -5044,11 +4962,10 @@ pfatal_with_name (msg) ...@@ -5044,11 +4962,10 @@ pfatal_with_name (msg)
ORIG_xxx macros, but the function never returns. */ ORIG_xxx macros, but the function never returns. */
static int static int
out_of_bounds (indx, max, str, prog_line) out_of_bounds (symint_t indx, /* index that is out of bounds */
symint_t indx; /* index that is out of bounds */ symint_t max, /* maximum index */
symint_t max; /* maximum index */ const char *str, /* string to print out */
const char *str; /* string to print out */ int prog_line) /* line number within mips-tfile.c */
int prog_line; /* line number within mips-tfile.c */
{ {
if (indx < max) /* just in case */ if (indx < max) /* just in case */
return 0; return 0;
...@@ -5069,8 +4986,7 @@ out_of_bounds (indx, max, str, prog_line) ...@@ -5069,8 +4986,7 @@ out_of_bounds (indx, max, str, prog_line)
#ifdef USE_MALLOC #ifdef USE_MALLOC
STATIC page_t * STATIC page_t *
allocate_cluster (npages) allocate_cluster (Size_t npages)
Size_t npages;
{ {
page_t *value = (page_t *) xcalloc (npages, PAGE_USIZE); page_t *value = (page_t *) xcalloc (npages, PAGE_USIZE);
...@@ -5083,8 +4999,7 @@ allocate_cluster (npages) ...@@ -5083,8 +4999,7 @@ allocate_cluster (npages)
#else /* USE_MALLOC */ #else /* USE_MALLOC */
STATIC page_t * STATIC page_t *
allocate_cluster (npages) allocate_cluster (Size_t npages)
Size_t npages;
{ {
page_t *ptr = (page_t *) sbrk (0); /* current sbreak */ page_t *ptr = (page_t *) sbrk (0); /* current sbreak */
unsigned long offset = ((unsigned long) ptr) & (PAGE_SIZE - 1); unsigned long offset = ((unsigned long) ptr) & (PAGE_SIZE - 1);
...@@ -5123,8 +5038,7 @@ static unsigned pages_left = 0; ...@@ -5123,8 +5038,7 @@ static unsigned pages_left = 0;
/* Allocate some pages (which is initialized to 0). */ /* Allocate some pages (which is initialized to 0). */
STATIC page_t * STATIC page_t *
allocate_multiple_pages (npages) allocate_multiple_pages (Size_t npages)
Size_t npages;
{ {
#ifndef MALLOC_CHECK #ifndef MALLOC_CHECK
if (pages_left == 0 && npages < MAX_CLUSTER_PAGES) if (pages_left == 0 && npages < MAX_CLUSTER_PAGES)
...@@ -5153,9 +5067,7 @@ allocate_multiple_pages (npages) ...@@ -5153,9 +5067,7 @@ allocate_multiple_pages (npages)
/* Release some pages. */ /* Release some pages. */
STATIC void STATIC void
free_multiple_pages (page_ptr, npages) free_multiple_pages (page_t *page_ptr, Size_t npages)
page_t *page_ptr;
Size_t npages;
{ {
#ifndef MALLOC_CHECK #ifndef MALLOC_CHECK
if (pages_left == 0) if (pages_left == 0)
...@@ -5184,7 +5096,7 @@ free_multiple_pages (page_ptr, npages) ...@@ -5184,7 +5096,7 @@ free_multiple_pages (page_ptr, npages)
/* Allocate one page (which is initialized to 0). */ /* Allocate one page (which is initialized to 0). */
STATIC page_t * STATIC page_t *
allocate_page () allocate_page (void)
{ {
#ifndef MALLOC_CHECK #ifndef MALLOC_CHECK
if (pages_left == 0) if (pages_left == 0)
...@@ -5206,7 +5118,7 @@ allocate_page () ...@@ -5206,7 +5118,7 @@ allocate_page ()
/* Allocate scoping information. */ /* Allocate scoping information. */
STATIC scope_t * STATIC scope_t *
allocate_scope () allocate_scope (void)
{ {
scope_t *ptr; scope_t *ptr;
static scope_t initial_scope; static scope_t initial_scope;
...@@ -5245,8 +5157,7 @@ allocate_scope () ...@@ -5245,8 +5157,7 @@ allocate_scope ()
/* Free scoping information. */ /* Free scoping information. */
STATIC void STATIC void
free_scope (ptr) free_scope (scope_t *ptr)
scope_t *ptr;
{ {
alloc_counts[ (int) alloc_type_scope ].total_free++; alloc_counts[ (int) alloc_type_scope ].total_free++;
...@@ -5264,7 +5175,7 @@ free_scope (ptr) ...@@ -5264,7 +5175,7 @@ free_scope (ptr)
/* Allocate links for pages in a virtual array. */ /* Allocate links for pages in a virtual array. */
STATIC vlinks_t * STATIC vlinks_t *
allocate_vlinks () allocate_vlinks (void)
{ {
vlinks_t *ptr; vlinks_t *ptr;
static vlinks_t initial_vlinks; static vlinks_t initial_vlinks;
...@@ -5297,7 +5208,7 @@ allocate_vlinks () ...@@ -5297,7 +5208,7 @@ allocate_vlinks ()
/* Allocate string hash buckets. */ /* Allocate string hash buckets. */
STATIC shash_t * STATIC shash_t *
allocate_shash () allocate_shash (void)
{ {
shash_t *ptr; shash_t *ptr;
static shash_t initial_shash; static shash_t initial_shash;
...@@ -5330,7 +5241,7 @@ allocate_shash () ...@@ -5330,7 +5241,7 @@ allocate_shash ()
/* Allocate type hash buckets. */ /* Allocate type hash buckets. */
STATIC thash_t * STATIC thash_t *
allocate_thash () allocate_thash (void)
{ {
thash_t *ptr; thash_t *ptr;
static thash_t initial_thash; static thash_t initial_thash;
...@@ -5363,7 +5274,7 @@ allocate_thash () ...@@ -5363,7 +5274,7 @@ allocate_thash ()
/* Allocate structure, union, or enum tag information. */ /* Allocate structure, union, or enum tag information. */
STATIC tag_t * STATIC tag_t *
allocate_tag () allocate_tag (void)
{ {
tag_t *ptr; tag_t *ptr;
static tag_t initial_tag; static tag_t initial_tag;
...@@ -5402,8 +5313,7 @@ allocate_tag () ...@@ -5402,8 +5313,7 @@ allocate_tag ()
/* Free scoping information. */ /* Free scoping information. */
STATIC void STATIC void
free_tag (ptr) free_tag (tag_t *ptr)
tag_t *ptr;
{ {
alloc_counts[ (int) alloc_type_tag ].total_free++; alloc_counts[ (int) alloc_type_tag ].total_free++;
...@@ -5421,7 +5331,7 @@ free_tag (ptr) ...@@ -5421,7 +5331,7 @@ free_tag (ptr)
/* Allocate forward reference to a yet unknown tag. */ /* Allocate forward reference to a yet unknown tag. */
STATIC forward_t * STATIC forward_t *
allocate_forward () allocate_forward (void)
{ {
forward_t *ptr; forward_t *ptr;
static forward_t initial_forward; static forward_t initial_forward;
...@@ -5460,8 +5370,7 @@ allocate_forward () ...@@ -5460,8 +5370,7 @@ allocate_forward ()
/* Free scoping information. */ /* Free scoping information. */
STATIC void STATIC void
free_forward (ptr) free_forward (forward_t *ptr)
forward_t *ptr;
{ {
alloc_counts[ (int) alloc_type_forward ].total_free++; alloc_counts[ (int) alloc_type_forward ].total_free++;
...@@ -5479,7 +5388,7 @@ free_forward (ptr) ...@@ -5479,7 +5388,7 @@ free_forward (ptr)
/* Allocate head of type hash list. */ /* Allocate head of type hash list. */
STATIC thead_t * STATIC thead_t *
allocate_thead () allocate_thead (void)
{ {
thead_t *ptr; thead_t *ptr;
static thead_t initial_thead; static thead_t initial_thead;
...@@ -5518,8 +5427,7 @@ allocate_thead () ...@@ -5518,8 +5427,7 @@ allocate_thead ()
/* Free scoping information. */ /* Free scoping information. */
STATIC void STATIC void
free_thead (ptr) free_thead (thead_t *ptr)
thead_t *ptr;
{ {
alloc_counts[ (int) alloc_type_thead ].total_free++; alloc_counts[ (int) alloc_type_thead ].total_free++;
...@@ -5542,7 +5450,7 @@ void ...@@ -5542,7 +5450,7 @@ void
fatal (const char *format, ...) fatal (const char *format, ...)
{ {
va_list ap; va_list ap;
va_start (ap, format); va_start (ap, format);
if (line_number > 0) if (line_number > 0)
...@@ -5564,7 +5472,7 @@ void ...@@ -5564,7 +5472,7 @@ void
error (const char *format, ...) error (const char *format, ...)
{ {
va_list ap; va_list ap;
va_start (ap, format); va_start (ap, format);
if (line_number > 0) if (line_number > 0)
...@@ -5587,7 +5495,7 @@ error (const char *format, ...) ...@@ -5587,7 +5495,7 @@ error (const char *format, ...)
config.h can #define abort fancy_abort if you like that sort of thing. */ config.h can #define abort fancy_abort if you like that sort of thing. */
void void
fancy_abort () fancy_abort (void)
{ {
fatal ("internal abort"); fatal ("internal abort");
} }
...@@ -5597,8 +5505,7 @@ fancy_abort () ...@@ -5597,8 +5505,7 @@ fancy_abort ()
it calls this function to report clobberage. */ it calls this function to report clobberage. */
void void
botch (s) botch (const char *s)
const char *s;
{ {
fatal ("%s", s); fatal ("%s", s);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment