FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle debug symbols in dynamically loaded (relocated) code:

Browse source 
* dbxread.c (read_ofile_symtab):  Fix up N_CATCH better.  Pass
offset to process_one_symbol.
(process_one_symbol):  Take new offset parameter.  Add it into
appropriate symbol types to relocate symbols to loaded addresses.
Handle all possible symbol types, and complain() about types that
we don't expect to see.
* mipsread.c (psymtab_to_symtab_1):  Pass offset of zero to
process_one_symbol (FIXME, should pass real offset).

Misc bugfixes:

* breakpoint.c (resolve_sal_pc):  Split out code to resolve a
sal's PC value.
(set_breakpoint, break_command_1, until_break_command,
catch_command_1, breakpoint_re_set_one):  Use it.
(breakpoint_re_set_one):  Disable bkpts that don't re-set cleanly.
(breakpoint_re_set):  Mention breakpoint number in error messages.
* symtab.h (resolve_sal_pc):  Declare.
* infcmd.c (jump_command):  Use resolve_sal_pc.

* source.c (find_source_lines):  Avoid "Source file is more
recent than executable" when bfd_get_mtime gives 0.
(list_command):  Shorten "FILE, line N" to "FILE:N".

* putenv.c (putenv):  Avoid unportably casting pointers to unsigneds.
This commit is contained in:
John Gilmore 1992-01-28 02:57:37 +00:00
parent f005e85b88
commit c55e616795
4 changed files with 290 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

41
gdb/ChangeLog
View file

