X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fobjc-lang.c;h=6da8af1a46159c4fabad11f39105d4f54a028d22;hb=e418a61a67a3476826259163383e5deb661042cc;hp=979ba0192f422459c422c06a25960830957ec6b9;hpb=32d0add0a654c1204ab71dc8a55d9374538c4b33;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 979ba0192f..6da8af1a46 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-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. Contributed by Apple Computer, Inc. Written by Michael Snyder. @@ -45,6 +45,7 @@ #include "cli/cli-utils.h" #include +#include struct objc_object { CORE_ADDR isa; @@ -65,7 +66,7 @@ struct objc_class { struct objc_super { CORE_ADDR receiver; - CORE_ADDR class; + CORE_ADDR theclass; }; struct objc_method { @@ -81,11 +82,11 @@ static const struct objfile_data *objc_objfile_data; 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) { @@ -106,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; @@ -123,19 +124,19 @@ lookup_objc_class (struct gdbarch *gdbarch, char *classname) 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, + return (CORE_ADDR) value_as_long (call_function_by_hand (function, + NULL, 1, &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; @@ -152,15 +153,14 @@ lookup_child_selector (struct gdbarch *gdbarch, char *selname) 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, 1, &selstring)); } struct value * @@ -181,12 +181,13 @@ value_nsstring (struct gdbarch *gdbarch, char *ptr, int len) 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, 1, &stringValue[2]); } 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, 1, &stringValue[2]); } else if (lookup_minimal_symbol("+[NSString stringWithCString:]", 0, 0).minsym) { @@ -198,7 +199,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, 3, &stringValue[0]); } else error (_("NSString: internal error -- no way to create new NSString")); @@ -226,7 +227,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 */ @@ -281,6 +282,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 @@ -350,7 +360,12 @@ 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, @@ -358,9 +373,9 @@ const struct language_defn objc_language_defn = { 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,22 +387,26 @@ 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, + default_search_name_hash, &default_varobj_ops, NULL, NULL, @@ -413,16 +432,15 @@ 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 @@ -543,7 +561,7 @@ 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; @@ -605,8 +623,7 @@ selectors_info (char *regexp, int from_tty) name = (char *) strchr (name+2, ' '); if (name == NULL) { - complaint (&symfile_complaints, - _("Bad method name '%s'"), + complaint (_("Bad method name '%s'"), MSYMBOL_NATURAL_NAME (msymbol)); continue; } @@ -626,7 +643,7 @@ 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) { @@ -705,7 +722,7 @@ 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; @@ -763,7 +780,7 @@ classes_info (char *regexp, int from_tty) { 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) { @@ -856,7 +873,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,7 +886,7 @@ 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); @@ -941,8 +958,8 @@ parse_method (char *method, char *type, char **class, if (type != NULL) *type = ntype; - if (class != NULL) - *class = nclass; + if (theclass != NULL) + *theclass = nclass; if (category != NULL) *category = ncategory; if (selector != NULL) @@ -952,9 +969,9 @@ 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; @@ -982,7 +999,7 @@ 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 = (unsigned int *) objfile_data (objfile, objc_objfile_data); if (objc_csym != NULL && *objc_csym == 0) /* There are no ObjC symbols in this objfile. Skip it entirely. */ continue; @@ -1007,7 +1024,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); @@ -1018,8 +1035,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) && @@ -1030,13 +1047,12 @@ 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 = XOBNEW (&objfile->objfile_obstack, unsigned int); *objc_csym = objfile_csym; set_objfile_data (objfile, objc_objfile_data, objc_csym); } @@ -1049,33 +1065,14 @@ find_methods (char type, const char *class, const char *category, /* Uniquify a VEC 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; - - /* If the vector is empty, there's nothing to do. This explicit - check is needed to avoid invoking qsort with NULL. */ - if (VEC_empty (const_char_ptr, *strings)) + if (strings->empty ()) return; - 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); + std::sort (strings->begin (), strings->end (), compare_cstrings); + strings->erase (std::unique (strings->begin (), strings->end (), streq), + strings->end ()); } /* @@ -1109,10 +1106,10 @@ uniquify_strings (VEC (const_char_ptr) **strings) */ const char * -find_imps (const char *method, VEC (const_char_ptr) **symbol_names) +find_imps (const char *method, std::vector *symbol_names) { char type = '\0'; - char *class = NULL; + char *theclass = NULL; char *category = NULL; char *selector = NULL; @@ -1125,7 +1122,7 @@ find_imps (const 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) { @@ -1138,25 +1135,24 @@ find_imps (const 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 (SYMBOL_NATURAL_NAME (sym)); else { struct bound_minimal_symbol msym = lookup_minimal_symbol (selector, 0, 0); if (msym.minsym != NULL) - VEC_safe_push (const_char_ptr, *symbol_names, - MSYMBOL_NATURAL_NAME (msym.minsym)); + symbol_names->push_back (MSYMBOL_NATURAL_NAME (msym.minsym)); } } @@ -1166,7 +1162,7 @@ find_imps (const 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; @@ -1178,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. */ @@ -1196,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, 1, &object); string_addr = value_as_long (description); if (string_addr == 0) @@ -1221,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. */ @@ -1295,43 +1288,25 @@ 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 (ex, RETURN_MASK_ALL) + { + exception_fprintf (gdb_stderr, ex, + "Unable to determine target of " + "Objective-C method call (ignoring):\n"); + } + END_CATCH - 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 @@ -1358,16 +1333,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.")); @@ -1417,34 +1388,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) { @@ -1563,10 +1534,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) @@ -1591,10 +1562,10 @@ 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) @@ -1602,9 +1573,6 @@ resolve_msgsend_super_stret (CORE_ADDR pc, CORE_ADDR *new_pc) return 0; } -/* Provide a prototype to silence -Wmissing-prototypes. */ -extern initialize_file_ftype _initialize_objc_lang; - void _initialize_objc_lang (void) {