mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-02-17 13:10:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

* mipsread.c (parse_symbol): Avoid clobbering enum pointer when

Browse Source 
looking at its members.  Improve guess between struct and union,
only assuming union if multiple members have offsets of zero.
This commit is contained in:
John Gilmore 1992-02-06 06:33:15 +00:00
parent 46772bd112
commit 778c358df8
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
Wed Feb 5 22:29:59 1992 John Gilmore (gnu at cygnus.com)
* mipsread.c (parse_symbol): Avoid clobbering enum pointer when
looking at its members. Improve guess between struct and union,
only assuming union if multiple members have offsets of zero.
Tue Feb 4 18:05:44 1992 Per Bothner (bothner at cygnus.com)
* mipsread.c: Use (FP0_REGNUM-32) instead of magic number 6.

21
gdb/mipsread.c
View File

@ -1047,8 +1047,8 @@ parse_symbol(sh, ax)
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, if there is more than one member, and 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
@ -1066,8 +1066,10 @@ parse_symbol(sh, ax)
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;
if (nfields > 1 && max_value == 0)
type_code = TYPE_CODE_UNION;
else
type_code = TYPE_CODE_STRUCT;
/* If this type was expected, use its partial definition */
if (pend)
@ -1076,6 +1078,7 @@ parse_symbol(sh, ax)
t = new_type(prepend_tag_kind(sh->iss, type_code));
TYPE_CODE(t) = type_code;
TYPE_LENGTH(t) = sh->value;
TYPE_NFIELDS(t) = nfields;
TYPE_FIELDS(t) = f = (struct field*)
obstack_alloc (symbol_obstack,
@ -1083,12 +1086,11 @@ parse_symbol(sh, ax)
if (type_code == TYPE_CODE_ENUM) {
/* This is a non-empty enum. */
while (sh[1].st == stMember) {
for (tsym = sh + 1; tsym->st == stMember; tsym++) {
struct symbol *enum_sym;
sh++;
f->bitpos = sh->value;
f->bitpos = tsym->value;
f->type = t;
f->name = (char*)sh->iss;
f->name = (char*)tsym->iss;
f->bitsize = 0;
enum_sym = (struct symbol *)
@ -1099,7 +1101,7 @@ parse_symbol(sh, ax)
SYMBOL_CLASS (enum_sym) = LOC_CONST;
SYMBOL_TYPE (enum_sym) = t;
SYMBOL_NAMESPACE (enum_sym) = VAR_NAMESPACE;
SYMBOL_VALUE (enum_sym) = sh->value;
SYMBOL_VALUE (enum_sym) = tsym->value;
add_symbol(enum_sym, top_stack->cur_block);
/* Skip the stMembers that we've handled. */
@ -1111,7 +1113,6 @@ parse_symbol(sh, ax)
/* make this the current type */
top_stack->cur_type = t;
top_stack->cur_field = 0;
TYPE_LENGTH(t) = sh->value;
/* Mark that symbol has a type, and say which one */
sh->value = (long) t;
} else {