/* Objective-C language support routines for GDB, the GNU debugger.
- Copyright (C) 2002-2019 Free Software Foundation, Inc.
+ Copyright (C) 2002-2020 Free Software Foundation, Inc.
Contributed by Apple Computer, Inc.
Written by Michael Snyder.
CORE_ADDR imp;
};
-static const struct objfile_data *objc_objfile_data;
+static const struct objfile_key<unsigned int> objc_objfile_data;
/* Lookup a structure type named "struct NAME", visible in lexical
block BLOCK. If NOERR is nonzero, return zero if NAME is not
c_language_arch_info,
default_print_array_index,
default_pass_by_reference,
- default_get_string,
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
iterate_over_symbols,
&default_varobj_ops,
NULL,
NULL,
- LANG_MAGIC
+ c_is_string_type_p,
+ "{...}" /* la_struct_too_deep_ellipsis */
};
/*
{
const char *aname, *bname;
- aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
- bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
+ aname = (*(struct symbol **) a)->print_name ();
+ bname = (*(struct symbol **) b)->print_name ();
if (aname == NULL || bname == NULL)
error (_("internal: compare_selectors(1)"));
for (minimal_symbol *msymbol : objfile->msymbols ())
{
QUIT;
- name = MSYMBOL_NATURAL_NAME (msymbol);
+ name = msymbol->natural_name ();
if (name
&& (name[0] == '-' || name[0] == '+')
&& name[1] == '[') /* Got a method name. */
if (name == NULL)
{
complaint (_("Bad method name '%s'"),
- MSYMBOL_NATURAL_NAME (msymbol));
+ msymbol->natural_name ());
continue;
}
if (regexp == NULL || re_exec(++name) != 0)
for (minimal_symbol *msymbol : objfile->msymbols ())
{
QUIT;
- name = MSYMBOL_NATURAL_NAME (msymbol);
+ name = msymbol->natural_name ();
if (name &&
(name[0] == '-' || name[0] == '+') &&
name[1] == '[') /* Got a method name. */
char *p = asel;
QUIT;
- name = SYMBOL_NATURAL_NAME (sym_arr[ix]);
+ name = sym_arr[ix]->natural_name ();
name = strchr (name, ' ') + 1;
if (p[0] && specialcmp(name, p) == 0)
continue; /* Seen this one already (not unique). */
{
const char *aname, *bname;
- aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
- bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
+ aname = (*(struct symbol **) a)->print_name ();
+ bname = (*(struct symbol **) b)->print_name ();
if (aname == NULL || bname == NULL)
error (_("internal: compare_classes(1)"));
for (minimal_symbol *msymbol : objfile->msymbols ())
{
QUIT;
- name = MSYMBOL_NATURAL_NAME (msymbol);
+ name = msymbol->natural_name ();
if (name &&
(name[0] == '-' || name[0] == '+') &&
name[1] == '[') /* Got a method name. */
for (minimal_symbol *msymbol : objfile->msymbols ())
{
QUIT;
- name = MSYMBOL_NATURAL_NAME (msymbol);
+ name = msymbol->natural_name ();
if (name &&
(name[0] == '-' || name[0] == '+') &&
name[1] == '[') /* Got a method name. */
char *p = aclass;
QUIT;
- name = SYMBOL_NATURAL_NAME (sym_arr[ix]);
+ name = sym_arr[ix]->natural_name ();
name += 2;
if (p[0] && specialcmp(name, p) == 0)
continue; /* Seen this one already (not unique). */
unsigned int objfile_csym = 0;
- objc_csym = (unsigned int *) objfile_data (objfile, objc_objfile_data);
+ objc_csym = objc_objfile_data.get (objfile);
if (objc_csym != NULL && *objc_csym == 0)
/* There are no ObjC symbols in this objfile. Skip it entirely. */
continue;
/* Check the symbol name first as this can be done entirely without
sending any query to the target. */
- symname = MSYMBOL_NATURAL_NAME (msymbol);
+ symname = msymbol->natural_name ();
if (symname == NULL)
continue;
}
if (objc_csym == NULL)
- {
- objc_csym = XOBNEW (&objfile->objfile_obstack, unsigned int);
- *objc_csym = objfile_csym;
- set_objfile_data (objfile, objc_objfile_data, objc_csym);
- }
+ objc_csym = objc_objfile_data.emplace (objfile, objfile_csym);
else
/* Count of ObjC methods in this objfile should be constant. */
gdb_assert (*objc_csym == objfile_csym);
}
}
-/* Uniquify a VEC of strings. */
+/* Uniquify a vector of strings. */
static void
uniquify_strings (std::vector<const char *> *strings)
0).symbol;
if (sym != NULL)
- symbol_names->push_back (SYMBOL_NATURAL_NAME (sym));
+ symbol_names->push_back (sym->natural_name ());
else
{
struct bound_minimal_symbol msym
= lookup_minimal_symbol (selector, 0, 0);
if (msym.minsym != NULL)
- symbol_names->push_back (MSYMBOL_NATURAL_NAME (msym.minsym));
+ symbol_names->push_back (msym.minsym->natural_name ());
}
}
CORE_ADDR pc,
CORE_ADDR *new_pc)
{
- TRY
+ try
{
if (f (pc, new_pc) == 0)
return 1;
}
- CATCH (ex, RETURN_MASK_ALL)
+ catch (const gdb_exception &ex)
{
exception_fprintf (gdb_stderr, ex,
"Unable to determine target of "
"Objective-C method call (ignoring):\n");
}
- END_CATCH
return 0;
}
return 1;
return 0;
}
-
-void
-_initialize_objc_lang (void)
-{
- objc_objfile_data = register_objfile_data ();
-}