X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fobjc-lang.c;h=c423d575db805135c41763a6ffe3b1cf09f07a63;hb=5018ce90c1205d79f29adf954b0fd5e613d08430;hp=2f05b589411caf0fc61fa9c7025fe756871120b9;hpb=8a80855445b5998a2f471f3332885866c207f3d4;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 2f05b58941..c423d575db 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -1,6 +1,6 @@ /* Objective-C language support routines for GDB, the GNU debugger. - Copyright (C) 2002-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2020 Free Software Foundation, Inc. Contributed by Apple Computer, Inc. Written by Michael Snyder. @@ -26,14 +26,13 @@ #include "expression.h" #include "parser-defs.h" #include "language.h" +#include "varobj.h" #include "c-lang.h" #include "objc-lang.h" -#include "exceptions.h" #include "complaints.h" #include "value.h" #include "symfile.h" #include "objfiles.h" -#include "gdb_string.h" /* for strchr */ #include "target.h" /* for target_has_execution */ #include "gdbcore.h" #include "gdbcmd.h" @@ -43,9 +42,10 @@ #include "block.h" #include "infcall.h" #include "valprint.h" -#include "gdb_assert.h" +#include "cli/cli-utils.h" #include +#include struct objc_object { CORE_ADDR isa; @@ -66,7 +66,7 @@ struct objc_class { struct objc_super { CORE_ADDR receiver; - CORE_ADDR class; + CORE_ADDR theclass; }; struct objc_method { @@ -75,18 +75,18 @@ struct objc_method { CORE_ADDR imp; }; -static const struct objfile_data *objc_objfile_data; +static const struct objfile_key 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 suitably defined. */ struct symbol * -lookup_struct_typedef (char *name, const struct block *block, int noerr) +lookup_struct_typedef (const char *name, const struct block *block, int noerr) { struct symbol *sym; - sym = lookup_symbol (name, block, STRUCT_DOMAIN, 0); + sym = lookup_symbol (name, block, STRUCT_DOMAIN, 0).symbol; if (sym == NULL) { @@ -107,7 +107,7 @@ lookup_struct_typedef (char *name, const struct block *block, int noerr) } CORE_ADDR -lookup_objc_class (struct gdbarch *gdbarch, char *classname) +lookup_objc_class (struct gdbarch *gdbarch, const char *classname) { struct type *char_type = builtin_type (gdbarch)->builtin_char; struct value * function, *classval; @@ -118,25 +118,25 @@ lookup_objc_class (struct gdbarch *gdbarch, char *classname) return 0; } - if (lookup_minimal_symbol("objc_lookUpClass", 0, 0)) + if (lookup_minimal_symbol("objc_lookUpClass", 0, 0).minsym) function = find_function_in_inferior("objc_lookUpClass", NULL); - else if (lookup_minimal_symbol ("objc_lookup_class", 0, 0)) + else if (lookup_minimal_symbol ("objc_lookup_class", 0, 0).minsym) function = find_function_in_inferior("objc_lookup_class", NULL); else { - complaint (&symfile_complaints, - _("no way to lookup Objective-C classes")); + complaint (_("no way to lookup Objective-C classes")); return 0; } classval = value_string (classname, strlen (classname) + 1, char_type); classval = value_coerce_array (classval); - return (CORE_ADDR) value_as_long (call_function_by_hand (function, - 1, &classval)); + return (CORE_ADDR) value_as_long (call_function_by_hand (function, + NULL, + classval)); } CORE_ADDR -lookup_child_selector (struct gdbarch *gdbarch, char *selname) +lookup_child_selector (struct gdbarch *gdbarch, const char *selname) { struct type *char_type = builtin_type (gdbarch)->builtin_char; struct value * function, *selstring; @@ -147,21 +147,20 @@ lookup_child_selector (struct gdbarch *gdbarch, char *selname) return 0; } - if (lookup_minimal_symbol("sel_getUid", 0, 0)) + if (lookup_minimal_symbol("sel_getUid", 0, 0).minsym) function = find_function_in_inferior("sel_getUid", NULL); - else if (lookup_minimal_symbol ("sel_get_any_uid", 0, 0)) + else if (lookup_minimal_symbol ("sel_get_any_uid", 0, 0).minsym) function = find_function_in_inferior("sel_get_any_uid", NULL); else { - complaint (&symfile_complaints, - _("no way to lookup Objective-C selectors")); + complaint (_("no way to lookup Objective-C selectors")); return 0; } selstring = value_coerce_array (value_string (selname, strlen (selname) + 1, char_type)); - return value_as_long (call_function_by_hand (function, 1, &selstring)); + return value_as_long (call_function_by_hand (function, NULL, selstring)); } struct value * @@ -179,17 +178,17 @@ value_nsstring (struct gdbarch *gdbarch, char *ptr, int len) stringValue[2] = value_string(ptr, len, char_type); stringValue[2] = value_coerce_array(stringValue[2]); /* _NSNewStringFromCString replaces "istr" after Lantern2A. */ - if (lookup_minimal_symbol("_NSNewStringFromCString", 0, 0)) + if (lookup_minimal_symbol("_NSNewStringFromCString", 0, 0).minsym) { function = find_function_in_inferior("_NSNewStringFromCString", NULL); - nsstringValue = call_function_by_hand(function, 1, &stringValue[2]); + nsstringValue = call_function_by_hand(function, NULL, stringValue[2]); } - else if (lookup_minimal_symbol("istr", 0, 0)) + else if (lookup_minimal_symbol("istr", 0, 0).minsym) { function = find_function_in_inferior("istr", NULL); - nsstringValue = call_function_by_hand(function, 1, &stringValue[2]); + nsstringValue = call_function_by_hand(function, NULL, stringValue[2]); } - else if (lookup_minimal_symbol("+[NSString stringWithCString:]", 0, 0)) + else if (lookup_minimal_symbol("+[NSString stringWithCString:]", 0, 0).minsym) { function = find_function_in_inferior("+[NSString stringWithCString:]", NULL); @@ -199,7 +198,7 @@ value_nsstring (struct gdbarch *gdbarch, char *ptr, int len) (type, lookup_objc_class (gdbarch, "NSString")); stringValue[1] = value_from_longest (type, lookup_child_selector (gdbarch, "stringWithCString:")); - nsstringValue = call_function_by_hand(function, 3, &stringValue[0]); + nsstringValue = call_function_by_hand(function, NULL, stringValue); } else error (_("NSString: internal error -- no way to create new NSString")); @@ -227,7 +226,7 @@ objc_demangle (const char *mangled, int options) (mangled[1] == 'i' || mangled[1] == 'c') && mangled[2] == '_') { - cp = demangled = xmalloc(strlen(mangled) + 2); + cp = demangled = (char *) xmalloc (strlen (mangled) + 2); if (mangled[1] == 'i') *cp++ = '-'; /* for instance method */ @@ -282,6 +281,15 @@ objc_demangle (const char *mangled, int options) return NULL; /* Not an objc mangled name. */ } +/* la_sniff_from_mangled_name for ObjC. */ + +static int +objc_sniff_from_mangled_name (const char *mangled, char **demangled) +{ + *demangled = objc_demangle (mangled, 0); + return *demangled != NULL; +} + /* Determine if we are currently in the Objective-C dispatch function. If so, get the address of the method function that the dispatcher would call and use that as the function to step into instead. Also @@ -351,16 +359,22 @@ static const struct op_print objc_op_print_tab[] = {NULL, OP_NULL, PREC_NULL, 0} }; -const struct language_defn objc_language_defn = { +static const char *objc_extensions[] = +{ + ".m", NULL +}; + +extern const struct language_defn objc_language_defn = { "objective-c", /* Language name */ + "Objective-C", language_objc, range_check_off, case_sensitive_on, array_row_major, macro_expansion_c, + objc_extensions, &exp_descriptor_standard, c_parse, - c_error, null_post_parser, c_printchar, /* Print a character constant */ c_printstr, /* Function to print string constant */ @@ -372,23 +386,30 @@ const struct language_defn objc_language_defn = { default_read_var_value, /* la_read_var_value */ objc_skip_trampoline, /* Language specific skip_trampoline */ "self", /* name_of_this */ + false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ basic_lookup_transparent_type,/* lookup_transparent_type */ objc_demangle, /* Language specific symbol demangler */ + objc_sniff_from_mangled_name, NULL, /* Language specific class_name_from_physname */ objc_op_print_tab, /* Expression operators for printing */ 1, /* C-style arrays */ 0, /* String lower bound */ default_word_break_characters, - default_make_symbol_completion_list, + default_collect_symbol_completion_matches, c_language_arch_info, default_print_array_index, default_pass_by_reference, - default_get_string, - NULL, /* la_get_symbol_name_cmp */ + c_watch_location_expression, + NULL, /* la_get_symbol_name_matcher */ iterate_over_symbols, - LANG_MAGIC + default_search_name_hash, + &default_varobj_ops, + NULL, + NULL, + c_is_string_type_p, + "{...}" /* la_struct_too_deep_ellipsis */ }; /* @@ -410,22 +431,22 @@ static char *msglist_sel; void start_msglist(void) { - struct selname *new = - (struct selname *) xmalloc (sizeof (struct selname)); + struct selname *newobj = XNEW (struct selname); - new->next = selname_chain; - new->msglist_len = msglist_len; - new->msglist_sel = msglist_sel; + newobj->next = selname_chain; + newobj->msglist_len = msglist_len; + newobj->msglist_sel = msglist_sel; msglist_len = 0; msglist_sel = (char *)xmalloc(1); *msglist_sel = 0; - selname_chain = new; + selname_chain = newobj; } void add_msglist(struct stoken *str, int addcolon) { - char *s, *p; + char *s; + const char *p; int len, plen; if (str == 0) /* Unnamed arg, or... */ @@ -460,7 +481,7 @@ add_msglist(struct stoken *str, int addcolon) } int -end_msglist(void) +end_msglist (struct parser_state *ps) { int val = msglist_len; struct selname *sel = selname_chain; @@ -470,12 +491,12 @@ end_msglist(void) selname_chain = sel->next; msglist_len = sel->msglist_len; msglist_sel = sel->msglist_sel; - selid = lookup_child_selector (parse_gdbarch, p); + selid = lookup_child_selector (ps->gdbarch (), p); if (!selid) error (_("Can't find selector \"%s\""), p); - write_exp_elt_longcst (selid); + write_exp_elt_longcst (ps, selid); xfree(p); - write_exp_elt_longcst (val); /* Number of args */ + write_exp_elt_longcst (ps, val); /* Number of args */ xfree(sel); return val; @@ -516,8 +537,8 @@ compare_selectors (const void *a, const void *b) { 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)")); @@ -539,10 +560,8 @@ compare_selectors (const void *a, const void *b) */ static void -selectors_info (char *regexp, int from_tty) +info_selectors_command (const char *regexp, int from_tty) { - struct objfile *objfile; - struct minimal_symbol *msymbol; const char *name; char *val; int matches = 0; @@ -586,34 +605,36 @@ selectors_info (char *regexp, int from_tty) } /* First time thru is JUST to get max length and count. */ - ALL_MSYMBOLS (objfile, msymbol) + for (objfile *objfile : current_program_space->objfiles ()) { - QUIT; - name = SYMBOL_NATURAL_NAME (msymbol); - if (name - && (name[0] == '-' || name[0] == '+') - && name[1] == '[') /* Got a method name. */ + for (minimal_symbol *msymbol : objfile->msymbols ()) { - /* Filter for class/instance methods. */ - if (plusminus && name[0] != plusminus) - continue; - /* Find selector part. */ - name = (char *) strchr (name+2, ' '); - if (name == NULL) + QUIT; + name = msymbol->natural_name (); + if (name + && (name[0] == '-' || name[0] == '+') + && name[1] == '[') /* Got a method name. */ { - complaint (&symfile_complaints, - _("Bad method name '%s'"), - SYMBOL_NATURAL_NAME (msymbol)); - continue; - } - if (regexp == NULL || re_exec(++name) != 0) - { - const char *mystart = name; - const char *myend = strchr (mystart, ']'); + /* Filter for class/instance methods. */ + if (plusminus && name[0] != plusminus) + continue; + /* Find selector part. */ + name = (char *) strchr (name+2, ' '); + if (name == NULL) + { + complaint (_("Bad method name '%s'"), + msymbol->natural_name ()); + continue; + } + if (regexp == NULL || re_exec(++name) != 0) + { + const char *mystart = name; + const char *myend = strchr (mystart, ']'); - if (myend && (myend - mystart > maxlen)) - maxlen = myend - mystart; /* Get longest selector. */ - matches++; + if (myend && (myend - mystart > maxlen)) + maxlen = myend - mystart; /* Get longest selector. */ + matches++; + } } } } @@ -622,23 +643,26 @@ selectors_info (char *regexp, int from_tty) printf_filtered (_("Selectors matching \"%s\":\n\n"), regexp ? regexp : "*"); - sym_arr = alloca (matches * sizeof (struct symbol *)); + sym_arr = XALLOCAVEC (struct symbol *, matches); matches = 0; - ALL_MSYMBOLS (objfile, msymbol) + for (objfile *objfile : current_program_space->objfiles ()) { - QUIT; - name = SYMBOL_NATURAL_NAME (msymbol); - if (name && - (name[0] == '-' || name[0] == '+') && - name[1] == '[') /* Got a method name. */ + for (minimal_symbol *msymbol : objfile->msymbols ()) { - /* Filter for class/instance methods. */ - if (plusminus && name[0] != plusminus) - continue; - /* Find selector part. */ - name = (char *) strchr(name+2, ' '); - if (regexp == NULL || re_exec(++name) != 0) - sym_arr[matches++] = (struct symbol *) msymbol; + QUIT; + name = msymbol->natural_name (); + if (name && + (name[0] == '-' || name[0] == '+') && + name[1] == '[') /* Got a method name. */ + { + /* Filter for class/instance methods. */ + if (plusminus && name[0] != plusminus) + continue; + /* Find selector part. */ + name = (char *) strchr(name+2, ' '); + if (regexp == NULL || re_exec(++name) != 0) + sym_arr[matches++] = (struct symbol *) msymbol; + } } } @@ -651,7 +675,7 @@ selectors_info (char *regexp, int from_tty) 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). */ @@ -682,8 +706,8 @@ compare_classes (const void *a, const void *b) { 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)")); @@ -701,10 +725,8 @@ compare_classes (const void *a, const void *b) */ static void -classes_info (char *regexp, int from_tty) +info_classes_command (const char *regexp, int from_tty) { - struct objfile *objfile; - struct minimal_symbol *msymbol; const char *name; char *val; int matches = 0; @@ -737,39 +759,45 @@ classes_info (char *regexp, int from_tty) } /* First time thru is JUST to get max length and count. */ - ALL_MSYMBOLS (objfile, msymbol) + for (objfile *objfile : current_program_space->objfiles ()) { - QUIT; - name = SYMBOL_NATURAL_NAME (msymbol); - if (name && - (name[0] == '-' || name[0] == '+') && - name[1] == '[') /* Got a method name. */ - if (regexp == NULL || re_exec(name+2) != 0) - { - /* Compute length of classname part. */ - const char *mystart = name + 2; - const char *myend = strchr (mystart, ' '); + for (minimal_symbol *msymbol : objfile->msymbols ()) + { + QUIT; + name = msymbol->natural_name (); + if (name && + (name[0] == '-' || name[0] == '+') && + name[1] == '[') /* Got a method name. */ + if (regexp == NULL || re_exec(name+2) != 0) + { + /* Compute length of classname part. */ + const char *mystart = name + 2; + const char *myend = strchr (mystart, ' '); - if (myend && (myend - mystart > maxlen)) - maxlen = myend - mystart; - matches++; - } + if (myend && (myend - mystart > maxlen)) + maxlen = myend - mystart; + matches++; + } + } } if (matches) { printf_filtered (_("Classes matching \"%s\":\n\n"), regexp ? regexp : "*"); - sym_arr = alloca (matches * sizeof (struct symbol *)); + sym_arr = XALLOCAVEC (struct symbol *, matches); matches = 0; - ALL_MSYMBOLS (objfile, msymbol) + for (objfile *objfile : current_program_space->objfiles ()) { - QUIT; - name = SYMBOL_NATURAL_NAME (msymbol); - if (name && - (name[0] == '-' || name[0] == '+') && - name[1] == '[') /* Got a method name. */ - if (regexp == NULL || re_exec(name+2) != 0) - sym_arr[matches++] = (struct symbol *) msymbol; + for (minimal_symbol *msymbol : objfile->msymbols ()) + { + QUIT; + name = msymbol->natural_name (); + if (name && + (name[0] == '-' || name[0] == '+') && + name[1] == '[') /* Got a method name. */ + if (regexp == NULL || re_exec(name+2) != 0) + sym_arr[matches++] = (struct symbol *) msymbol; + } } qsort (sym_arr, matches, sizeof (struct minimal_symbol *), @@ -781,7 +809,7 @@ classes_info (char *regexp, int from_tty) 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). */ @@ -812,15 +840,13 @@ parse_selector (char *method, char **selector) s1 = method; - while (isspace (*s1)) - s1++; + s1 = skip_spaces (s1); if (*s1 == '\'') { found_quote = 1; s1++; } - while (isspace (*s1)) - s1++; + s1 = skip_spaces (s1); nselector = s1; s2 = s1; @@ -839,14 +865,12 @@ parse_selector (char *method, char **selector) } *s1++ = '\0'; - while (isspace (*s2)) - s2++; + s2 = skip_spaces (s2); if (found_quote) { if (*s2 == '\'') s2++; - while (isspace (*s2)) - s2++; + s2 = skip_spaces (s2); } if (selector != NULL) @@ -856,7 +880,7 @@ parse_selector (char *method, char **selector) } static char * -parse_method (char *method, char *type, char **class, +parse_method (char *method, char *type, char **theclass, char **category, char **selector) { char *s1 = NULL; @@ -869,27 +893,24 @@ parse_method (char *method, char *type, char **class, char *nselector = NULL; gdb_assert (type != NULL); - gdb_assert (class != NULL); + gdb_assert (theclass != NULL); gdb_assert (category != NULL); gdb_assert (selector != NULL); s1 = method; - while (isspace (*s1)) - s1++; + s1 = skip_spaces (s1); if (*s1 == '\'') { found_quote = 1; s1++; } - while (isspace (*s1)) - s1++; + s1 = skip_spaces (s1); if ((s1[0] == '+') || (s1[0] == '-')) ntype = *s1++; - while (isspace (*s1)) - s1++; + s1 = skip_spaces (s1); if (*s1 != '[') return NULL; @@ -900,14 +921,12 @@ parse_method (char *method, char *type, char **class, s1++; s2 = s1; - while (isspace (*s2)) - s2++; + s2 = skip_spaces (s2); if (*s2 == '(') { s2++; - while (isspace (*s2)) - s2++; + s2 = skip_spaces (s2); ncategory = s2; while (isalnum (*s2) || (*s2 == '_')) s2++; @@ -935,21 +954,19 @@ parse_method (char *method, char *type, char **class, *s1++ = '\0'; s2++; - while (isspace (*s2)) - s2++; + s2 = skip_spaces (s2); if (found_quote) { if (*s2 != '\'') return NULL; s2++; - while (isspace (*s2)) - s2++; + s2 = skip_spaces (s2); } if (type != NULL) *type = ntype; - if (class != NULL) - *class = nclass; + if (theclass != NULL) + *theclass = nclass; if (category != NULL) *category = ncategory; if (selector != NULL) @@ -959,12 +976,10 @@ parse_method (char *method, char *type, char **class, } static void -find_methods (char type, const char *class, const char *category, +find_methods (char type, const char *theclass, const char *category, const char *selector, - VEC (const_char_ptr) **symbol_names) + std::vector *symbol_names) { - struct objfile *objfile = NULL; - const char *symname = NULL; char ntype = '\0'; @@ -977,10 +992,9 @@ find_methods (char type, const char *class, const char *category, gdb_assert (symbol_names != NULL); - ALL_OBJFILES (objfile) + for (objfile *objfile : current_program_space->objfiles ()) { unsigned int *objc_csym; - struct minimal_symbol *msymbol = NULL; /* The objfile_csym variable counts the number of ObjC methods that this objfile defines. We save that count as a private @@ -989,20 +1003,18 @@ find_methods (char type, const char *class, const char *category, unsigned int objfile_csym = 0; - objc_csym = 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; - ALL_OBJFILE_MSYMBOLS (objfile, msymbol) + for (minimal_symbol *msymbol : objfile->msymbols ()) { - struct gdbarch *gdbarch = get_objfile_arch (objfile); - QUIT; /* Check the symbol name first as this can be done entirely without sending any query to the target. */ - symname = SYMBOL_NATURAL_NAME (msymbol); + symname = msymbol->natural_name (); if (symname == NULL) continue; @@ -1016,7 +1028,7 @@ find_methods (char type, const char *class, const char *category, while ((strlen (symname) + 1) >= tmplen) { tmplen = (tmplen == 0) ? 1024 : tmplen * 2; - tmp = xrealloc (tmp, tmplen); + tmp = (char *) xrealloc (tmp, tmplen); } strcpy (tmp, symname); @@ -1027,8 +1039,8 @@ find_methods (char type, const char *class, const char *category, if ((type != '\0') && (ntype != type)) continue; - if ((class != NULL) - && ((nclass == NULL) || (strcmp (class, nclass) != 0))) + if ((theclass != NULL) + && ((nclass == NULL) || (strcmp (theclass, nclass) != 0))) continue; if ((category != NULL) && @@ -1039,51 +1051,32 @@ find_methods (char type, const char *class, const char *category, ((nselector == NULL) || (strcmp (selector, nselector) != 0))) continue; - VEC_safe_push (const_char_ptr, *symbol_names, symname); + symbol_names->push_back (symname); } if (objc_csym == NULL) - { - objc_csym = obstack_alloc (&objfile->objfile_obstack, - sizeof (*objc_csym)); - *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 (VEC (const_char_ptr) **strings) +uniquify_strings (std::vector *strings) { - int ix; - const char *elem, *last = NULL; - int out; - - qsort (VEC_address (const_char_ptr, *strings), - VEC_length (const_char_ptr, *strings), - sizeof (const_char_ptr), - compare_strings); - out = 0; - for (ix = 0; VEC_iterate (const_char_ptr, *strings, ix, elem); ++ix) - { - if (last == NULL || strcmp (last, elem) != 0) - { - /* Keep ELEM. */ - VEC_replace (const_char_ptr, *strings, out, elem); - ++out; - } - last = elem; - } - VEC_truncate (const_char_ptr, *strings, out); + if (strings->empty ()) + return; + + std::sort (strings->begin (), strings->end (), compare_cstrings); + strings->erase (std::unique (strings->begin (), strings->end (), streq), + strings->end ()); } /* - * Function: find_imps (char *selector, struct symbol **sym_arr) + * Function: find_imps (const char *selector, struct symbol **sym_arr) * * Input: a string representing a selector * a pointer to an array of symbol pointers @@ -1112,11 +1105,11 @@ uniquify_strings (VEC (const_char_ptr) **strings) * be the index of the first non-debuggable one). */ -char * -find_imps (char *method, VEC (const_char_ptr) **symbol_names) +const char * +find_imps (const char *method, std::vector *symbol_names) { char type = '\0'; - char *class = NULL; + char *theclass = NULL; char *category = NULL; char *selector = NULL; @@ -1129,7 +1122,7 @@ find_imps (char *method, VEC (const_char_ptr) **symbol_names) buf = (char *) alloca (strlen (method) + 1); strcpy (buf, method); - tmp = parse_method (buf, &type, &class, &category, &selector); + tmp = parse_method (buf, &type, &theclass, &category, &selector); if (tmp == NULL) { @@ -1142,24 +1135,24 @@ find_imps (char *method, VEC (const_char_ptr) **symbol_names) selector_case = 1; } - find_methods (type, class, category, selector, symbol_names); + find_methods (type, theclass, category, selector, symbol_names); /* If we hit the "selector" case, and we found some methods, then add the selector itself as a symbol, if it exists. */ - if (selector_case && !VEC_empty (const_char_ptr, *symbol_names)) + if (selector_case && !symbol_names->empty ()) { - struct symbol *sym = lookup_symbol (selector, NULL, VAR_DOMAIN, 0); + struct symbol *sym = lookup_symbol (selector, NULL, VAR_DOMAIN, + 0).symbol; if (sym != NULL) - VEC_safe_push (const_char_ptr, *symbol_names, - SYMBOL_NATURAL_NAME (sym)); + symbol_names->push_back (sym->natural_name ()); else { - struct minimal_symbol *msym = lookup_minimal_symbol (selector, 0, 0); + struct bound_minimal_symbol msym + = lookup_minimal_symbol (selector, 0, 0); - if (msym != NULL) - VEC_safe_push (const_char_ptr, *symbol_names, - SYMBOL_NATURAL_NAME (msym)); + if (msym.minsym != NULL) + symbol_names->push_back (msym.minsym->natural_name ()); } } @@ -1169,7 +1162,7 @@ find_imps (char *method, VEC (const_char_ptr) **symbol_names) } static void -print_object_command (char *args, int from_tty) +print_object_command (const char *args, int from_tty) { struct value *object, *function, *description; CORE_ADDR string_addr, object_addr; @@ -1181,14 +1174,11 @@ print_object_command (char *args, int from_tty) "The 'print-object' command requires an argument (an Objective-C object)"); { - struct expression *expr = parse_expression (args); - struct cleanup *old_chain = - make_cleanup (free_current_contents, &expr); + expression_up expr = parse_expression (args); int pc = 0; object = evaluate_subexp (builtin_type (expr->gdbarch)->builtin_data_ptr, - expr, &pc, EVAL_NORMAL); - do_cleanups (old_chain); + expr.get (), &pc, EVAL_NORMAL); } /* Validate the address for sanity. */ @@ -1199,7 +1189,7 @@ print_object_command (char *args, int from_tty) if (function == NULL) error (_("Unable to locate _NSPrintForDebugger in child process")); - description = call_function_by_hand (function, 1, &object); + description = call_function_by_hand (function, NULL, object); string_addr = value_as_long (description); if (string_addr == 0) @@ -1224,7 +1214,7 @@ print_object_command (char *args, int from_tty) */ struct objc_methcall { - char *name; + const char *name; /* Return instance method to be called. */ int (*stop_at) (CORE_ADDR, CORE_ADDR *); /* Start of pc range corresponding to method invocation. */ @@ -1263,25 +1253,23 @@ find_objc_msgsend (void) for (i = 0; i < nmethcalls; i++) { - struct minimal_symbol *func; + struct bound_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_bound_minimal_symbol (methcalls[i].name); + if ((func.minsym == NULL) && (methcalls[i].name[0] == '_')) { - func = lookup_minimal_symbol (methcalls[i].name + 1, NULL, NULL); + func = lookup_bound_minimal_symbol (methcalls[i].name + 1); } - if (func == NULL) + if (func.minsym == 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); + methcalls[i].begin = BMSYMBOL_VALUE_ADDRESS (func); + methcalls[i].end = minimal_symbol_upper_bound (func); } } @@ -1300,43 +1288,24 @@ find_objc_msgsend (void) * dependent modules. */ -struct objc_submethod_helper_data { - int (*f) (CORE_ADDR, CORE_ADDR *); - CORE_ADDR pc; - CORE_ADDR *new_pc; -}; - -static int -find_objc_msgcall_submethod_helper (void * arg) -{ - struct objc_submethod_helper_data *s = - (struct objc_submethod_helper_data *) arg; - - if (s->f (s->pc, s->new_pc) == 0) - return 1; - else - return 0; -} - static int find_objc_msgcall_submethod (int (*f) (CORE_ADDR, CORE_ADDR *), CORE_ADDR pc, CORE_ADDR *new_pc) { - struct objc_submethod_helper_data s; - - s.f = f; - s.pc = pc; - s.new_pc = new_pc; + try + { + if (f (pc, new_pc) == 0) + return 1; + } + catch (const gdb_exception &ex) + { + exception_fprintf (gdb_stderr, ex, + "Unable to determine target of " + "Objective-C method call (ignoring):\n"); + } - if (catch_errors (find_objc_msgcall_submethod_helper, - (void *) &s, - "Unable to determine target of " - "Objective-C method call (ignoring):\n", - RETURN_MASK_ALL) == 0) - return 1; - else - return 0; + return 0; } int @@ -1363,16 +1332,12 @@ find_objc_msgcall (CORE_ADDR pc, CORE_ADDR *new_pc) return 0; } -/* -Wmissing-prototypes */ -extern initialize_file_ftype _initialize_objc_language; - void _initialize_objc_language (void) { - add_language (&objc_language_defn); - add_info ("selectors", selectors_info, /* INFO SELECTORS command. */ + add_info ("selectors", info_selectors_command, _("All Objective-C selectors, or those matching REGEXP.")); - add_info ("classes", classes_info, /* INFO CLASSES command. */ + add_info ("classes", info_classes_command, _("All Objective-C classes, or those matching REGEXP.")); add_com ("print-object", class_vars, print_object_command, _("Ask an Objective-C object to print itself.")); @@ -1422,34 +1387,34 @@ read_objc_super (struct gdbarch *gdbarch, CORE_ADDR addr, 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); + super->theclass = read_memory_unsigned_integer (addr + 4, 4, byte_order); }; static void read_objc_class (struct gdbarch *gdbarch, CORE_ADDR addr, - struct objc_class *class) + struct objc_class *theclass) { 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); - class->version = read_memory_unsigned_integer (addr + 12, 4, byte_order); - class->info = read_memory_unsigned_integer (addr + 16, 4, byte_order); - class->instance_size = read_memory_unsigned_integer (addr + 18, 4, + theclass->isa = read_memory_unsigned_integer (addr, 4, byte_order); + theclass->super_class = read_memory_unsigned_integer (addr + 4, 4, byte_order); + theclass->name = read_memory_unsigned_integer (addr + 8, 4, byte_order); + theclass->version = read_memory_unsigned_integer (addr + 12, 4, byte_order); + theclass->info = read_memory_unsigned_integer (addr + 16, 4, byte_order); + theclass->instance_size = read_memory_unsigned_integer (addr + 18, 4, byte_order); - class->ivars = read_memory_unsigned_integer (addr + 24, 4, byte_order); - class->methods = read_memory_unsigned_integer (addr + 28, 4, byte_order); - class->cache = read_memory_unsigned_integer (addr + 32, 4, byte_order); - class->protocols = read_memory_unsigned_integer (addr + 36, 4, byte_order); + theclass->ivars = read_memory_unsigned_integer (addr + 24, 4, byte_order); + theclass->methods = read_memory_unsigned_integer (addr + 28, 4, byte_order); + theclass->cache = read_memory_unsigned_integer (addr + 32, 4, byte_order); + theclass->protocols = read_memory_unsigned_integer (addr + 36, 4, byte_order); } static CORE_ADDR find_implementation_from_class (struct gdbarch *gdbarch, - CORE_ADDR class, CORE_ADDR sel) + CORE_ADDR theclass, CORE_ADDR sel) { enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); - CORE_ADDR subclass = class; + CORE_ADDR subclass = theclass; while (subclass != 0) { @@ -1478,11 +1443,6 @@ find_implementation_from_class (struct gdbarch *gdbarch, struct objc_method meth_str; read_objc_methlist_method (gdbarch, mlist, i, &meth_str); -#if 0 - fprintf (stderr, - "checking method 0x%lx against selector 0x%lx\n", - meth_str.name, sel); -#endif if (meth_str.name == sel) /* FIXME: hppa arch was doing a pointer dereference @@ -1573,10 +1533,10 @@ resolve_msgsend_super (CORE_ADDR pc, CORE_ADDR *new_pc) sel = gdbarch_fetch_pointer_argument (gdbarch, frame, 1, ptr_type); read_objc_super (gdbarch, super, &sstr); - if (sstr.class == 0) + if (sstr.theclass == 0) return 0; - res = find_implementation_from_class (gdbarch, sstr.class, sel); + res = find_implementation_from_class (gdbarch, sstr.theclass, sel); if (new_pc != 0) *new_pc = res; if (res == 0) @@ -1601,22 +1561,13 @@ resolve_msgsend_super_stret (CORE_ADDR pc, CORE_ADDR *new_pc) sel = gdbarch_fetch_pointer_argument (gdbarch, frame, 2, ptr_type); read_objc_super (gdbarch, super, &sstr); - if (sstr.class == 0) + if (sstr.theclass == 0) return 0; - res = find_implementation_from_class (gdbarch, sstr.class, sel); + res = find_implementation_from_class (gdbarch, sstr.theclass, sel); if (new_pc != 0) *new_pc = res; if (res == 0) return 1; return 0; } - -/* Provide a prototype to silence -Wmissing-prototypes. */ -extern initialize_file_ftype _initialize_objc_lang; - -void -_initialize_objc_lang (void) -{ - objc_objfile_data = register_objfile_data (); -}