mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-04-24 14:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

2010-05-15 Michael Snyder <msnyder@vmware.com>

Browse Source 
* objc-lang.c: White space.
	* objfiles.c: White space.
	* observer.c: White space.
	* osabi.c: White space.
	* osdata.c: White space.
This commit is contained in:
Michael Snyder 2010-05-16 00:46:46 +00:00
parent b8d56208c5
commit 5cc80db34d
6 changed files with 197 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,5 +1,11 @@
2010-05-15 Michael Snyder <msnyder@vmware.com>
* objc-lang.c: White space.
* objfiles.c: White space.
* observer.c: White space.
* osabi.c: White space.
* osdata.c: White space.
* m2-lang.c: White space.
* m2-valprint.c: White space.
* macrocmd.c: White space.

217
gdb/objc-lang.c
View File

@ -244,22 +244,24 @@ objc_demangle (const char *mangled, int options)
xfree(demangled); /* not mangled name */
return NULL;
}
if (cp[1] == '_') { /* easy case: no category name */
*cp++ = ' '; /* replace two '_' with one ' ' */
strcpy(cp, mangled + (cp - demangled) + 2);
}
else {
*cp++ = '('; /* less easy case: category name */
cp = strchr(cp, '_');
if (!cp)
{
xfree(demangled); /* not mangled name */
return NULL;
}
*cp++ = ')';
*cp++ = ' '; /* overwriting 1st char of method name... */
strcpy(cp, mangled + (cp - demangled)); /* get it back */
}
if (cp[1] == '_') /* easy case: no category name */
{
*cp++ = ' '; /* replace two '_' with one ' ' */
strcpy(cp, mangled + (cp - demangled) + 2);
}
else
{
*cp++ = '('; /* less easy case: category name */
cp = strchr(cp, '_');
if (!cp)
{
xfree(demangled); /* not mangled name */
return NULL;
}
*cp++ = ')';
*cp++ = ' '; /* overwriting 1st char of method name... */
strcpy(cp, mangled + (cp - demangled)); /* get it back */
}
while (*cp && *cp == '_')
cp++; /* skip any initial underbars in method name */
@ -283,7 +285,6 @@ objc_demangle (const char *mangled, int options)
static void
objc_emit_char (int c, struct type *type, struct ui_file *stream, int quoter)
{
c &= 0xFF; /* Avoid sign bit follies. */
if (PRINT_LITERAL_FORM (c))
@ -574,28 +575,34 @@ add_msglist(struct stoken *str, int addcolon)
char *s, *p;
int len, plen;
if (str == 0) { /* Unnamed arg, or... */
if (addcolon == 0) { /* variable number of args. */
msglist_len++;
return;
if (str == 0) /* Unnamed arg, or... */
{
if (addcolon == 0) /* variable number of args. */
{
msglist_len++;
return;
}
p = "";
plen = 0;
}
else
{
p = str->ptr;
plen = str->length;
}
p = "";
plen = 0;
} else {
p = str->ptr;
plen = str->length;
}
len = plen + strlen(msglist_sel) + 2;
s = (char *)xmalloc(len);
strcpy(s, msglist_sel);
strncat(s, p, plen);
xfree(msglist_sel);
msglist_sel = s;
if (addcolon) {
s[len-2] = ':';
s[len-1] = 0;
msglist_len++;
} else
if (addcolon)
{
s[len-2] = ':';
s[len-1] = 0;
msglist_len++;
}
else
s[len-2] = '\0';
}
@ -993,17 +1000,18 @@ parse_selector (char *method, char **selector)
nselector = s1;
s2 = s1;
for (;;) {
if (isalnum (*s2) || (*s2 == '_') || (*s2 == ':'))
*s1++ = *s2;
else if (isspace (*s2))
;
else if ((*s2 == '\0') || (*s2 == '\''))
break;
else
return NULL;
s2++;
}
for (;;)
{
if (isalnum (*s2) || (*s2 == '_') || (*s2 == ':'))
*s1++ = *s2;
else if (isspace (*s2))
;
else if ((*s2 == '\0') || (*s2 == '\''))
break;
else
return NULL;
s2++;
}
*s1++ = '\0';
while (isspace (*s2))
@ -1087,17 +1095,18 @@ parse_method (char *method, char *type, char **class,
nselector = s2;
s1 = s2;
for (;;) {
if (isalnum (*s2) || (*s2 == '_') || (*s2 == ':'))
*s1++ = *s2;
else if (isspace (*s2))
;
else if (*s2 == ']')
break;
else
return NULL;
s2++;
}
for (;;)
{
if (isalnum (*s2) || (*s2 == '_') || (*s2 == ':'))
*s1++ = *s2;
else if (isspace (*s2))
;
else if (*s2 == ']')
break;
else
return NULL;
s2++;
}
*s1++ = '\0';
s2++;
@ -1308,36 +1317,36 @@ char *find_imps (struct symtab *symtab, struct block *block,
strcpy (buf, method);
tmp = parse_method (buf, &type, &class, &category, &selector);
if (tmp == NULL) {
struct symbol *sym = NULL;
struct minimal_symbol *msym = NULL;
strcpy (buf, method);
tmp = parse_selector (buf, &selector);
if (tmp == NULL)
return NULL;
sym = lookup_symbol (selector, block, VAR_DOMAIN, 0);
if (sym != NULL)
{
if (syms)
syms[csym] = sym;
csym++;
cdebug++;
}
if (tmp == NULL)
{
struct symbol *sym = NULL;
struct minimal_symbol *msym = NULL;
if (sym == NULL)
msym = lookup_minimal_symbol (selector, 0, 0);
strcpy (buf, method);
tmp = parse_selector (buf, &selector);
if (msym != NULL)
{
if (syms)
syms[csym] = (struct symbol *)msym;
csym++;
}
}
if (tmp == NULL)
return NULL;
sym = lookup_symbol (selector, block, VAR_DOMAIN, 0);
if (sym != NULL)
{
if (syms)
syms[csym] = sym;
csym++;
cdebug++;
}
if (sym == NULL)
msym = lookup_minimal_symbol (selector, 0, 0);
if (msym != NULL)
{
if (syms)
syms[csym] = (struct symbol *)msym;
csym++;
}
}
if (syms != NULL)
find_methods (symtab, type, class, category, selector,
@ -1499,26 +1508,29 @@ static void
find_objc_msgsend (void)
{
unsigned int i;
for (i = 0; i < nmethcalls; i++) {
struct minimal_symbol *func;
for (i = 0; i < nmethcalls; i++)
{
struct minimal_symbol *func;
/* Try both with and without underscore. */
func = lookup_minimal_symbol (methcalls[i].name, NULL, NULL);
if ((func == NULL) && (methcalls[i].name[0] == '_')) {
func = lookup_minimal_symbol (methcalls[i].name + 1, NULL, NULL);
/* Try both with and without underscore. */
func = lookup_minimal_symbol (methcalls[i].name, NULL, NULL);
if ((func == NULL) && (methcalls[i].name[0] == '_'))
{
func = lookup_minimal_symbol (methcalls[i].name + 1, NULL, NULL);
}
if (func == NULL)
{
methcalls[i].begin = 0;
methcalls[i].end = 0;
continue;
}
methcalls[i].begin = SYMBOL_VALUE_ADDRESS (func);
do {
methcalls[i].end = SYMBOL_VALUE_ADDRESS (++func);
} while (methcalls[i].begin == methcalls[i].end);
}
if (func == NULL) {
methcalls[i].begin = 0;
methcalls[i].end = 0;
continue;
}
methcalls[i].begin = SYMBOL_VALUE_ADDRESS (func);
do {
methcalls[i].end = SYMBOL_VALUE_ADDRESS (++func);
} while (methcalls[i].begin == methcalls[i].end);
}
}
/* find_objc_msgcall (replaces pc_off_limits)
@ -1618,6 +1630,7 @@ read_objc_method (struct gdbarch *gdbarch, CORE_ADDR addr,
struct objc_method *method)
{
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
method->name = read_memory_unsigned_integer (addr + 0, 4, byte_order);
method->types = read_memory_unsigned_integer (addr + 4, 4, byte_order);
method->imp = read_memory_unsigned_integer (addr + 8, 4, byte_order);
@ -1627,6 +1640,7 @@ static unsigned long
read_objc_methlist_nmethods (struct gdbarch *gdbarch, CORE_ADDR addr)
{
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
return read_memory_unsigned_integer (addr + 4, 4, byte_order);
}
@ -1643,6 +1657,7 @@ read_objc_object (struct gdbarch *gdbarch, CORE_ADDR addr,
struct objc_object *object)
{
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
object->isa = read_memory_unsigned_integer (addr, 4, byte_order);
}
@ -1651,6 +1666,7 @@ read_objc_super (struct gdbarch *gdbarch, CORE_ADDR addr,
struct objc_super *super)
{
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
super->receiver = read_memory_unsigned_integer (addr, 4, byte_order);
super->class = read_memory_unsigned_integer (addr + 4, 4, byte_order);
};
@ -1660,6 +1676,7 @@ read_objc_class (struct gdbarch *gdbarch, CORE_ADDR addr,
struct objc_class *class)
{
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
class->isa = read_memory_unsigned_integer (addr, 4, byte_order);
class->super_class = read_memory_unsigned_integer (addr + 4, 4, byte_order);
class->name = read_memory_unsigned_integer (addr + 8, 4, byte_order);
@ -1704,8 +1721,8 @@ find_implementation_from_class (struct gdbarch *gdbarch,
for (i = 0; i < nmethods; i++)
{
struct objc_method meth_str;
read_objc_methlist_method (gdbarch, mlist, i, &meth_str);
read_objc_methlist_method (gdbarch, mlist, i, &meth_str);
#if 0
fprintf (stderr,
"checking method 0x%lx against selector 0x%lx\n",

125
gdb/objfiles.c
View File

@ -707,26 +707,26 @@ free_all_objfiles (void)
Return non-zero iff any change happened. */
static int
objfile_relocate1 (struct objfile *objfile, struct section_offsets *new_offsets)
objfile_relocate1 (struct objfile *objfile,
struct section_offsets *new_offsets)
{
struct obj_section *s;
struct section_offsets *delta =
((struct section_offsets *)
alloca (SIZEOF_N_SECTION_OFFSETS (objfile->num_sections)));
{
int i;
int something_changed = 0;
for (i = 0; i < objfile->num_sections; ++i)
{
delta->offsets[i] =
ANOFFSET (new_offsets, i) - ANOFFSET (objfile->section_offsets, i);
if (ANOFFSET (delta, i) != 0)
something_changed = 1;
}
if (!something_changed)
return 0;
}
int i;
int something_changed = 0;
for (i = 0; i < objfile->num_sections; ++i)
{
delta->offsets[i] =
ANOFFSET (new_offsets, i) - ANOFFSET (objfile->section_offsets, i);
if (ANOFFSET (delta, i) != 0)
something_changed = 1;
}
if (!something_changed)
return 0;
/* OK, get all the symtabs. */
{
@ -794,6 +794,7 @@ objfile_relocate1 (struct objfile *objfile, struct section_offsets *new_offsets)
{
struct minimal_symbol *msym;
ALL_OBJFILE_MSYMBOLS (objfile, msym)
if (SYMBOL_SECTION (msym) >= 0)
SYMBOL_VALUE_ADDRESS (msym) += ANOFFSET (delta, SYMBOL_SECTION (msym));
@ -816,6 +817,7 @@ objfile_relocate1 (struct objfile *objfile, struct section_offsets *new_offsets)
{
int i;
for (i = 0; i < objfile->num_sections; ++i)
(objfile->section_offsets)->offsets[i] = ANOFFSET (new_offsets, i);
}
@ -1009,65 +1011,64 @@ qsort_cmp (const void *a, const void *b)
else if (sect1_addr > sect2_addr)
return 1;
else
{
/* Sections are at the same address. This could happen if
A) we have an objfile and a separate debuginfo.
B) we are confused, and have added sections without proper relocation,
or something like that. */
{
/* Sections are at the same address. This could happen if
A) we have an objfile and a separate debuginfo.
B) we are confused, and have added sections without proper relocation,
or something like that. */
const struct objfile *const objfile1 = sect1->objfile;
const struct objfile *const objfile2 = sect2->objfile;
const struct objfile *const objfile1 = sect1->objfile;
const struct objfile *const objfile2 = sect2->objfile;
if (objfile1->separate_debug_objfile == objfile2
|| objfile2->separate_debug_objfile == objfile1)
{
/* Case A. The ordering doesn't matter: separate debuginfo files
will be filtered out later. */
if (objfile1->separate_debug_objfile == objfile2
|| objfile2->separate_debug_objfile == objfile1)
{
/* Case A. The ordering doesn't matter: separate debuginfo files
will be filtered out later. */
return 0;
}
return 0;
}
/* Case B. Maintain stable sort order, so bugs in GDB are easier to
triage. This section could be slow (since we iterate over all
objfiles in each call to qsort_cmp), but this shouldn't happen
very often (GDB is already in a confused state; one hopes this
doesn't happen at all). If you discover that significant time is
spent in the loops below, do 'set complaints 100' and examine the
resulting complaints. */
/* Case B. Maintain stable sort order, so bugs in GDB are easier to
triage. This section could be slow (since we iterate over all
objfiles in each call to qsort_cmp), but this shouldn't happen
very often (GDB is already in a confused state; one hopes this
doesn't happen at all). If you discover that significant time is
spent in the loops below, do 'set complaints 100' and examine the
resulting complaints. */
if (objfile1 == objfile2)
{
/* Both sections came from the same objfile. We are really confused.
Sort on sequence order of sections within the objfile. */
if (objfile1 == objfile2)
{
/* Both sections came from the same objfile. We are really confused.
Sort on sequence order of sections within the objfile. */
const struct obj_section *osect;
const struct obj_section *osect;
ALL_OBJFILE_OSECTIONS (objfile1, osect)
if (osect == sect1)
return -1;
else if (osect == sect2)
return 1;
ALL_OBJFILE_OSECTIONS (objfile1, osect)
if (osect == sect1)
return -1;
else if (osect == sect2)
return 1;
/* We should have found one of the sections before getting here. */
gdb_assert (0);
}
else
{
/* Sort on sequence number of the objfile in the chain. */
/* We should have found one of the sections before getting here. */
gdb_assert (0);
}
else
{
/* Sort on sequence number of the objfile in the chain. */
const struct objfile *objfile;
const struct objfile *objfile;
ALL_OBJFILES (objfile)
if (objfile == objfile1)
return -1;
else if (objfile == objfile2)
return 1;
ALL_OBJFILES (objfile)
if (objfile == objfile1)
return -1;
else if (objfile == objfile2)
return 1;
/* We should have found one of the objfiles before getting here. */
gdb_assert (0);
}
}
/* We should have found one of the objfiles before getting here. */
gdb_assert (0);
}
}
/* Unreachable. */
gdb_assert (0);

1
gdb/observer.c
View File

@ -91,6 +91,7 @@ static struct observer_list *
xalloc_observer_list_node (void)
{
struct observer_list *node = XMALLOC (struct observer_list);
node->observer = XMALLOC (struct observer);
return node;
}

1
gdb/osabi.c
View File

@ -588,6 +588,7 @@ set_osabi (char *args, int from_tty, struct cmd_list_element *c)
else
{
int i;
for (i = 1; i < GDB_OSABI_INVALID; i++)
if (strcmp (set_osabi_string, gdbarch_osabi_name (i)) == 0)
{

9
gdb/osdata.c
View File

@ -83,6 +83,7 @@ osdata_start_item (struct gdb_xml_parser *parser,
{
struct osdata_parsing_data *data = user_data;
struct osdata_item item = { NULL };
VEC_safe_push (osdata_item_s, data->osdata->items, &item);
}
@ -95,6 +96,7 @@ osdata_start_column (struct gdb_xml_parser *parser,
{
struct osdata_parsing_data *data = user_data;
const char *name = VEC_index (gdb_xml_value_s, attributes, 0)->value;
data->property_name = xstrdup (name);
}
@ -123,6 +125,7 @@ static void
clear_parsing_data (void *p)
{
struct osdata_parsing_data *data = p;
osdata_free (data->osdata);
data->osdata = NULL;
xfree (data->property_name);
@ -192,6 +195,7 @@ osdata_item_clear (struct osdata_item *item)
{
struct osdata_column *col;
int ix;
for (ix = 0;
VEC_iterate (osdata_column_s, item->columns,
ix, col);
@ -215,6 +219,7 @@ osdata_free (struct osdata *osdata)
{
struct osdata_item *item;
int ix;
for (ix = 0;
VEC_iterate (osdata_item_s, osdata->items,
ix, item);
@ -230,6 +235,7 @@ static void
osdata_free_cleanup (void *arg)
{
struct osdata *osdata = arg;
osdata_free (osdata);
}
@ -244,6 +250,7 @@ get_osdata (const char *type)
{
struct osdata *osdata = NULL;
char *xml = target_get_osdata (type);
if (xml)
{
struct cleanup *old_chain = make_cleanup (xfree, xml);
@ -309,6 +316,7 @@ info_osdata_command (char *type, int from_tty)
{
struct osdata_column *col;
int ix;
for (ix = 0;
VEC_iterate (osdata_column_s, last->columns,
ix, col);
@ -323,6 +331,7 @@ info_osdata_command (char *type, int from_tty)
{
struct osdata_item *item;
int ix_items;
for (ix_items = 0;
VEC_iterate (osdata_item_s, osdata->items,
ix_items, item);