@ -1,15 +1,36 @@
Mon Jan 27 15:46:21 1992 Stu Grossman (grossman at cygnus.com) Mon Jan 27 18:51:03 1992 John Gilmore (gnu at cygnus.com)
* dbxread.c (process_one_symbol): Make a first cut at handling Handle debug symbols in dynamically loaded (relocated) code:
symbol tables generated by Suns acc.
* symtab.c (find_pc_line): Fix stepping into and out of #included * dbxread.c (read_ofile_symtab): Fix up N_CATCH better. Pass
files. offset to process_one_symbol.
(process_one_symbol): Take new offset parameter. Add it into
appropriate symbol types to relocate symbols to loaded addresses.
Handle all possible symbol types, and complain() about types that
we don't expect to see.
* mipsread.c (psymtab_to_symtab_1): Pass offset of zero to
process_one_symbol (FIXME, should pass real offset).
Mon Jan 27 13:43:26 1992 John Gilmore (gnu at cygnus.com) Misc bugfixes:
* breakpoint.c (resolve_sal_pc): Split out code to resolve a
sal's PC value.
(set_breakpoint, break_command_1, until_break_command,
catch_command_1, breakpoint_re_set_one): Use it.
(breakpoint_re_set_one): Disable bkpts that don't re-set cleanly.
(breakpoint_re_set): Mention breakpoint number in error messages.
* symtab.h (resolve_sal_pc): Declare.
* infcmd.c (jump_command): Use resolve_sal_pc.
* source.c (find_source_lines): Avoid "Source file is more
recent than executable" when bfd_get_mtime gives 0.
(list_command): Shorten "FILE, line N" to "FILE:N".
* putenv.c (putenv): Avoid unportably casting pointers to unsigneds.
* buildsym.c (read_struct_type): Circumvent sun3 sunos "--" * buildsym.c (read_struct_type): Circumvent sun3 sunos "--"
compiler bug. compiler bug.
* c-exp.y (yylex): `this' and `template' are only tokens in C++. * c-exp.y (yylex): `this' and `template' are only tokens in C++.
* target.c (target_xfer_memory): Return errno in preference to EIO. * target.c (target_xfer_memory): Return errno in preference to EIO.
@ -18,6 +39,14 @@ Mon Jan 27 13:43:26 1992 John Gilmore (gnu at cygnus.com)
xm-np1.h, xm-pn.h, xm-pyr.h, xm-rtbsd.h, xm-symmetry.h, xm-umax.h: xm-np1.h, xm-pn.h, xm-pyr.h, xm-rtbsd.h, xm-symmetry.h, xm-umax.h:
Remove MISSING_VPRINTF declaration, and superfluous "kgdb" defines. Remove MISSING_VPRINTF declaration, and superfluous "kgdb" defines.
Mon Jan 27 15:46:21 1992 Stu Grossman (grossman at cygnus.com)
* dbxread.c (process_one_symbol): Make a first cut at handling
symbol tables generated by Sun's acc. (#ifdef'd out, FIXME.)
* symtab.c (find_pc_line): Fix stepping into and out of #included
files.
Mon Jan 27 13:00:55 1992 Stu Grossman (grossman at cygnus.com) Mon Jan 27 13:00:55 1992 Stu Grossman (grossman at cygnus.com)
* Makefile.in (OPCODES): Remove OPCODES defs and refs. There is * Makefile.in (OPCODES): Remove OPCODES defs and refs. There is

100
gdb/dbxread.c
View file

@ -1,5 +1,5 @@
/* Read dbx symbol tables and convert to internal format, for GDB. /* Read dbx symbol tables and convert to internal format, for GDB.
Copyright (C) 1986-1991 Free Software Foundation, Inc. Copyright 1986, 1987, 1988, 1989, 1990, 1991 Free Software Foundation, Inc.
This file is part of GDB. This file is part of GDB.
@ -1251,21 +1251,15 @@ read_ofile_symtab (objfile, stringtab, stringtab_size, sym_offset,
{ {
/* N_CATCH is not fixed up by the linker, and unfortunately, /* N_CATCH is not fixed up by the linker, and unfortunately,
there's no other place to put it in the .stab map. */ there's no other place to put it in the .stab map. */
bufp->n_value += text_offset + offset; bufp->n_value += text_offset - offset;
} }
else {
type &= ~N_EXT; /* Ignore external-bit */
if (type == N_TEXT || type == N_DATA || type == N_BSS)
bufp->n_value += offset;
type = bufp->n_type;
}
SET_NAMESTRING (); SET_NAMESTRING ();
if (type & N_STAB) { if (type & N_STAB) {
process_one_symbol (type, bufp->n_desc, bufp->n_value, namestring); process_one_symbol (type, bufp->n_desc, bufp->n_value,
/* our_objfile is an implicit parameter. */ namestring, offset);
/* our_objfile is an implicit parameter. */
} }
/* We skip checking for a new .o or -l file; that should never /* We skip checking for a new .o or -l file; that should never
happen in this routine. */ happen in this routine. */
@ -1319,13 +1313,28 @@ hashname (name)
if (total < 0) total += (1000 << 6); if (total < 0) total += (1000 << 6);
return total % HASHSIZE; return total % HASHSIZE;
} }
/* This handles a single symbol from the symbol-file, building symbols
into a GDB symtab. It takes these arguments and an implicit argument.
TYPE is the type field of the ".stab" symbol entry.
DESC is the desc field of the ".stab" entry.
VALU is the value field of the ".stab" entry.
NAME is the symbol name, in our address space.
OFFSET is the amount by which this object file was relocated
when it was loaded into memory. All symbols that refer
to memory locations need to be offset by this amount.
The implicit argument is:
OUR_OBJFILE is the object file from which we are reading symbols.
It is used in end_symtab. */
void void
process_one_symbol (type, desc, valu, name) process_one_symbol (type, desc, valu, name, offset)
int type, desc; int type, desc;
CORE_ADDR valu; CORE_ADDR valu;
char *name; char *name;
int offset;
{ {
#ifndef SUN_FIXED_LBRAC_BUG #ifndef SUN_FIXED_LBRAC_BUG
/* This records the last pc address we've seen. We depend on there being /* This records the last pc address we've seen. We depend on there being
@ -1364,6 +1373,8 @@ process_one_symbol (type, desc, valu, name)
case N_STSYM: case N_STSYM:
#endif /* 0 */ #endif /* 0 */
valu += offset; /* Relocate for dynamic loading */
/* Either of these types of symbols indicates the start of /* Either of these types of symbols indicates the start of
a new function. We must process its "name" normally for dbx, a new function. We must process its "name" normally for dbx,
but also record the start of a new lexical context, and possibly but also record the start of a new lexical context, and possibly
@ -1401,19 +1412,16 @@ process_one_symbol (type, desc, valu, name)
case N_CATCH: case N_CATCH:
/* Record the address at which this catch takes place. */ /* Record the address at which this catch takes place. */
define_symbol (valu, name, desc, type); define_symbol (valu+offset, name, desc, type);
break;
case N_EHDECL:
/* Don't know what to do with these yet. */
error ("action uncertain for eh extensions");
break; break;
case N_LBRAC: case N_LBRAC:
/* This "symbol" just indicates the start of an inner lexical /* This "symbol" just indicates the start of an inner lexical
context within a function. */ context within a function. */
#if !defined (BLOCK_ADDRESS_ABSOLUTE) #if defined (BLOCK_ADDRESS_ABSOLUTE)
valu += offset; /* Relocate for dynamic loading */
#else
/* On most machines, the block addresses are relative to the /* On most machines, the block addresses are relative to the
N_SO, the linker did not relocate them (sigh). */ N_SO, the linker did not relocate them (sigh). */
valu += last_source_start_addr; valu += last_source_start_addr;
@ -1433,7 +1441,9 @@ process_one_symbol (type, desc, valu, name)
/* This "symbol" just indicates the end of an inner lexical /* This "symbol" just indicates the end of an inner lexical
context that was started with N_LBRAC. */ context that was started with N_LBRAC. */
#if !defined (BLOCK_ADDRESS_ABSOLUTE) #if defined (BLOCK_ADDRESS_ABSOLUTE)
valu += offset; /* Relocate for dynamic loading */
#else
/* On most machines, the block addresses are relative to the /* On most machines, the block addresses are relative to the
N_SO, the linker did not relocate them (sigh). */ N_SO, the linker did not relocate them (sigh). */
valu += last_source_start_addr; valu += last_source_start_addr;
@ -1492,6 +1502,7 @@ process_one_symbol (type, desc, valu, name)
case N_FN: case N_FN:
case N_FN_SEQ: case N_FN_SEQ:
/* This kind of symbol indicates the start of an object file. */ /* This kind of symbol indicates the start of an object file. */
valu += offset; /* Relocate for dynamic loading */
break; break;
case N_SO: case N_SO:
@ -1499,6 +1510,8 @@ process_one_symbol (type, desc, valu, name)
for one source file. for one source file.
Finish the symbol table of the previous source file Finish the symbol table of the previous source file
(if any) and start accumulating a new symbol table. */ (if any) and start accumulating a new symbol table. */
valu += offset; /* Relocate for dynamic loading */
#ifndef SUN_FIXED_LBRAC_BUG #ifndef SUN_FIXED_LBRAC_BUG
last_pc_address = valu; /* Save for SunOS bug circumcision */ last_pc_address = valu; /* Save for SunOS bug circumcision */
#endif #endif
@ -1531,11 +1544,13 @@ process_one_symbol (type, desc, valu, name)
start_symtab (name, NULL, valu); start_symtab (name, NULL, valu);
break; break;
case N_SOL: case N_SOL:
/* This type of symbol indicates the start of data for /* This type of symbol indicates the start of data for
a sub-source-file, one whose contents were copied or a sub-source-file, one whose contents were copied or
included in the compilation of the main source file included in the compilation of the main source file
(whose name was given in the N_SO symbol.) */ (whose name was given in the N_SO symbol.) */
valu += offset; /* Relocate for dynamic loading */
start_subfile (name, NULL); start_subfile (name, NULL);
break; break;
@ -1557,6 +1572,7 @@ process_one_symbol (type, desc, valu, name)
/* This type of "symbol" really just records /* This type of "symbol" really just records
one line-number -- core-address correspondence. one line-number -- core-address correspondence.
Enter it in the line list for this symbol table. */ Enter it in the line list for this symbol table. */
valu += offset; /* Relocate for dynamic loading */
#ifndef SUN_FIXED_LBRAC_BUG #ifndef SUN_FIXED_LBRAC_BUG
last_pc_address = valu; /* Save for SunOS bug circumcision */ last_pc_address = valu; /* Save for SunOS bug circumcision */
#endif #endif
@ -1593,12 +1609,48 @@ process_one_symbol (type, desc, valu, name)
break; break;
} }
case N_ECOML: /* The following symbol types need to have the offset added to their
case N_LENG: value; then we process symbol definitions in the name. */
case N_DEFD: /* GNU Modula-2 symbol */ case N_STSYM: /* Global symbol */
case N_LCSYM: /* Local symbol */
case N_DSLINE: /* Source line number, data seg */
case N_BSLINE: /* Source line number, bss seg */
/* N_BROWS: overlaps with N_BSLINE */
case N_ENTRY: /* Alternate entry point */
valu += offset; /* Relocate for dynamic loading */
/* FALL THROUGH */
/* The following symbol types don't need the address field relocated,
since it is either unused, or is absolute. */
case N_GSYM: /* Global variable */
case N_NSYMS: /* Number of symbols (ultrix) */
case N_NOMAP: /* No map? (ultrix) */
case N_RSYM: /* Register variable */
case N_DEFD: /* Modula-2 GNU module dependency */
case N_SSYM: /* Struct or union element */
case N_LSYM: /* Local symbol in stack */
case N_PSYM: /* Parameter variable */
case N_LENG: /* Length of preceding symbol type */
if (name)
define_symbol (valu, name, desc, type);
break; break;
/* The following symbol types we don't know how to process. Handle
them in a "default" way, but complain to people who care. */
default: default:
case N_EHDECL: /* Exception handler name */
case N_MAIN: /* Name of main routine (not used in C) */
case N_PC: /* Global symbol in Pascal */
case N_M2C: /* Modula-2 compilation unit */
/* N_MOD2: overlaps with N_EHDECL */
case N_SCOPE: /* Modula-2 scope information */
case N_ECOML: /* End common (local name) */
case N_NBTEXT: /* Gould Non-Base-Register symbols??? */
case N_NBDATA:
case N_NBBSS:
case N_NBSTS:
case N_NBLCS:
complain (&unknown_symtype_complaint, local_hex_string(type));
if (name) if (name)
define_symbol (valu, name, desc, type); define_symbol (valu, name, desc, type);
} }

296
gdb/mipsread.c
View file

@ -60,12 +60,15 @@ struct coff_exec {
struct external_aouthdr a; struct external_aouthdr a;
}; };
/* These must match the corresponding definition in mips-tfile.c. */ /* These must match the corresponding definition in mips-tfile.c.
At some point, these should probably go into an include file,
but currently gcc does use/need the ../include directory. */
#define CODE_MASK 0x8F300 #define CODE_MASK 0x8F300
#define MIPS_IS_STAB(sym) (((sym)->index & 0xFFF00) == CODE_MASK) #define MIPS_IS_STAB(sym) (((sym)->index & 0xFFF00) == CODE_MASK)
#define MIPS_MARK_STAB(code) ((code)+CODE_MASK) #define MIPS_MARK_STAB(code) ((code)+CODE_MASK)
#define MIPS_UNMARK_STAB(code) ((code)-CODE_MASK) #define MIPS_UNMARK_STAB(code) ((code)-CODE_MASK)
#define STABS_SYMBOL "@stabs"
/* Each partial symbol table entry contains a pointer to private data for the /* Each partial symbol table entry contains a pointer to private data for the
read_symtab() function to use when expanding a partial symbol table entry read_symtab() function to use when expanding a partial symbol table entry
@ -115,6 +118,9 @@ struct complaint array_bitsize_complaint =
struct complaint array_parse_complaint = struct complaint array_parse_complaint =
{"array type with strange relative symbol", 0, 0}; {"array type with strange relative symbol", 0, 0};
struct complaint bad_tag_guess_complaint =
{"guessed tag type incorrectly", 0, 0};
/* Macros and extra defs */ /* Macros and extra defs */
/* Already-parsed symbols are marked specially */ /* Already-parsed symbols are marked specially */
@ -166,7 +172,7 @@ static int n_undef_symbols, n_undef_labels, n_undef_vars, n_undef_procs;
/* Pseudo symbol to use when putting stabs into the symbol table. */ /* Pseudo symbol to use when putting stabs into the symbol table. */
static char stabs_symbol[] = "@stabs"; static char stabs_symbol[] = STABS_SYMBOL;
/* Extra builtin types */ /* Extra builtin types */
@ -204,6 +210,8 @@ static void add_block();
static void add_symbol(); static void add_symbol();
static int add_line(); static int add_line();
static struct linetable *shrink_linetable(); static struct linetable *shrink_linetable();
static char* mips_next_symbol_text ();
/* Things we export to other modules */ /* Things we export to other modules */
@ -302,6 +310,8 @@ mipscoff_psymtab_to_symtab(pst)
/* Restore the header and list of pending typedefs */ /* Restore the header and list of pending typedefs */
cur_hdr = CUR_HDR(pst); cur_hdr = CUR_HDR(pst);
next_symbol_text_func = mips_next_symbol_text;
psymtab_to_symtab_1(pst, pst->filename); psymtab_to_symtab_1(pst, pst->filename);
/* Match with global symbols. This only needs to be done once, /* Match with global symbols. This only needs to be done once,
@ -928,11 +938,37 @@ data: /* Common code for symbols describing data */
sh->value = (long) SYMBOL_TYPE(s); sh->value = (long) SYMBOL_TYPE(s);
break; break;
#ifndef btVoid /* btVoid was added late. */
#define btVoid 26
#endif
/* These new symbol types have been recently added to SGI machines. */
#ifndef stStruct
#define stStruct 26
#endif
#ifndef stUnion
#define stUnion 27
#endif
#ifndef stEnum
#define stEnum 28
#endif
case stStruct:
case stUnion:
case stEnum:
case stBlock: /* Either a lexical block, or some type */ case stBlock: /* Either a lexical block, or some type */
push_parse_stack(); push_parse_stack();
top_stack->blocktype = stBlock; top_stack->blocktype = stBlock;
if (sh->sc == scInfo) { /* structure/union/enum def */ if (sh->sc == scInfo) { /* structure/union/enum def */
int type_code = TYPE_CODE_UNDEF; int type_code =
sh->st == stStruct ? TYPE_CODE_STRUCT
: sh->st == stUnion ? TYPE_CODE_UNION
: sh->st == stEnum ? TYPE_CODE_ENUM
: TYPE_CODE_UNDEF;
int nfields = 0;
SYMR *tsym;
long max_value = 0;
struct field *f;
s = new_symbol(sh->iss); s = new_symbol(sh->iss);
SYMBOL_NAMESPACE(s) = STRUCT_NAMESPACE; SYMBOL_NAMESPACE(s) = STRUCT_NAMESPACE;
@ -940,74 +976,101 @@ data: /* Common code for symbols describing data */
SYMBOL_VALUE(s) = 0; SYMBOL_VALUE(s) = 0;
add_symbol(s, top_stack->cur_block); add_symbol(s, top_stack->cur_block);
/* If this type was expected, use its partial definition */ /* If this type was expected, use its partial definition */
if (pend) { if (pend)
t = is_pending_symbol(cur_fdr, sh)->t; t = is_pending_symbol(cur_fdr, sh)->t;
} else { else
int nfields = 0;
SYMR *tsym;
long max_value = 0;
struct field *f;
/* First count the number of fields. */
for (tsym = sh+1; tsym->st != stEnd; tsym++)
if (tsym->st == stMember) {
if (nfields == 0)
if (tsym->index == indexNil
|| ax[tsym->index].ti.bt==26)/*btVoid*/
type_code = TYPE_CODE_ENUM;
nfields++;
if (tsym->value > max_value)
max_value = tsym->value;
}
else if (tsym->st == stBlock
|| tsym->st == stParsed) {
if (tsym->sc == scVariant) ; /*UNIMPLEMENTED*/
if (tsym->index != 0)
tsym = ((SYMR*)cur_fdr->isymBase)
+ tsym->index-1;
}
t = new_type(sh->iss); t = new_type(sh->iss);
/* Guess the type code. */ /* First count the number of fields. */
if (type_code == TYPE_CODE_UNDEF) for (tsym = sh+1; tsym->st != stEnd; tsym++)
if (max_value == 0) type_code = TYPE_CODE_UNION; if (tsym->st == stMember) {
else type_code = TYPE_CODE_STRUCT; if (nfields == 0 && type_code == TYPE_CODE_UNDEF)
/* If the type of the member is Void,
TYPE_CODE(t) = type_code; assume the tag is an enumeration. */
TYPE_NFIELDS(t) = nfields; if (tsym->index == indexNil
TYPE_FIELDS(t) = f = (struct field*) || ax[tsym->index].ti.bt == btVoid)
obstack_alloc (symbol_obstack, type_code = TYPE_CODE_ENUM;
nfields * sizeof (struct field)); nfields++;
if (tsym->value > max_value)
if (type_code == TYPE_CODE_ENUM) { max_value = tsym->value;
/* This is a non-empty enum. */
while (sh[1].st == stMember) {
struct symbol *enum_sym;
sh++;
f->bitpos = sh->value;
f->type = t;
f->name = (char*)sh->iss;
f->bitsize = 0;
enum_sym = (struct symbol *)
obstack_alloc (symbol_obstack,
sizeof (struct symbol));
memset (enum_sym, 0, sizeof (struct symbol));
SYMBOL_NAME (enum_sym) = f->name;
SYMBOL_CLASS (enum_sym) = LOC_CONST;
SYMBOL_TYPE (enum_sym) = t;
SYMBOL_NAMESPACE (enum_sym) = VAR_NAMESPACE;
SYMBOL_VALUE (enum_sym) = sh->value;
add_symbol(enum_sym, top_stack->cur_block);
count++;
f++;
}
} }
else { else if (tsym->st == stBlock
/* Uhmm, can`t decide yet. Guess. */ || tsym->st == stParsed) {
add_pending(cur_fdr, sh, t); if (tsym->sc == scVariant) ; /*UNIMPLEMENTED*/
if (tsym->index != 0)
tsym = ((SYMR*)cur_fdr->isymBase)
+ tsym->index-1;
}
/* There is no guaranteed way to distinguish struct,
unions, and enums at this point. This is a bug in the
original design (that has been fixed with the
recent addition of the stStruct, stUnion, and stEnum
symbol types.) The way you can tell is if/when you
see a variable or field of that type: In that case
the variable's type (in the AUX table) says if the
type is struct, union, or enum,
and points back to the stBlock here.
So you can patch the tag kind up later - but only
if there actually is a variable or field of that type.
So until we know for sure, we will guess at this point.
The heuristic is:
If the first member has index==indexNil or a void type,
assume we have an enumeration.
Otherwise, if all the members have offset 0,
assume we have a union.
Otherwise, assume we have a struct.
The heuristic could guess wrong in the case of
of an enumeration with no members or a union
with one (or zero) members, or when all except the
last field of a struct have width zero.
These are uncommon and/or illegal situations, and
in any case guessing wrong probably doesn't matter much.
But if we later do find out we were wrong,
we fixup the tag kind. Members of an enumeration
must be handled differently from struct/union fields,
and that is harder to patch up, but luckily we
shouldn't need to. (If there are any enumeration
members, we can tell for sure it's an enum here.) */
if (type_code == TYPE_CODE_UNDEF)
if (max_value == 0) type_code = TYPE_CODE_UNION;
else type_code = TYPE_CODE_STRUCT;
TYPE_CODE(t) = type_code;
TYPE_NFIELDS(t) = nfields;
TYPE_FIELDS(t) = f = (struct field*)
obstack_alloc (symbol_obstack,
nfields * sizeof (struct field));
if (type_code == TYPE_CODE_ENUM) {
/* This is a non-empty enum. */
while (sh[1].st == stMember) {
struct symbol *enum_sym;
sh++;
f->bitpos = sh->value;
f->type = t;
f->name = (char*)sh->iss;
f->bitsize = 0;
enum_sym = (struct symbol *)
obstack_alloc (symbol_obstack,
sizeof (struct symbol));
memset (enum_sym, 0, sizeof (struct symbol));
SYMBOL_NAME (enum_sym) = f->name;
SYMBOL_CLASS (enum_sym) = LOC_CONST;
SYMBOL_TYPE (enum_sym) = t;
SYMBOL_NAMESPACE (enum_sym) = VAR_NAMESPACE;
SYMBOL_VALUE (enum_sym) = sh->value;
add_symbol(enum_sym, top_stack->cur_block);
/* Skip the stMembers that we've handled. */
count++;
f++;
} }
} }
SYMBOL_TYPE(s) = t; SYMBOL_TYPE(s) = t;
@ -1056,11 +1119,6 @@ data: /* Common code for symbols describing data */
BLOCK_END(b_bad) = BLOCK_END(b); BLOCK_END(b_bad) = BLOCK_END(b);
} }
} }
if (entry_point < BLOCK_END(b)
&& entry_point >= BLOCK_START(b)) {
startup_file_start = BLOCK_START(b);
startup_file_end = BLOCK_END(b);
}
} else if (sh->sc == scText && top_stack->blocktype == stBlock) { } else if (sh->sc == scText && top_stack->blocktype == stBlock) {
/* End of (code) block. The value of the symbol /* End of (code) block. The value of the symbol
is the displacement from the procedure`s start is the displacement from the procedure`s start
@ -1243,7 +1301,10 @@ static struct type *parse_type(ax, sh, bs)
/* Usually, TYPE_CODE(tp) is already type_code. The main /* Usually, TYPE_CODE(tp) is already type_code. The main
exception is if we guessed wrong re struct/union/enum. */ exception is if we guessed wrong re struct/union/enum. */
TYPE_CODE(tp) = type_code; if (TYPE_CODE(tp) != type_code) {
complain (&bad_tag_guess_complaint, 0);
TYPE_CODE(tp) = type_code;
}
TYPE_NAME(tp) = obsavestring(pn, strlen(pn)); TYPE_NAME(tp) = obsavestring(pn, strlen(pn));
} }
@ -1629,6 +1690,7 @@ parse_partial_symbols(end_of_text_seg, objfile)
includes_used = 0; includes_used = 0;
psymtab_include_list = (char **) alloca (includes_allocated * psymtab_include_list = (char **) alloca (includes_allocated *
sizeof (char *)); sizeof (char *));
next_symbol_text_func = mips_next_symbol_text;
dependencies_allocated = 30; dependencies_allocated = 30;
dependencies_used = 0; dependencies_used = 0;
@ -1692,7 +1754,8 @@ parse_partial_symbols(end_of_text_seg, objfile)
for (f_idx = 0; f_idx < hdr->ifdMax; f_idx++) { for (f_idx = 0; f_idx < hdr->ifdMax; f_idx++) {
struct partial_symtab *save_pst; struct partial_symtab *save_pst;
fh = f_idx + (FDR *)(cur_hdr->cbFdOffset); cur_fdr = fh = f_idx + (FDR *)(cur_hdr->cbFdOffset);
if (fh->csym == 0) { if (fh->csym == 0) {
fdr_to_pst[f_idx].pst = NULL; fdr_to_pst[f_idx].pst = NULL;
continue; continue;
@ -1721,17 +1784,19 @@ parse_partial_symbols(end_of_text_seg, objfile)
pst->n_global_syms = 0; pst->n_global_syms = 0;
pst->n_static_syms = 0; pst->n_static_syms = 0;
/* The second symbol must be @stab.
/* The second symbol must be @stab. */ This symbol is emitted by mips-tfile to signal
that the current object file uses encapsulated stabs
instead of mips ecoff for local symbols.
(It is the second symbol because the first symbol is
the stFile used to signal the start of a file). */
if (fh->csym >= 2 if (fh->csym >= 2
&& strcmp(((SYMR *)fh->isymBase)[1].iss, stabs_symbol) == 0) { && strcmp(((SYMR *)fh->isymBase)[1].iss, stabs_symbol) == 0) {
for (s_idx = 2; s_idx < fh->csym; s_idx++) { for (cur_sdx = 2; cur_sdx < fh->csym; cur_sdx++) {
int type_code; int type_code;
char *namestring; char *namestring;
sh = s_idx + (SYMR *) fh->isymBase; sh = cur_sdx + (SYMR *) fh->isymBase;
type_code = MIPS_UNMARK_STAB(sh->index); type_code = MIPS_UNMARK_STAB(sh->index);
/* TEMPORARY: */
if (type_code == 0x84 && s_idx == 2) continue;
if (!MIPS_IS_STAB(sh)) { if (!MIPS_IS_STAB(sh)) {
if (sh->st == stProc || sh->st == stStaticProc) { if (sh->st == stProc || sh->st == stStaticProc) {
long procaddr = sh->value; long procaddr = sh->value;
@ -1748,44 +1813,32 @@ parse_partial_symbols(end_of_text_seg, objfile)
#define SET_NAMESTRING() namestring = (char*)sh->iss #define SET_NAMESTRING() namestring = (char*)sh->iss
#define CUR_SYMBOL_TYPE type_code #define CUR_SYMBOL_TYPE type_code
#define CUR_SYMBOL_VALUE sh->value #define CUR_SYMBOL_VALUE sh->value
#define CHECK_SECOND_N_SO() \
if (s_idx < fh->csym \
&& MIPS_UNMARK_STAB(((SYMR *)fh->isymBase)[s_idx+1].index) == (unsigned char)N_SO)\
{\
s_idx++;\
sh = s_idx + (SYMR *) fh->isymBase;\
SET_NAMESTRING ();\
valu = CUR_SYMBOL_VALUE;\
s_idx++;\
}
#define START_PSYMTAB(ofile,addr,fname,low,symoff,global_syms,static_syms)\ #define START_PSYMTAB(ofile,addr,fname,low,symoff,global_syms,static_syms)\
pst = save_pst pst = save_pst
#define END_PSYMTAB(pst,ilist,ninc,c_off,c_text,dep_list,n_deps) (void)0 #define END_PSYMTAB(pst,ilist,ninc,c_off,c_text,dep_list,n_deps) (void)0
#define addr 0 #define addr 0 /* FIXME, should be offset of addresses */
#define HANDLE_RBRAC(val) \ #define HANDLE_RBRAC(val) \
if ((val) > save_pst->texthigh) save_pst->texthigh = (val); if ((val) > save_pst->texthigh) save_pst->texthigh = (val);
/* FIXME: Handle start_file_start and _end */
/* FIXME: Handle enums - but must deal with next_symbol_text. */
#include "partial-stab.h" #include "partial-stab.h"
#undef addr #undef addr
} }
} }
else { else {
for (s_idx = 0; s_idx < fh->csym; ) { for (cur_sdx = 0; cur_sdx < fh->csym; ) {
register struct partial_symbol *p; register struct partial_symbol *p;
char *name; char *name;
int class; int class;
sh = s_idx + (SYMR *) fh->isymBase; sh = cur_sdx + (SYMR *) fh->isymBase;
if (MIPS_IS_STAB(sh)) { if (MIPS_IS_STAB(sh)) {
s_idx++; cur_sdx++;
continue; continue;
} }
if (sh->sc == scUndefined || sh->sc == scNil || if (sh->sc == scUndefined || sh->sc == scNil ||
sh->index == 0xfffff) { sh->index == 0xfffff) {
/* FIXME, premature? */ /* FIXME, premature? */
s_idx++; cur_sdx++;
continue; continue;
} }
@ -1800,10 +1853,10 @@ parse_partial_symbols(end_of_text_seg, objfile)
VAR_NAMESPACE, LOC_BLOCK, VAR_NAMESPACE, LOC_BLOCK,
static_psymbols, sh->value); static_psymbols, sh->value);
/* Skip over procedure to next one. */ /* Skip over procedure to next one. */
s_idx = (sh->index + (AUXU *)fh->iauxBase)->isym; cur_sdx = (sh->index + (AUXU *)fh->iauxBase)->isym;
procaddr = sh->value; procaddr = sh->value;
sh = s_idx + (SYMR *) fh->isymBase - 1; sh = cur_sdx + (SYMR *) fh->isymBase - 1;
if (sh->st != stEnd) if (sh->st != stEnd)
continue; continue;
high = procaddr + sh->value; high = procaddr + sh->value;
@ -1826,7 +1879,7 @@ parse_partial_symbols(end_of_text_seg, objfile)
static_psymbols, sh->value); static_psymbols, sh->value);
} }
/* Skip over the block */ /* Skip over the block */
s_idx = sh->index; cur_sdx = sh->index;
continue; continue;
case stFile: /* File headers */ case stFile: /* File headers */
case stLabel: /* Labels */ case stLabel: /* Labels */
@ -1835,7 +1888,7 @@ parse_partial_symbols(end_of_text_seg, objfile)
default: default:
complain (&unknown_sym_complaint, SYMBOL_NAME(p)); complain (&unknown_sym_complaint, SYMBOL_NAME(p));
complain (&unknown_st_complaint, sh->st); complain (&unknown_st_complaint, sh->st);
s_idx++; cur_sdx++;
continue; continue;
} }
/* Use this gdb symbol */ /* Use this gdb symbol */
@ -1843,13 +1896,18 @@ parse_partial_symbols(end_of_text_seg, objfile)
VAR_NAMESPACE, class, VAR_NAMESPACE, class,
static_psymbols, sh->value); static_psymbols, sh->value);
skip: skip:
s_idx++; /* Go to next file symbol */ cur_sdx++; /* Go to next file symbol */
} }
} }
end_psymtab (save_pst, psymtab_include_list, includes_used, end_psymtab (save_pst, psymtab_include_list, includes_used,
-1, save_pst->texthigh, -1, save_pst->texthigh,
dependency_list, dependencies_used, dependency_list, dependencies_used,
global_psymbols.next, static_psymbols.next); global_psymbols.next, static_psymbols.next);
if (entry_point < save_pst->texthigh
&& entry_point >= save_pst->textlow) {
startup_file_start = save_pst->textlow;
startup_file_end = save_pst->texthigh;
}
} }
/* Mark the last code address, and remember it for later */ /* Mark the last code address, and remember it for later */
@ -1929,16 +1987,12 @@ parse_fdr(f_idx, lev, objfile)
return pst; return pst;
} }
#ifdef READ_MIPS_FORMAT static char*
static int s_idx; mips_next_symbol_text ()
char*
next_symbol_text ()
{ {
s_idx++; cur_sdx++;
return (char*)((SYMR *)cur_fdr->isymBase)[s_idx].iss; return (char*)((SYMR *)cur_fdr->isymBase)[cur_sdx].iss;
} }
#endif
/* Ancillary function to psymtab_to_symtab(). Does all the work /* Ancillary function to psymtab_to_symtab(). Does all the work
for turning the partial symtab PST into a symtab, recurring for turning the partial symtab PST into a symtab, recurring
@ -1974,6 +2028,7 @@ psymtab_to_symtab_1(pst, filename)
maxlines = 2 * fh->cline; maxlines = 2 * fh->cline;
} }
/* See comment in parse_partial_symbols about the @stabs sentinel. */
have_stabs = have_stabs =
fh && fh->csym >= 2 fh && fh->csym >= 2
&& strcmp(((SYMR *)fh->isymBase)[1].iss, stabs_symbol) == 0; && strcmp(((SYMR *)fh->isymBase)[1].iss, stabs_symbol) == 0;
@ -2051,15 +2106,13 @@ psymtab_to_symtab_1(pst, filename)
if (have_stabs) { if (have_stabs) {
if (fh->csym <= 2) if (fh->csym <= 2)
return; return;
for (s_idx = 2; s_idx < fh->csym; s_idx++) { for (cur_sdx = 2; cur_sdx < fh->csym; cur_sdx++) {
register SYMR *sh = s_idx + (SYMR *) fh->isymBase; register SYMR *sh = cur_sdx + (SYMR *) fh->isymBase;
char *name = (char*)sh->iss; char *name = (char*)sh->iss;
CORE_ADDR valu = sh->value; CORE_ADDR valu = sh->value;
if (MIPS_IS_STAB(sh)) { if (MIPS_IS_STAB(sh)) {
int type_code = MIPS_UNMARK_STAB(sh->index); int type_code = MIPS_UNMARK_STAB(sh->index);
/* TEMPORARY: */ process_one_symbol (type_code, 0, valu, name, /*FIXME*/ 0);
if (type_code == 0x84 && s_idx == 2) continue;
process_one_symbol (type_code, 0, valu, name);
} }
else if (sh->st == stLabel && sh->index != indexNil) { else if (sh->st == stLabel && sh->index != indexNil) {
/* Handle encoded stab line number. */ /* Handle encoded stab line number. */
@ -2072,21 +2125,20 @@ psymtab_to_symtab_1(pst, filename)
/* BOUND is the highest core address of this file's procedures */ /* BOUND is the highest core address of this file's procedures */
int bound = cur_fd == cur_hdr->ifdMax - 1 ? cur_hdr->cbDnOffset int bound = cur_fd == cur_hdr->ifdMax - 1 ? cur_hdr->cbDnOffset
: fh[1].adr; : fh[1].adr;
for (s_idx = 0; s_idx < fh->csym; ) { for (cur_sdx = 0; cur_sdx < fh->csym; ) {
sh = (SYMR *) (fh->isymBase) + s_idx; sh = (SYMR *) (fh->isymBase) + cur_sdx;
cur_sdx = s_idx; cur_sdx += parse_symbol(sh, fh->iauxBase);
s_idx += parse_symbol(sh, fh->iauxBase);
} }
/* Procedures next, note we need to look-ahead to /* Procedures next, note we need to look-ahead to
find out where the procedure's code ends */ find out where the procedure's code ends */
for (s_idx = 0; s_idx < fh->cpd-1; s_idx++) { for (i = 0; i < fh->cpd-1; i++) {
pr = (PDR *) (IPDFIRST(cur_hdr, fh)) + s_idx; pr = (PDR *) (IPDFIRST(cur_hdr, fh)) + i;
parse_procedure(pr, pr[1].adr); /* next proc up */ parse_procedure(pr, pr[1].adr); /* next proc up */
} }
if (fh->cpd) { if (fh->cpd) {
pr = (PDR *) (IPDFIRST(cur_hdr, fh)) + s_idx; pr = (PDR *) (IPDFIRST(cur_hdr, fh)) + i;
parse_procedure(pr, bound); /* next file up */ parse_procedure(pr, bound); /* next file up */
} }
/* Linenumbers. At the end, check if we can save memory */ /* Linenumbers. At the end, check if we can save memory */

8
gdb/putenv.c
View file

@ -68,15 +68,17 @@ putenv( entry )
{ {
unsigned length; unsigned length;
unsigned size; unsigned size;
char *temp;
char **p; char **p;
char **new_environ; char **new_environ;
/* Find the length of the "NAME=" */ /* Find the length of the "NAME=" */
if ( (length=(unsigned) index(entry,'=')) == 0 ) temp = index(entry,'=');
if ( temp == 0 )
return( -1 ); return( -1 );
length = length - (unsigned) entry + 1; length = (unsigned) (temp - entry + 1);
/* Scan through the environment looking for "NAME=" */ /* Scan through the environment looking for "NAME=" */
@ -95,7 +97,7 @@ putenv( entry )
new_environ = (char **) malloc( (size+2)*PSIZE ); new_environ = (char **) malloc( (size+2)*PSIZE );
if ( new_environ == NULL ) if ( new_environ == (char **) NULL )
return( -1 ); return( -1 );
bcopy( (char *) environ, (char *) new_environ, size*PSIZE ); bcopy( (char *) environ, (char *) new_environ, size*PSIZE );