X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fobjc-lang.c;h=6cfe3c533d33a415cc57728b7a5f655c9270a8cd;hb=d98a0826249cfa81146382408be8fc59b141cb52;hp=594a0cb5b70d05d8063b71bb12647935ae1cbc73;hpb=b81654f1c061cfbadd7e270a2920b014d4c9cfdd;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 594a0cb5b7..6cfe3c533d 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -1,21 +1,26 @@ -/* Objective C language support routines for GDB, the GNU debugger. - Copyright 1996 NeXT Software, Inc. +/* Objective-C language support routines for GDB, the GNU debugger. -This file is part of GDB. + Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + Contributed by Apple Computer, Inc. + Written by Michael Snyder. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This file is part of GDB. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #include "defs.h" #include "symtab.h" @@ -23,18 +28,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "expression.h" #include "parser-defs.h" #include "language.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 "string.h" /* for strchr */ +#include "gdb_string.h" /* for strchr */ #include "target.h" /* for target_has_execution */ #include "gdbcore.h" #include "gdbcmd.h" #include "frame.h" #include "gdb_regex.h" #include "regcache.h" +#include "block.h" +#include "infcall.h" +#include "valprint.h" +#include "gdb_assert.h" #include @@ -66,69 +77,32 @@ struct objc_method { CORE_ADDR imp; }; -/* Complaints about ObjC classes, selectors, etc. */ - -static struct complaint noclass_lookup_complaint = - {"no way to lookup Objective-C classes", 0, 0}; - -static struct complaint nosel_lookup_complaint = - {"no way to lookup Objective-C selectors", 0, 0}; - - -#if (!defined __GNUC__ || __GNUC__ < 2 || __GNUC_MINOR__ < (defined __cplusplus ? 6 : 4)) -#define __CHECK_FUNCTION ((__const char *) 0) -#else -#define __CHECK_FUNCTION __PRETTY_FUNCTION__ -#endif - -#define CHECK(expression) \ - ((void) ((expression) ? 0 : gdb_check (#expression, __FILE__, __LINE__, \ - __CHECK_FUNCTION))) - -#define CHECK_FATAL(expression) \ - ((void) ((expression) ? 0 : gdb_check_fatal (#expression, __FILE__, \ - __LINE__, __CHECK_FUNCTION))) - -void -gdb_check (const char *str, const char *file, unsigned int line, - const char *func) -{ - error ("assertion failure on line %u of \"%s\" in function \"%s\": %s\n", - line, file, func, str); -} - -void -gdb_check_fatal (const char *str, const char *file, unsigned int line, - const char *func) -{ - internal_error (file, line, - "assertion failure in function \"%s\": %s\n", func, str); -} - -/* Lookup a structure type named "struct NAME", - visible in lexical block BLOCK. - If NOERR is nonzero, return zero if NAME is not suitably defined. */ +/* 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, struct block *block, int noerr) { - register struct symbol *sym; + struct symbol *sym; - sym = lookup_symbol (name, block, STRUCT_NAMESPACE, 0, (struct symtab **) NULL); + sym = lookup_symbol (name, block, STRUCT_DOMAIN, 0, + (struct symtab **) NULL); if (sym == NULL) { if (noerr) return 0; else - error ("No struct type named %s.", name); + error (_("No struct type named %s."), name); } if (TYPE_CODE (SYMBOL_TYPE (sym)) != TYPE_CODE_STRUCT) { if (noerr) return 0; else - error ("This context has class, union or enum %s, not a struct.", name); + error (_("This context has class, union or enum %s, not a struct."), + name); } return sym; } @@ -140,7 +114,7 @@ lookup_objc_class (char *classname) if (! target_has_execution) { - /* can't call into inferior to lookup class */ + /* Can't call into inferior to lookup class. */ return 0; } @@ -150,7 +124,7 @@ lookup_objc_class (char *classname) function = find_function_in_inferior("objc_lookup_class"); else { - complain (&noclass_lookup_complaint, 0); + complaint (&symfile_complaints, _("no way to lookup Objective-C classes")); return 0; } @@ -160,14 +134,14 @@ lookup_objc_class (char *classname) 1, &classval)); } -int +CORE_ADDR lookup_child_selector (char *selname) { struct value * function, *selstring; if (! target_has_execution) { - /* can't call into inferior to lookup selector */ + /* Can't call into inferior to lookup selector. */ return 0; } @@ -177,11 +151,12 @@ lookup_child_selector (char *selname) function = find_function_in_inferior("sel_get_any_uid"); else { - complain (&nosel_lookup_complaint, 0); + complaint (&symfile_complaints, _("no way to lookup Objective-C selectors")); return 0; } - selstring = value_coerce_array (value_string (selname, strlen (selname) + 1)); + selstring = value_coerce_array (value_string (selname, + strlen (selname) + 1)); return value_as_long (call_function_by_hand (function, 1, &selstring)); } @@ -194,17 +169,19 @@ value_nsstring (char *ptr, int len) struct type *type; if (!target_has_execution) - return 0; /* can't call into inferior to create NSString */ + return 0; /* Can't call into inferior to create NSString. */ - if (!(sym = lookup_struct_typedef("NSString", 0, 1)) && - !(sym = lookup_struct_typedef("NXString", 0, 1))) + sym = lookup_struct_typedef("NSString", 0, 1); + if (sym == NULL) + sym = lookup_struct_typedef("NXString", 0, 1); + if (sym == NULL) type = lookup_pointer_type(builtin_type_void); else type = lookup_pointer_type(SYMBOL_TYPE (sym)); stringValue[2] = value_string(ptr, len); stringValue[2] = value_coerce_array(stringValue[2]); - /* _NSNewStringFromCString replaces "istr" after Lantern2A */ + /* _NSNewStringFromCString replaces "istr" after Lantern2A. */ if (lookup_minimal_symbol("_NSNewStringFromCString", 0, 0)) { function = find_function_in_inferior("_NSNewStringFromCString"); @@ -225,16 +202,16 @@ value_nsstring (char *ptr, int len) nsstringValue = call_function_by_hand(function, 3, &stringValue[0]); } else - error ("NSString: internal error -- no way to create new NSString"); + error (_("NSString: internal error -- no way to create new NSString")); - VALUE_TYPE(nsstringValue) = type; + deprecated_set_value_type (nsstringValue, type); return nsstringValue; } -/* Objective C name demangling */ +/* Objective-C name demangling. */ char * -objc_demangle (const char *mangled) +objc_demangle (const char *mangled, int options) { char *demangled, *cp; @@ -255,9 +232,10 @@ objc_demangle (const char *mangled) while (*cp && *cp == '_') cp++; /* skip any initial underbars in class name */ - if (!(cp = strchr(cp, '_'))) /* find first non-initial underbar */ + cp = strchr(cp, '_'); + if (!cp) /* find first non-initial underbar */ { - free(demangled); /* not mangled name */ + xfree(demangled); /* not mangled name */ return NULL; } if (cp[1] == '_') { /* easy case: no category name */ @@ -266,13 +244,14 @@ objc_demangle (const char *mangled) } else { *cp++ = '('; /* less easy case: category name */ - if (!(cp = strchr(cp, '_'))) + cp = strchr(cp, '_'); + if (!cp) { - free(demangled); /* not mangled name */ + xfree(demangled); /* not mangled name */ return NULL; } *cp++ = ')'; - *cp++ = ' '; /* overwriting 1st char of method name... */ + *cp++ = ' '; /* overwriting 1st char of method name... */ strcpy(cp, mangled + (cp - demangled)); /* get it back */ } @@ -288,18 +267,18 @@ objc_demangle (const char *mangled) return demangled; } else - return NULL; /* not an objc mangled name */ + return NULL; /* Not an objc mangled name. */ } -/* Print the character C on STREAM as part of the contents of a literal - string whose delimiter is QUOTER. Note that that format for printing - characters and strings is language specific. */ +/* Print the character C on STREAM as part of the contents of a + literal string whose delimiter is QUOTER. Note that that format + for printing characters and strings is language specific. */ static void -objc_emit_char (register int c, struct ui_file *stream, int quoter) +objc_emit_char (int c, struct ui_file *stream, int quoter) { - c &= 0xFF; /* Avoid sign bit follies */ + c &= 0xFF; /* Avoid sign bit follies. */ if (PRINT_LITERAL_FORM (c)) { @@ -349,26 +328,24 @@ objc_printchar (int c, struct ui_file *stream) fputs_filtered ("'", stream); } -/* Print the character string STRING, printing at most LENGTH characters. - Printing stops early if the number hits print_max; repeat counts - are printed as appropriate. Print ellipses at the end if we - had to stop before printing LENGTH characters, or if FORCE_ELLIPSES. */ +/* Print the character string STRING, printing at most LENGTH + characters. Printing stops early if the number hits print_max; + repeat counts are printed as appropriate. Print ellipses at the + end if we had to stop before printing LENGTH characters, or if + FORCE_ELLIPSES. */ static void -objc_printstr (struct ui_file *stream, char *string, unsigned int length, - int force_ellipses) +objc_printstr (struct ui_file *stream, const gdb_byte *string, + unsigned int length, int width, int force_ellipses) { - register unsigned int i; + unsigned int i; unsigned int things_printed = 0; int in_quotes = 0; int need_comma = 0; - extern int inspect_it; - extern int repeat_count_threshold; - extern int print_max; /* If the string was not truncated due to `set print elements', and - the last byte of it is a null, we don't print that, in traditional C - style. */ + the last byte of it is a null, we don't print that, in + traditional C style. */ if ((!force_ellipses) && length > 0 && string[length-1] == '\0') length--; @@ -380,8 +357,8 @@ objc_printstr (struct ui_file *stream, char *string, unsigned int length, for (i = 0; i < length && things_printed < print_max; ++i) { - /* Position of the character we are examining - to see whether it is repeated. */ + /* Position of the character we are examining to see whether it + is repeated. */ unsigned int rep1; /* Number of repetitions we have detected so far. */ unsigned int reps; @@ -446,45 +423,47 @@ objc_printstr (struct ui_file *stream, char *string, unsigned int length, fputs_filtered ("...", stream); } -/* Create a fundamental C type using default reasonable for the current - target machine. - - Some object/debugging file formats (DWARF version 1, COFF, etc) do not - define fundamental types such as "int" or "double". Others (stabs or - DWARF version 2, etc) do define fundamental types. For the formats which - don't provide fundamental types, gdb can create such types using this - function. - - FIXME: Some compilers distinguish explicitly signed integral types - (signed short, signed int, signed long) from "regular" integral types - (short, int, long) in the debugging information. There is some dis- - agreement as to how useful this feature is. In particular, gcc does - not support this. Also, only some debugging formats allow the - distinction to be passed on to a debugger. For now, we always just - use "short", "int", or "long" as the type name, for both the implicit - and explicitly signed types. This also makes life easier for the - gdb test suite since we don't have to account for the differences - in output depending upon what the compiler and debugging format - support. We will probably have to re-examine the issue when gdb - starts taking it's fundamental type information directly from the - debugging information supplied by the compiler. fnf@cygnus.com */ +/* Create a fundamental C type using default reasonable for the + current target. + + Some object/debugging file formats (DWARF version 1, COFF, etc) do + not define fundamental types such as "int" or "double". Others + (stabs or DWARF version 2, etc) do define fundamental types. For + the formats which don't provide fundamental types, gdb can create + such types using this function. + + FIXME: Some compilers distinguish explicitly signed integral types + (signed short, signed int, signed long) from "regular" integral + types (short, int, long) in the debugging information. There is + some disagreement as to how useful this feature is. In particular, + gcc does not support this. Also, only some debugging formats allow + the distinction to be passed on to a debugger. For now, we always + just use "short", "int", or "long" as the type name, for both the + implicit and explicitly signed types. This also makes life easier + for the gdb test suite since we don't have to account for the + differences in output depending upon what the compiler and + debugging format support. We will probably have to re-examine the + issue when gdb starts taking it's fundamental type information + directly from the debugging information supplied by the compiler. + fnf@cygnus.com */ static struct type * objc_create_fundamental_type (struct objfile *objfile, int typeid) { - register struct type *type = NULL; + struct type *type = NULL; switch (typeid) { default: - /* FIXME: For now, if we are asked to produce a type not in this - language, create the equivalent of a C integer type with the - name "". When all the dust settles from the type - reconstruction work, this should probably become an error. */ + /* FIXME: For now, if we are asked to produce a type not in + this language, create the equivalent of a C integer type + with the name "". When all the dust settles from + the type reconstruction work, this should probably become + an error. */ type = init_type (TYPE_CODE_INT, TARGET_INT_BIT / TARGET_CHAR_BIT, 0, "", objfile); - warning ("internal error: no C/C++ fundamental type %d", typeid); + warning (_("internal error: no C/C++ fundamental type %d"), typeid); break; case FT_VOID: type = init_type (TYPE_CODE_VOID, @@ -585,6 +564,35 @@ objc_create_fundamental_type (struct objfile *objfile, int typeid) return (type); } +/* 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 + skip over the trampoline for the function (if any). This is better + for the user since they are only interested in stepping into the + method function anyway. */ +static CORE_ADDR +objc_skip_trampoline (CORE_ADDR stop_pc) +{ + CORE_ADDR real_stop_pc; + CORE_ADDR method_stop_pc; + + real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc); + + if (real_stop_pc != 0) + find_objc_msgcall (real_stop_pc, &method_stop_pc); + else + find_objc_msgcall (stop_pc, &method_stop_pc); + + if (method_stop_pc) + { + real_stop_pc = SKIP_TRAMPOLINE_CODE (method_stop_pc); + if (real_stop_pc == 0) + real_stop_pc = method_stop_pc; + } + + return real_stop_pc; +} + /* Table mapping opcodes into strings for printing operators and precedences of the operators. */ @@ -620,7 +628,7 @@ static const struct op_print objc_op_print_tab[] = {"sizeof ", UNOP_SIZEOF, PREC_PREFIX, 0}, {"++", UNOP_PREINCREMENT, PREC_PREFIX, 0}, {"--", UNOP_PREDECREMENT, PREC_PREFIX, 0}, - {NULL, 0, 0, 0} + {NULL, OP_NULL, PREC_NULL, 0} }; struct type ** const (objc_builtin_types[]) = @@ -646,15 +654,17 @@ struct type ** const (objc_builtin_types[]) = }; const struct language_defn objc_language_defn = { - "objective-c", /* Language name */ + "objective-c", /* Language name */ language_objc, objc_builtin_types, range_check_off, type_check_off, case_sensitive_on, + array_row_major, + &exp_descriptor_standard, objc_parse, objc_error, - evaluate_subexp_standard, + null_post_parser, objc_printchar, /* Print a character constant */ objc_printstr, /* Function to print string constant */ objc_emit_char, @@ -662,23 +672,28 @@ const struct language_defn objc_language_defn = { c_print_type, /* Print a type using appropriate syntax */ c_val_print, /* Print a value using appropriate syntax */ c_value_print, /* Print a top-level value */ - {"", "", "", ""}, /* Binary format info */ - {"0%lo", "0", "o", ""}, /* Octal format info */ - {"%ld", "", "d", ""}, /* Decimal format info */ - {"0x%lx", "0x", "x", ""}, /* Hex format info */ - objc_op_print_tab, /* expression operators for printing */ - 1, /* c-style arrays */ + objc_skip_trampoline, /* Language specific skip_trampoline */ + value_of_this, /* value_of_this */ + basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ + basic_lookup_transparent_type,/* lookup_transparent_type */ + objc_demangle, /* Language specific symbol demangler */ + NULL, /* Language specific class_name_from_physname */ + objc_op_print_tab, /* Expression operators for printing */ + 1, /* C-style arrays */ 0, /* String lower bound */ &builtin_type_char, /* Type of string elements */ + default_word_break_characters, + NULL, /* FIXME: la_language_arch_info. */ + default_print_array_index, LANG_MAGIC }; /* * ObjC: - * Following functions help construct Objective C message calls + * Following functions help construct Objective-C message calls */ -struct selname /* for parsing Objective C */ +struct selname /* For parsing Objective-C. */ { struct selname *next; char *msglist_sel; @@ -692,7 +707,7 @@ static char *msglist_sel; void start_msglist(void) { - register struct selname *new = + struct selname *new = (struct selname *) xmalloc (sizeof (struct selname)); new->next = selname_chain; @@ -710,8 +725,8 @@ 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 */ + if (str == 0) { /* Unnamed arg, or... */ + if (addcolon == 0) { /* variable number of args. */ msglist_len++; return; } @@ -725,7 +740,7 @@ add_msglist(struct stoken *str, int addcolon) s = (char *)xmalloc(len); strcpy(s, msglist_sel); strncat(s, p, plen); - free(msglist_sel); + xfree(msglist_sel); msglist_sel = s; if (addcolon) { s[len-2] = ':'; @@ -738,21 +753,21 @@ add_msglist(struct stoken *str, int addcolon) int end_msglist(void) { - register int val = msglist_len; - register struct selname *sel = selname_chain; - register char *p = msglist_sel; - int selid; + int val = msglist_len; + struct selname *sel = selname_chain; + char *p = msglist_sel; + CORE_ADDR selid; selname_chain = sel->next; msglist_len = sel->msglist_len; msglist_sel = sel->msglist_sel; selid = lookup_child_selector(p); if (!selid) - error("Can't find selector \"%s\"", p); + error (_("Can't find selector \"%s\""), p); write_exp_elt_longcst (selid); - free(p); - write_exp_elt_longcst (val);/* Number of args */ - free(sel); + xfree(p); + write_exp_elt_longcst (val); /* Number of args */ + xfree(sel); return val; } @@ -761,10 +776,11 @@ end_msglist(void) * Function: specialcmp (char *a, char *b) * * Special strcmp: treats ']' and ' ' as end-of-string. - * Used for qsorting lists of objc methods (either by class or selector) + * Used for qsorting lists of objc methods (either by class or selector). */ -int specialcmp(char *a, char *b) +static int +specialcmp (char *a, char *b) { while (*a && *a != ' ' && *a != ']' && *b && *b != ' ' && *b != ']') { @@ -780,26 +796,26 @@ int specialcmp(char *a, char *b) } /* - * Function: compare_selectors (void *, void *) + * Function: compare_selectors (const void *, const void *) * - * Comparison function for use with qsort. Arguments are symbols or msymbols - * Compares selector part of objc method name alphabetically. + * Comparison function for use with qsort. Arguments are symbols or + * msymbols Compares selector part of objc method name alphabetically. */ static int -compare_selectors (a, b) - void *a; - void *b; +compare_selectors (const void *a, const void *b) { char *aname, *bname; - if ((aname = SYMBOL_SOURCE_NAME (*(struct symbol **) a)) == NULL || - (bname = SYMBOL_SOURCE_NAME (*(struct symbol **) b)) == NULL) - error ("internal: compare_selectors(1)"); + aname = SYMBOL_PRINT_NAME (*(struct symbol **) a); + bname = SYMBOL_PRINT_NAME (*(struct symbol **) b); + if (aname == NULL || bname == NULL) + error (_("internal: compare_selectors(1)")); - if ((aname = strchr(aname, ' ')) == NULL || - (bname = strchr(bname, ' ')) == NULL) - error ("internal: compare_selectors(2)"); + aname = strchr(aname, ' '); + bname = strchr(bname, ' '); + if (aname == NULL || bname == NULL) + error (_("internal: compare_selectors(2)")); return specialcmp (aname+1, bname+1); } @@ -807,10 +823,10 @@ compare_selectors (a, b) /* * Function: selectors_info (regexp, from_tty) * - * Implements the "Info selectors" command. Takes an optional regexp arg. - * Lists all objective c selectors that match the regexp. Works by - * grepping thru all symbols for objective c methods. Output list is - * sorted and uniqued. + * Implements the "Info selectors" command. Takes an optional regexp + * arg. Lists all objective c selectors that match the regexp. Works + * by grepping thru all symbols for objective c methods. Output list + * is sorted and uniqued. */ static void @@ -829,11 +845,11 @@ selectors_info (char *regexp, int from_tty) int plusminus = 0; if (regexp == NULL) - strcpy(myregexp, ".*]"); /* null input, match all objc methods */ + strcpy(myregexp, ".*]"); /* Null input, match all objc methods. */ else { - if (*regexp == '+' || *regexp == '-') /* if regexp starts with +/- */ - { /* user wants only class methods or only instance methods */ + if (*regexp == '+' || *regexp == '-') + { /* User wants only class methods or only instance methods. */ plusminus = *regexp++; while (*regexp == ' ' || *regexp == '\t') regexp++; @@ -851,36 +867,40 @@ selectors_info (char *regexp, int from_tty) } if (regexp != NULL) - if (0 != (val = re_comp (myregexp))) - error ("Invalid regexp (%s): %s", val, regexp); + { + val = re_comp (myregexp); + if (val != 0) + error (_("Invalid regexp (%s): %s"), val, regexp); + } - /* first time thru is JUST to get max length and count */ + /* First time thru is JUST to get max length and count. */ ALL_MSYMBOLS (objfile, msymbol) { QUIT; - if ((name = SYMBOL_DEMANGLED_NAME (msymbol)) == NULL) - name = SYMBOL_NAME (msymbol); + name = SYMBOL_NATURAL_NAME (msymbol); if (name && (name[0] == '-' || name[0] == '+') && - name[1] == '[') /* got a method name */ + name[1] == '[') /* Got a method name. */ { + /* Filter for class/instance methods. */ if (plusminus && name[0] != plusminus) - continue; /* filter for class/instance methods */ - name = (char *) strchr(name+2, ' '); /* find selector part */ + continue; + /* Find selector part. */ + name = (char *) strchr(name+2, ' '); if (regexp == NULL || re_exec(++name) != 0) { char *mystart = name; char *myend = (char *) strchr(mystart, ']'); if (myend && (myend - mystart > maxlen)) - maxlen = myend - mystart; /* get longest selector */ + maxlen = myend - mystart; /* Get longest selector. */ matches++; } } } if (matches) { - printf_filtered ("Selectors matching \"%s\":\n\n", + printf_filtered (_("Selectors matching \"%s\":\n\n"), regexp ? regexp : "*"); sym_arr = alloca (matches * sizeof (struct symbol *)); @@ -888,15 +908,16 @@ selectors_info (char *regexp, int from_tty) ALL_MSYMBOLS (objfile, msymbol) { QUIT; - if ((name = SYMBOL_DEMANGLED_NAME (msymbol)) == NULL) - name = SYMBOL_NAME (msymbol); + name = SYMBOL_NATURAL_NAME (msymbol); if (name && (name[0] == '-' || name[0] == '+') && - name[1] == '[') /* got a method name */ + name[1] == '[') /* Got a method name. */ { + /* Filter for class/instance methods. */ if (plusminus && name[0] != plusminus) - continue; /* filter for class/instance methods */ - name = (char *) strchr(name+2, ' '); /* find selector part */ + continue; + /* Find selector part. */ + name = (char *) strchr(name+2, ' '); if (regexp == NULL || re_exec(++name) != 0) sym_arr[matches++] = (struct symbol *) msymbol; } @@ -904,46 +925,47 @@ selectors_info (char *regexp, int from_tty) qsort (sym_arr, matches, sizeof (struct minimal_symbol *), compare_selectors); - asel[0] = 0; /* to prevent compare on first iteration */ - for (ix = 0; ix < matches; ix++) /* now do the output */ + /* Prevent compare on first iteration. */ + asel[0] = 0; + for (ix = 0; ix < matches; ix++) /* Now do the output. */ { char *p = asel; QUIT; - if ((name = SYMBOL_DEMANGLED_NAME (sym_arr[ix])) == NULL) - name = SYMBOL_NAME (sym_arr[ix]); + name = SYMBOL_NATURAL_NAME (sym_arr[ix]); name = strchr (name, ' ') + 1; if (p[0] && specialcmp(name, p) == 0) - continue; /* seen this one already (not unique) */ + continue; /* Seen this one already (not unique). */ - while (*name && *name != ']') /* copy selector part */ + /* Copy selector part. */ + while (*name && *name != ']') *p++ = *name++; *p++ = '\0'; - puts_filtered_tabular(asel, maxlen + 1, 0); /* print in columns */ + /* Print in columns. */ + puts_filtered_tabular(asel, maxlen + 1, 0); } begin_line(); } else - printf_filtered ("No selectors matching \"%s\"\n", regexp ? regexp : "*"); + printf_filtered (_("No selectors matching \"%s\"\n"), regexp ? regexp : "*"); } /* - * Function: compare_classes (void *, void *) + * Function: compare_classes (const void *, const void *) * - * Comparison function for use with qsort. Arguments are symbols or msymbols - * Compares class part of objc method name alphabetically. + * Comparison function for use with qsort. Arguments are symbols or + * msymbols Compares class part of objc method name alphabetically. */ static int -compare_classes (a, b) - void *a; - void *b; +compare_classes (const void *a, const void *b) { char *aname, *bname; - if ((aname = SYMBOL_SOURCE_NAME (*(struct symbol **) a)) == NULL || - (bname = SYMBOL_SOURCE_NAME (*(struct symbol **) b)) == NULL) - error ("internal: compare_classes(1)"); + aname = SYMBOL_PRINT_NAME (*(struct symbol **) a); + bname = SYMBOL_PRINT_NAME (*(struct symbol **) b); + if (aname == NULL || bname == NULL) + error (_("internal: compare_classes(1)")); return specialcmp (aname+1, bname+1); } @@ -953,9 +975,9 @@ compare_classes (a, b) * * Implements the "info classes" command for objective c classes. * Lists all objective c classes that match the optional regexp. - * Works by grepping thru the list of objective c methods. - * List will be sorted and uniqued (since one class may have many methods). - * BUGS: will not list a class that has no methods. + * Works by grepping thru the list of objective c methods. List will + * be sorted and uniqued (since one class may have many methods). + * BUGS: will not list a class that has no methods. */ static void @@ -973,33 +995,36 @@ classes_info (char *regexp, int from_tty) struct symbol **sym_arr; if (regexp == NULL) - strcpy(myregexp, ".* "); /* null input: match all objc classes */ + strcpy(myregexp, ".* "); /* Null input: match all objc classes. */ else { strcpy(myregexp, regexp); if (myregexp[strlen(myregexp) - 1] == '$') - /* in the method name, the end of the class name is marked by ' ' */ + /* In the method name, the end of the class name is marked by ' '. */ myregexp[strlen(myregexp) - 1] = ' '; else strcat(myregexp, ".* "); } if (regexp != NULL) - if (0 != (val = re_comp (myregexp))) - error ("Invalid regexp (%s): %s", val, regexp); + { + val = re_comp (myregexp); + if (val != 0) + error (_("Invalid regexp (%s): %s"), val, regexp); + } - /* first time thru is JUST to get max length and count */ + /* First time thru is JUST to get max length and count. */ ALL_MSYMBOLS (objfile, msymbol) { QUIT; - if ((name = SYMBOL_DEMANGLED_NAME (msymbol)) == NULL) - name = SYMBOL_NAME (msymbol); + name = SYMBOL_NATURAL_NAME (msymbol); if (name && (name[0] == '-' || name[0] == '+') && - name[1] == '[') /* got a method name */ + name[1] == '[') /* Got a method name. */ if (regexp == NULL || re_exec(name+2) != 0) { - char *mystart = name + 2; /* compute length of classname part */ + /* Compute length of classname part. */ + char *mystart = name + 2; char *myend = (char *) strchr(mystart, ' '); if (myend && (myend - mystart > maxlen)) @@ -1009,45 +1034,46 @@ classes_info (char *regexp, int from_tty) } if (matches) { - printf_filtered ("Classes matching \"%s\":\n\n", + printf_filtered (_("Classes matching \"%s\":\n\n"), regexp ? regexp : "*"); sym_arr = alloca (matches * sizeof (struct symbol *)); matches = 0; ALL_MSYMBOLS (objfile, msymbol) { QUIT; - if ((name = SYMBOL_DEMANGLED_NAME (msymbol)) == NULL) - name = SYMBOL_NAME (msymbol); + name = SYMBOL_NATURAL_NAME (msymbol); if (name && (name[0] == '-' || name[0] == '+') && - name[1] == '[') /* got a method name */ + 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 *), compare_classes); - aclass[0] = 0; /* to prevent compare on first iteration */ - for (ix = 0; ix < matches; ix++) /* now do the output */ + /* Prevent compare on first iteration. */ + aclass[0] = 0; + for (ix = 0; ix < matches; ix++) /* Now do the output. */ { char *p = aclass; QUIT; - if ((name = SYMBOL_DEMANGLED_NAME (sym_arr[ix])) == NULL) - name = SYMBOL_NAME (sym_arr[ix]); + name = SYMBOL_NATURAL_NAME (sym_arr[ix]); name += 2; if (p[0] && specialcmp(name, p) == 0) - continue; /* seen this one already (not unique) */ + continue; /* Seen this one already (not unique). */ - while (*name && *name != ' ') /* copy class part of method name */ + /* Copy class part of method name. */ + while (*name && *name != ' ') *p++ = *name++; *p++ = '\0'; - puts_filtered_tabular(aclass, maxlen + 1, 0); /* print in columns */ + /* Print in columns. */ + puts_filtered_tabular(aclass, maxlen + 1, 0); } begin_line(); } else - printf_filtered ("No classes matching \"%s\"\n", regexp ? regexp : "*"); + printf_filtered (_("No classes matching \"%s\"\n"), regexp ? regexp : "*"); } /* @@ -1057,27 +1083,27 @@ classes_info (char *regexp, int from_tty) * a pointer to an array of symbol pointers * possibly a pointer to a symbol found by the caller. * - * Output: number of methods that implement that selector. - * Side effects: The array of symbol pointers is filled with matching syms. + * Output: number of methods that implement that selector. Side + * effects: The array of symbol pointers is filled with matching syms. * - * By analogy with function "find_methods" (symtab.c), builds a list of - * symbols matching the ambiguous input, so that "decode_line_2" (symtab.c) - * can list them and ask the user to choose one or more. In this case the - * matches are objective c methods ("implementations") matching an objective - * c selector. + * By analogy with function "find_methods" (symtab.c), builds a list + * of symbols matching the ambiguous input, so that "decode_line_2" + * (symtab.c) can list them and ask the user to choose one or more. + * In this case the matches are objective c methods + * ("implementations") matching an objective c selector. * - * Note that it is possible for a normal (c-style) function to have the - * same name as an objective c selector. To prevent the selector from - * eclipsing the function, we allow the caller (decode_line_1) to search - * for such a function first, and if it finds one, pass it in to us. We - * will then integrate it into the list. We also search for one here, - * among the minsyms. + * Note that it is possible for a normal (c-style) function to have + * the same name as an objective c selector. To prevent the selector + * from eclipsing the function, we allow the caller (decode_line_1) to + * search for such a function first, and if it finds one, pass it in + * to us. We will then integrate it into the list. We also search + * for one here, among the minsyms. * - * NOTE: if NUM_DEBUGGABLE is non-zero, the sym_arr will be - * divided into two parts: debuggable (struct symbol) syms, - * and non_debuggable (struct minimal_symbol) syms. - * The debuggable ones will come first, before NUM_DEBUGGABLE - * (which will thus be the index of the first non-debuggable one). + * NOTE: if NUM_DEBUGGABLE is non-zero, the sym_arr will be divided + * into two parts: debuggable (struct symbol) syms, and + * non_debuggable (struct minimal_symbol) syms. The debuggable + * ones will come first, before NUM_DEBUGGABLE (which will thus + * be the index of the first non-debuggable one). */ /* @@ -1086,10 +1112,10 @@ classes_info (char *regexp, int from_tty) * Input: a string representing a selector * Output: number of methods that implement that selector. * - * By analogy with function "total_number_of_methods", this allows + * By analogy with function "total_number_of_methods", this allows * decode_line_1 (symtab.c) to detect if there are objective c methods - * matching the input, and to allocate an array of pointers to them - * which can be manipulated by "decode_line_2" (also in symtab.c) + * matching the input, and to allocate an array of pointers to them + * which can be manipulated by "decode_line_2" (also in symtab.c). */ char * @@ -1101,7 +1127,7 @@ parse_selector (char *method, char **selector) char *nselector = NULL; - CHECK (selector != NULL); + gdb_assert (selector != NULL); s1 = method; @@ -1148,8 +1174,8 @@ parse_selector (char *method, char **selector) } char * -parse_method (char *method, char *type, char **class, char **category, - char **selector) +parse_method (char *method, char *type, char **class, + char **category, char **selector) { char *s1 = NULL; char *s2 = NULL; @@ -1160,10 +1186,10 @@ parse_method (char *method, char *type, char **class, char **category, char *ncategory = NULL; char *nselector = NULL; - CHECK (type != NULL); - CHECK (class != NULL); - CHECK (category != NULL); - CHECK (selector != NULL); + gdb_assert (type != NULL); + gdb_assert (class != NULL); + gdb_assert (category != NULL); + gdb_assert (selector != NULL); s1 = method; @@ -1206,7 +1232,7 @@ parse_method (char *method, char *type, char **class, char **category, *s2++ = '\0'; } - /* truncate the class name now that we're not using the open paren */ + /* Truncate the class name now that we're not using the open paren. */ *s1++ = '\0'; nselector = s2; @@ -1249,11 +1275,11 @@ parse_method (char *method, char *type, char **class, char **category, return s2; } -void -find_methods (struct symtab *symtab, - char type, const char *class, const char *category, - const char *selector, - struct symbol **syms, unsigned int *nsym, unsigned int *ndebug) +static void +find_methods (struct symtab *symtab, char type, + const char *class, const char *category, + const char *selector, struct symbol **syms, + unsigned int *nsym, unsigned int *ndebug) { struct objfile *objfile = NULL; struct minimal_symbol *msymbol = NULL; @@ -1273,8 +1299,8 @@ find_methods (struct symtab *symtab, static char *tmp = NULL; static unsigned int tmplen = 0; - CHECK (nsym != NULL); - CHECK (ndebug != NULL); + gdb_assert (nsym != NULL); + gdb_assert (ndebug != NULL); if (symtab) block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), STATIC_BLOCK); @@ -1284,23 +1310,21 @@ find_methods (struct symtab *symtab, QUIT; if ((msymbol->type != mst_text) && (msymbol->type != mst_file_text)) - /* not a function or method */ + /* Not a function or method. */ continue; if (symtab) - if ((SYMBOL_VALUE_ADDRESS (msymbol) < block->startaddr) || - (SYMBOL_VALUE_ADDRESS (msymbol) >= block->endaddr)) - /* not in the specified symtab */ + if ((SYMBOL_VALUE_ADDRESS (msymbol) < BLOCK_START (block)) || + (SYMBOL_VALUE_ADDRESS (msymbol) >= BLOCK_END (block))) + /* Not in the specified symtab. */ continue; - symname = SYMBOL_DEMANGLED_NAME (msymbol); - if (symname == NULL) - symname = SYMBOL_NAME (msymbol); + symname = SYMBOL_NATURAL_NAME (msymbol); if (symname == NULL) continue; if ((symname[0] != '-' && symname[0] != '+') || (symname[1] != '[')) - /* not a method name */ + /* Not a method name. */ continue; while ((strlen (symname) + 1) >= tmplen) @@ -1316,26 +1340,27 @@ find_methods (struct symtab *symtab, if ((type != '\0') && (ntype != type)) continue; - if ((class != NULL) && ((nclass == NULL) || (strcmp (class, nclass) != 0))) + if ((class != NULL) + && ((nclass == NULL) || (strcmp (class, nclass) != 0))) continue; - if ((category != NULL) && ((ncategory == NULL) || (strcmp (category, ncategory) != 0))) + if ((category != NULL) && + ((ncategory == NULL) || (strcmp (category, ncategory) != 0))) continue; - if ((selector != NULL) && ((nselector == NULL) || (strcmp (selector, nselector) != 0))) + if ((selector != NULL) && + ((nselector == NULL) || (strcmp (selector, nselector) != 0))) continue; sym = find_pc_function (SYMBOL_VALUE_ADDRESS (msymbol)); if (sym != NULL) { - const char *newsymname = SYMBOL_DEMANGLED_NAME (sym); + const char *newsymname = SYMBOL_NATURAL_NAME (sym); - if (newsymname == NULL) - newsymname = SYMBOL_NAME (sym); if (strcmp (symname, newsymname) == 0) { - /* found a high-level method sym: swap it into the - lower part of sym_arr (below num_debuggable) */ + /* Found a high-level method sym: swap it into the + lower part of sym_arr (below num_debuggable). */ if (syms != NULL) { syms[csym] = syms[cdebug]; @@ -1346,7 +1371,8 @@ find_methods (struct symtab *symtab, } else { - warning ("debugging symbol \"%s\" does not match minimal symbol (\"%s\"); ignoring", + warning ( +"debugging symbol \"%s\" does not match minimal symbol (\"%s\"); ignoring", newsymname, symname); if (syms != NULL) syms[csym] = (struct symbol *) msymbol; @@ -1355,7 +1381,7 @@ find_methods (struct symtab *symtab, } else { - /* found a non-debuggable method symbol */ + /* Found a non-debuggable method symbol. */ if (syms != NULL) syms[csym] = (struct symbol *) msymbol; csym++; @@ -1369,8 +1395,8 @@ find_methods (struct symtab *symtab, } char *find_imps (struct symtab *symtab, struct block *block, - char *method, struct symbol **syms, unsigned int *nsym, - unsigned int *ndebug) + char *method, struct symbol **syms, + unsigned int *nsym, unsigned int *ndebug) { char type = '\0'; char *class = NULL; @@ -1386,8 +1412,8 @@ char *find_imps (struct symtab *symtab, struct block *block, char *buf = NULL; char *tmp = NULL; - CHECK (nsym != NULL); - CHECK (ndebug != NULL); + gdb_assert (nsym != NULL); + gdb_assert (ndebug != NULL); if (nsym != NULL) *nsym = 0; @@ -1400,7 +1426,6 @@ char *find_imps (struct symtab *symtab, struct block *block, if (tmp == NULL) { - struct symtab *sym_symtab = NULL; struct symbol *sym = NULL; struct minimal_symbol *msym = NULL; @@ -1410,7 +1435,7 @@ char *find_imps (struct symtab *symtab, struct block *block, if (tmp == NULL) return NULL; - sym = lookup_symbol (selector, block, VAR_NAMESPACE, 0, &sym_symtab); + sym = lookup_symbol (selector, block, VAR_DOMAIN, 0, NULL); if (sym != NULL) { if (syms) @@ -1425,17 +1450,19 @@ char *find_imps (struct symtab *symtab, struct block *block, if (msym != NULL) { if (syms) - syms[csym] = msym; + syms[csym] = (struct symbol *)msym; csym++; } } if (syms != NULL) - find_methods (symtab, type, class, category, selector, syms + csym, &ncsym, &ncdebug); + find_methods (symtab, type, class, category, selector, + syms + csym, &ncsym, &ncdebug); else - find_methods (symtab, type, class, category, selector, NULL, &ncsym, &ncdebug); + find_methods (symtab, type, class, category, selector, + NULL, &ncsym, &ncdebug); - /* If we didn't find any methods, just return. */ + /* If we didn't find any methods, just return. */ if (ncsym == 0 && ncdebug == 0) return method; @@ -1443,22 +1470,25 @@ char *find_imps (struct symtab *symtab, struct block *block, * with debug symbols from the first batch. Repeat until either the * second section is out of debug symbols or the first section is * full of debug symbols. Either way we have all debug symbols - * packed to the beginning of the buffer. */ + * packed to the beginning of the buffer. + */ if (syms != NULL) { while ((cdebug < csym) && (ncdebug > 0)) { struct symbol *s = NULL; - - unsigned int i = cdebug; /* first non-debugging symbol */ - unsigned int j = csym + ncdebug -1; /* last of second batch of debug symbols */ + /* First non-debugging symbol. */ + unsigned int i = cdebug; + /* Last of second batch of debug symbols. */ + unsigned int j = csym + ncdebug - 1; s = syms[j]; syms[j] = syms[i]; syms[i] = s; - /* We've moved a symbol from the second debug section to the first one. */ + /* We've moved a symbol from the second debug section to the + first one. */ cdebug++; ncdebug--; } @@ -1477,81 +1507,91 @@ char *find_imps (struct symtab *symtab, struct block *block, if (csym > 1) { - /* sort debuggable symbols */ + /* Sort debuggable symbols. */ if (cdebug > 1) - qsort (syms, cdebug, sizeof (struct minimal_symbol *), compare_classes); + qsort (syms, cdebug, sizeof (struct minimal_symbol *), + compare_classes); - /* sort minimal_symbols */ + /* Sort minimal_symbols. */ if ((csym - cdebug) > 1) - qsort (&syms[cdebug], csym - cdebug, sizeof (struct minimal_symbol *), compare_classes); + qsort (&syms[cdebug], csym - cdebug, + sizeof (struct minimal_symbol *), compare_classes); } - syms[csym] = 0; /* terminate the sym_arr list */ + /* Terminate the sym_arr list. */ + syms[csym] = 0; return method + (tmp - buf); } -void +static void print_object_command (char *args, int from_tty) { struct value *object, *function, *description; - CORE_ADDR string_addr; + CORE_ADDR string_addr, object_addr; int i = 0; - char c = -1; + gdb_byte c = 0; if (!args || !*args) - error ("The 'print-object' command requires an argument (an Objective-C object)"); + error ( +"The 'print-object' command requires an argument (an Objective-C object)"); { struct expression *expr = parse_expression (args); - register struct cleanup *old_chain = make_cleanup (free_current_contents, &expr); + struct cleanup *old_chain = + make_cleanup (free_current_contents, &expr); int pc = 0; -#if 1 - object = expr->language_defn->evaluate_exp (builtin_type_void_data_ptr, - expr, &pc, EVAL_NORMAL); -#else - object = evaluate_subexp (builtin_type_void_data_ptr, expr, &pc, EVAL_NORMAL); -#endif + object = expr->language_defn->la_exp_desc->evaluate_exp + (builtin_type_void_data_ptr, expr, &pc, EVAL_NORMAL); do_cleanups (old_chain); } - if (!(function = find_function_in_inferior ("_NSPrintForDebugger"))) - error ("Unable to locate _NSPrintForDebugger in child process"); + /* Validate the address for sanity. */ + object_addr = value_as_long (object); + read_memory (object_addr, &c, 1); + + function = find_function_in_inferior ("_NSPrintForDebugger"); + if (function == NULL) + error (_("Unable to locate _NSPrintForDebugger in child process")); description = call_function_by_hand (function, 1, &object); - if ((string_addr = value_as_long (description)) == 0) - error ("object returns null description"); + string_addr = value_as_long (description); + if (string_addr == 0) + error (_("object returns null description")); read_memory (string_addr + i++, &c, 1); - if (c != '\0') + if (c != 0) do - { /* read and print characters up to EOS */ + { /* Read and print characters up to EOS. */ QUIT; printf_filtered ("%c", c); read_memory (string_addr + i++, &c, 1); } while (c != 0); else - printf_filtered(""); + printf_filtered(_("")); printf_filtered ("\n"); } -/* The data structure 'methcalls' is used to detect method calls - * (thru ObjC runtime lib functions objc_msgSend, objc_msgSendSuper, etc.), - * and ultimately find the method being called. +/* The data structure 'methcalls' is used to detect method calls (thru + * ObjC runtime lib functions objc_msgSend, objc_msgSendSuper, etc.), + * and ultimately find the method being called. */ struct objc_methcall { char *name; - CORE_ADDR (*stop_at) (CORE_ADDR); /* should return instance method to be called */ - CORE_ADDR begin; /* start of pc range corresponding to method invocation */ - CORE_ADDR end; /* end of pc range corresponding to method invocation */ + /* Return instance method to be called. */ + int (*stop_at) (CORE_ADDR, CORE_ADDR *); + /* Start of pc range corresponding to method invocation. */ + CORE_ADDR begin; + /* End of pc range corresponding to method invocation. */ + CORE_ADDR end; }; -static int resolve_msgsend PARAMS ((CORE_ADDR pc, CORE_ADDR *new_pc)); -static int resolve_msgsend_stret PARAMS ((CORE_ADDR pc, CORE_ADDR *new_pc)); -static int resolve_msgsend_super PARAMS ((CORE_ADDR pc, CORE_ADDR *new_pc)); -static int resolve_msgsend_super_stret PARAMS ((CORE_ADDR pc, CORE_ADDR *new_pc)); +static int resolve_msgsend (CORE_ADDR pc, CORE_ADDR *new_pc); +static int resolve_msgsend_stret (CORE_ADDR pc, CORE_ADDR *new_pc); +static int resolve_msgsend_super (CORE_ADDR pc, CORE_ADDR *new_pc); +static int resolve_msgsend_super_stret (CORE_ADDR pc, CORE_ADDR *new_pc); static struct objc_methcall methcalls[] = { { "_objc_msgSend", resolve_msgsend, 0, 0}, @@ -1564,14 +1604,14 @@ static struct objc_methcall methcalls[] = { #define nmethcalls (sizeof (methcalls) / sizeof (methcalls[0])) -/* The following function, "find_objc_msgsend", fills in the data structure - * "objc_msgs" by finding the addresses of each of the (currently four) - * functions that it holds (of which objc_msgSend is the first). This - * must be called each time symbols are loaded, in case the functions - * have moved for some reason. +/* The following function, "find_objc_msgsend", fills in the data + * structure "objc_msgs" by finding the addresses of each of the + * (currently four) functions that it holds (of which objc_msgSend is + * the first). This must be called each time symbols are loaded, in + * case the functions have moved for some reason. */ -void +static void find_objc_msgsend (void) { unsigned int i; @@ -1579,7 +1619,7 @@ find_objc_msgsend (void) struct minimal_symbol *func; - /* try both with and without underscore */ + /* 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); @@ -1599,41 +1639,41 @@ find_objc_msgsend (void) /* find_objc_msgcall (replaces pc_off_limits) * - * ALL that this function now does is to determine whether the input - * address ("pc") is the address of one of the Objective C message + * ALL that this function now does is to determine whether the input + * address ("pc") is the address of one of the Objective-C message * dispatch functions (mainly objc_msgSend or objc_msgSendSuper), and * if so, it returns the address of the method that will be called. * * The old function "pc_off_limits" used to do a lot of other things - * in addition, such as detecting shared library jump stubs and + * in addition, such as detecting shared library jump stubs and * returning the address of the shlib function that would be called. - * That functionality has been moved into the SKIP_TRAMPOLINE_CODE - * and IN_SOLIB_TRAMPOLINE macros, which are resolved in the target- - * dependent modules. + * That functionality has been moved into the SKIP_TRAMPOLINE_CODE and + * IN_SOLIB_TRAMPOLINE macros, which are resolved in the target- + * dependent modules. */ struct objc_submethod_helper_data { - CORE_ADDR (*f) (CORE_ADDR, CORE_ADDR *); + int (*f) (CORE_ADDR, CORE_ADDR *); CORE_ADDR pc; CORE_ADDR *new_pc; }; -int -find_objc_msgcall_submethod_helper (PTR arg) +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) { + struct objc_submethod_helper_data *s = + (struct objc_submethod_helper_data *) arg; + + if (s->f (s->pc, s->new_pc) == 0) return 1; - } else { + else return 0; - } } -int -find_objc_msgcall_submethod (f, pc, new_pc) - CORE_ADDR (*f) (CORE_ADDR, CORE_ADDR *); - CORE_ADDR pc; - CORE_ADDR *new_pc; +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; @@ -1642,13 +1682,12 @@ find_objc_msgcall_submethod (f, pc, new_pc) s.new_pc = new_pc; if (catch_errors (find_objc_msgcall_submethod_helper, - (PTR) &s, - "Unable to determine target of Objective-C method call (ignoring):\n", - RETURN_MASK_ALL) == 0) { + (void *) &s, + "Unable to determine target of Objective-C method call (ignoring):\n", + RETURN_MASK_ALL) == 0) return 1; - } else { + else return 0; - } } int @@ -1657,79 +1696,45 @@ find_objc_msgcall (CORE_ADDR pc, CORE_ADDR *new_pc) unsigned int i; find_objc_msgsend (); - if (new_pc != NULL) { *new_pc = 0; } + if (new_pc != NULL) + { + *new_pc = 0; + } - for (i = 0; i < nmethcalls; i++) { - if ((pc >= methcalls[i].begin) && (pc < methcalls[i].end)) { - if (methcalls[i].stop_at != NULL) { - return find_objc_msgcall_submethod (methcalls[i].stop_at, pc, new_pc); - } else { - return 0; + for (i = 0; i < nmethcalls; i++) + if ((pc >= methcalls[i].begin) && (pc < methcalls[i].end)) + { + if (methcalls[i].stop_at != NULL) + return find_objc_msgcall_submethod (methcalls[i].stop_at, + pc, new_pc); + else + return 0; } - } - } + return 0; } +extern initialize_file_ftype _initialize_objc_language; /* -Wmissing-prototypes */ + void _initialize_objc_language (void) { add_language (&objc_language_defn); - add_info ("selectors", selectors_info, /* INFO SELECTORS command */ - "All Objective C selectors, or those matching REGEXP."); - add_info ("classes", classes_info, /* INFO CLASSES command */ - "All Objective C classes, or those matching REGEXP."); + add_info ("selectors", selectors_info, /* INFO SELECTORS command. */ + _("All Objective-C selectors, or those matching REGEXP.")); + add_info ("classes", classes_info, /* 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.\n"); + _("Ask an Objective-C object to print itself.")); add_com_alias ("po", "print-object", class_vars, 1); } -#if defined (__powerpc__) || defined (__ppc__) -static unsigned long FETCH_ARGUMENT (int i) -{ - return read_register (3 + i); -} -#elif defined (__i386__) -static unsigned long FETCH_ARGUMENT (int i) -{ - CORE_ADDR stack = read_register (SP_REGNUM); - return read_memory_unsigned_integer (stack + (4 * (i + 1)), 4); -} -#elif defined (__sparc__) -static unsigned long FETCH_ARGUMENT (int i) -{ - return read_register (O0_REGNUM + i); -} -#elif defined (__hppa__) || defined (__hppa) -static unsigned long FETCH_ARGUMENT (int i) -{ - return read_register (R0_REGNUM + 26 - i); -} -#else -#error unknown architecture -#endif - -#if defined (__hppa__) || defined (__hppa) -static CORE_ADDR CONVERT_FUNCPTR (CORE_ADDR pc) -{ - if (pc & 0x2) { - pc = (CORE_ADDR) read_memory_integer (pc & ~0x3, 4); - } - return pc; -} -#else -static CORE_ADDR CONVERT_FUNCPTR (CORE_ADDR pc) -{ - return pc; -} -#endif - static void read_objc_method (CORE_ADDR addr, struct objc_method *method) { - method->name = read_memory_unsigned_integer (addr, 4); + method->name = read_memory_unsigned_integer (addr + 0, 4); method->types = read_memory_unsigned_integer (addr + 4, 4); - method->imp = read_memory_unsigned_integer (addr + 8, 4); + method->imp = read_memory_unsigned_integer (addr + 8, 4); } static @@ -1742,7 +1747,7 @@ static void read_objc_methlist_method (CORE_ADDR addr, unsigned long num, struct objc_method *method) { - CHECK_FATAL (num < read_objc_methlist_nmethods (addr)); + gdb_assert (num < read_objc_methlist_nmethods (addr)); read_objc_method (addr + 8 + (12 * num), method); } @@ -1774,62 +1779,73 @@ read_objc_class (CORE_ADDR addr, struct objc_class *class) class->protocols = read_memory_unsigned_integer (addr + 36, 4); } -CORE_ADDR +static CORE_ADDR find_implementation_from_class (CORE_ADDR class, CORE_ADDR sel) { CORE_ADDR subclass = class; - while (subclass != 0) { + while (subclass != 0) + { - struct objc_class class_str; - unsigned mlistnum = 0; + struct objc_class class_str; + unsigned mlistnum = 0; - read_objc_class (subclass, &class_str); + read_objc_class (subclass, &class_str); - for (;;) { - CORE_ADDR mlist; - unsigned long nmethods; - unsigned long i; + for (;;) + { + CORE_ADDR mlist; + unsigned long nmethods; + unsigned long i; - mlist = read_memory_unsigned_integer (class_str.methods + (4 * mlistnum), 4); - if (mlist == 0) { break; } + mlist = read_memory_unsigned_integer (class_str.methods + + (4 * mlistnum), 4); + if (mlist == 0) + break; - nmethods = read_objc_methlist_nmethods (mlist); + nmethods = read_objc_methlist_nmethods (mlist); - for (i = 0; i < nmethods; i++) { - struct objc_method meth_str; - read_objc_methlist_method (mlist, i, &meth_str); + for (i = 0; i < nmethods; i++) + { + struct objc_method meth_str; + read_objc_methlist_method (mlist, i, &meth_str); #if 0 - fprintf (stderr, "checking method 0x%lx against selector 0x%lx\n", meth_str.name, sel); + fprintf (stderr, + "checking method 0x%lx against selector 0x%lx\n", + meth_str.name, sel); #endif - if (meth_str.name == sel) { - return CONVERT_FUNCPTR (meth_str.imp); + if (meth_str.name == sel) + /* FIXME: hppa arch was doing a pointer dereference + here. There needs to be a better way to do that. */ + return meth_str.imp; + } + mlistnum++; } - } - - mlistnum++; + subclass = class_str.super_class; } - - subclass = class_str.super_class; - } return 0; } -CORE_ADDR +static CORE_ADDR find_implementation (CORE_ADDR object, CORE_ADDR sel) { struct objc_object ostr; - if (object == 0) { return 0; } + if (object == 0) + return 0; read_objc_object (object, &ostr); - if (ostr.isa == 0) { return 0; } + if (ostr.isa == 0) + return 0; return find_implementation_from_class (ostr.isa, sel); } +#define OBJC_FETCH_POINTER_ARGUMENT(argi) \ + FETCH_POINTER_ARGUMENT (get_current_frame (), argi, builtin_type_void_func_ptr) + static int resolve_msgsend (CORE_ADDR pc, CORE_ADDR *new_pc) { @@ -1837,12 +1853,14 @@ resolve_msgsend (CORE_ADDR pc, CORE_ADDR *new_pc) CORE_ADDR sel; CORE_ADDR res; - object = FETCH_ARGUMENT (0); - sel = FETCH_ARGUMENT (1); + object = OBJC_FETCH_POINTER_ARGUMENT (0); + sel = OBJC_FETCH_POINTER_ARGUMENT (1); res = find_implementation (object, sel); - if (new_pc != 0) { *new_pc = res; } - if (res == 0) { return 1; } + if (new_pc != 0) + *new_pc = res; + if (res == 0) + return 1; return 0; } @@ -1853,12 +1871,14 @@ resolve_msgsend_stret (CORE_ADDR pc, CORE_ADDR *new_pc) CORE_ADDR sel; CORE_ADDR res; - object = FETCH_ARGUMENT (1); - sel = FETCH_ARGUMENT (2); + object = OBJC_FETCH_POINTER_ARGUMENT (1); + sel = OBJC_FETCH_POINTER_ARGUMENT (2); res = find_implementation (object, sel); - if (new_pc != 0) { *new_pc = res; } - if (res == 0) { return 1; } + if (new_pc != 0) + *new_pc = res; + if (res == 0) + return 1; return 0; } @@ -1871,15 +1891,18 @@ resolve_msgsend_super (CORE_ADDR pc, CORE_ADDR *new_pc) CORE_ADDR sel; CORE_ADDR res; - super = FETCH_ARGUMENT (0); - sel = FETCH_ARGUMENT (1); + super = OBJC_FETCH_POINTER_ARGUMENT (0); + sel = OBJC_FETCH_POINTER_ARGUMENT (1); read_objc_super (super, &sstr); - if (sstr.class == 0) { return 0; } + if (sstr.class == 0) + return 0; res = find_implementation_from_class (sstr.class, sel); - if (new_pc != 0) { *new_pc = res; } - if (res == 0) { return 1; } + if (new_pc != 0) + *new_pc = res; + if (res == 0) + return 1; return 0; } @@ -1892,14 +1915,17 @@ resolve_msgsend_super_stret (CORE_ADDR pc, CORE_ADDR *new_pc) CORE_ADDR sel; CORE_ADDR res; - super = FETCH_ARGUMENT (1); - sel = FETCH_ARGUMENT (2); + super = OBJC_FETCH_POINTER_ARGUMENT (1); + sel = OBJC_FETCH_POINTER_ARGUMENT (2); read_objc_super (super, &sstr); - if (sstr.class == 0) { return 0; } + if (sstr.class == 0) + return 0; res = find_implementation_from_class (sstr.class, sel); - if (new_pc != 0) { *new_pc = res; } - if (res == 0) { return 1; } + if (new_pc != 0) + *new_pc = res; + if (res == 0) + return 1; return 0; }