X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fobjc-lang.c;h=bcd487378bc248b9ecc49947ebfdebadffe8bb77;hb=9cbc6ef04e5d04231f2ac1c4b7fd9848d9a2b3b0;hp=dc839518b2499c7abaf79af79ef38f0a324f13c7;hpb=437666f82f14bcf68b112b9882c134bde8cb98cf;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index dc839518b2..bcd487378b 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 2002 Free Software Foundation, Inc. + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. Contributed by Apple Computer, Inc. Written by Michael Snyder. @@ -34,13 +34,17 @@ #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 @@ -72,47 +76,6 @@ 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))) - -static 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); -} - -static 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. */ @@ -120,9 +83,9 @@ gdb_check_fatal (const char *str, const char *file, 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, + sym = lookup_symbol (name, block, STRUCT_DOMAIN, 0, (struct symtab **) NULL); if (sym == NULL) @@ -160,7 +123,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; } @@ -170,7 +133,7 @@ lookup_objc_class (char *classname) 1, &classval)); } -int +CORE_ADDR lookup_child_selector (char *selname) { struct value * function, *selstring; @@ -187,7 +150,7 @@ 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; } @@ -207,8 +170,10 @@ value_nsstring (char *ptr, int len) if (!target_has_execution) 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)); @@ -245,7 +210,7 @@ value_nsstring (char *ptr, int len) /* Objective-C name demangling. */ char * -objc_demangle (const char *mangled) +objc_demangle (const char *mangled, int options) { char *demangled, *cp; @@ -266,9 +231,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 */ @@ -277,9 +243,10 @@ 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++ = ')'; @@ -307,7 +274,7 @@ objc_demangle (const char *mangled) 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. */ @@ -368,15 +335,12 @@ objc_printchar (int c, struct ui_file *stream) static void objc_printstr (struct ui_file *stream, char *string, - unsigned int length, int force_ellipses) + 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 @@ -485,7 +449,7 @@ objc_printstr (struct ui_file *stream, char *string, static struct type * objc_create_fundamental_type (struct objfile *objfile, int typeid) { - register struct type *type = NULL; + struct type *type = NULL; switch (typeid) { @@ -599,6 +563,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. */ @@ -634,7 +627,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[]) = @@ -666,9 +659,10 @@ const struct language_defn objc_language_defn = { range_check_off, type_check_off, case_sensitive_on, + &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, @@ -676,6 +670,12 @@ 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 */ + 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 */ {"", "", "", ""}, /* Binary format info */ {"0%lo", "0", "o", ""}, /* Octal format info */ {"%ld", "", "d", ""}, /* Decimal format info */ @@ -684,6 +684,7 @@ const struct language_defn objc_language_defn = { 1, /* C-style arrays */ 0, /* String lower bound */ &builtin_type_char, /* Type of string elements */ + default_word_break_characters, LANG_MAGIC }; @@ -706,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; @@ -739,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] = ':'; @@ -752,10 +753,10 @@ 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; @@ -764,9 +765,9 @@ end_msglist(void) if (!selid) error("Can't find selector \"%s\"", p); write_exp_elt_longcst (selid); - free(p); + xfree(p); write_exp_elt_longcst (val); /* Number of args */ - free(sel); + xfree(sel); return val; } @@ -778,7 +779,8 @@ end_msglist(void) * 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 != ']') { @@ -794,23 +796,25 @@ 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. */ static int -compare_selectors (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) + 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) + aname = strchr(aname, ' '); + bname = strchr(bname, ' '); + if (aname == NULL || bname == NULL) error ("internal: compare_selectors(2)"); return specialcmp (aname+1, bname+1); @@ -863,15 +867,17 @@ 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. */ 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. */ @@ -902,8 +908,7 @@ 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. */ @@ -927,8 +932,7 @@ selectors_info (char *regexp, int from_tty) 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). */ @@ -947,19 +951,20 @@ selectors_info (char *regexp, int from_tty) } /* - * 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. */ static int -compare_classes (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) + 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); @@ -1002,15 +1007,17 @@ classes_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. */ 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. */ @@ -1034,8 +1041,7 @@ classes_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. */ @@ -1052,8 +1058,7 @@ classes_info (char *regexp, int from_tty) 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). */ @@ -1122,7 +1127,7 @@ parse_selector (char *method, char **selector) char *nselector = NULL; - CHECK (selector != NULL); + gdb_assert (selector != NULL); s1 = method; @@ -1181,10 +1186,10 @@ parse_method (char *method, char *type, char **class, 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; @@ -1270,7 +1275,7 @@ parse_method (char *method, char *type, char **class, return s2; } -void +static void find_methods (struct symtab *symtab, char type, const char *class, const char *category, const char *selector, struct symbol **syms, @@ -1294,8 +1299,8 @@ find_methods (struct symtab *symtab, char type, 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); @@ -1309,14 +1314,12 @@ find_methods (struct symtab *symtab, char type, continue; if (symtab) - if ((SYMBOL_VALUE_ADDRESS (msymbol) < block->startaddr) || - (SYMBOL_VALUE_ADDRESS (msymbol) >= block->endaddr)) + 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; @@ -1352,10 +1355,8 @@ find_methods (struct symtab *symtab, char type, 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 @@ -1411,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; @@ -1425,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; @@ -1435,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) @@ -1450,7 +1450,7 @@ char *find_imps (struct symtab *symtab, struct block *block, if (msym != NULL) { if (syms) - syms[csym] = msym; + syms[csym] = (struct symbol *)msym; csym++; } } @@ -1523,11 +1523,11 @@ char *find_imps (struct symtab *symtab, struct block *block, 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; @@ -1537,26 +1537,27 @@ print_object_command (char *args, int from_tty) { struct expression *expr = parse_expression (args); - register struct cleanup *old_chain = + 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"))) + /* 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) + string_addr = value_as_long (description); + if (string_addr == 0) error ("object returns null description"); read_memory (string_addr + i++, &c, 1); @@ -1580,7 +1581,7 @@ print_object_command (char *args, int from_tty) struct objc_methcall { char *name; /* Return instance method to be called. */ - CORE_ADDR (*stop_at) (CORE_ADDR); + 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. */ @@ -1610,7 +1611,7 @@ static struct objc_methcall methcalls[] = { * case the functions have moved for some reason. */ -void +static void find_objc_msgsend (void) { unsigned int i; @@ -1652,13 +1653,13 @@ find_objc_msgsend (void) */ 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; @@ -1669,8 +1670,8 @@ find_objc_msgcall_submethod_helper (PTR arg) return 0; } -int -find_objc_msgcall_submethod (CORE_ADDR (*f) (CORE_ADDR, CORE_ADDR *), +static int +find_objc_msgcall_submethod (int (*f) (CORE_ADDR, CORE_ADDR *), CORE_ADDR pc, CORE_ADDR *new_pc) { @@ -1681,7 +1682,7 @@ find_objc_msgcall_submethod (CORE_ADDR (*f) (CORE_ADDR, CORE_ADDR *), s.new_pc = new_pc; if (catch_errors (find_objc_msgcall_submethod_helper, - (PTR) &s, + (void *) &s, "Unable to determine target of Objective-C method call (ignoring):\n", RETURN_MASK_ALL) == 0) return 1; @@ -1695,7 +1696,10 @@ 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)) @@ -1710,6 +1714,8 @@ find_objc_msgcall (CORE_ADDR pc, CORE_ADDR *new_pc) return 0; } +extern initialize_file_ftype _initialize_objc_language; /* -Wmissing-prototypes */ + void _initialize_objc_language (void) { @@ -1719,50 +1725,10 @@ _initialize_objc_language (void) 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) { @@ -1781,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); } @@ -1813,7 +1779,7 @@ 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; @@ -1851,7 +1817,9 @@ find_implementation_from_class (CORE_ADDR class, CORE_ADDR sel) #endif if (meth_str.name == sel) - return CONVERT_FUNCPTR (meth_str.imp); + /* FIXME: hppa arch was doing a pointer dereference + here. There needs to be a better way to do that. */ + return meth_str.imp; } mlistnum++; } @@ -1861,7 +1829,7 @@ find_implementation_from_class (CORE_ADDR class, CORE_ADDR sel) return 0; } -CORE_ADDR +static CORE_ADDR find_implementation (CORE_ADDR object, CORE_ADDR sel) { struct objc_object ostr; @@ -1875,6 +1843,9 @@ find_implementation (CORE_ADDR object, CORE_ADDR sel) 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) { @@ -1882,8 +1853,8 @@ 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) @@ -1900,8 +1871,8 @@ 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) @@ -1920,8 +1891,8 @@ 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) @@ -1944,8 +1915,8 @@ 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)