diff options
Diffstat (limited to 'gdb/objc-lang.c')
| -rw-r--r-- | gdb/objc-lang.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 787e8d647ea..00c362c5c9c 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -37,7 +37,7 @@ #include "gdbcore.h" #include "gdbcmd.h" #include "frame.h" -#include "gdb_regex.h" +#include "gdbsupport/gdb_regex.h" #include "regcache.h" #include "block.h" #include "infcall.h" @@ -96,7 +96,7 @@ lookup_struct_typedef (const char *name, const struct block *block, int noerr) else error (_("No struct type named %s."), name); } - if (SYMBOL_TYPE (sym)->code () != TYPE_CODE_STRUCT) + if (sym->type ()->code () != TYPE_CODE_STRUCT) { if (noerr) return 0; @@ -210,7 +210,7 @@ value_nsstring (struct gdbarch *gdbarch, const char *ptr, int len) if (sym == NULL) type = builtin_type (gdbarch)->builtin_data_ptr; else - type = lookup_pointer_type(SYMBOL_TYPE (sym)); + type = lookup_pointer_type(sym->type ()); deprecated_set_value_type (nsstringValue, type); return nsstringValue; @@ -621,8 +621,8 @@ info_selectors_command (const char *regexp, int from_tty) } if (matches) { - printf_filtered (_("Selectors matching \"%s\":\n\n"), - regexp ? regexp : "*"); + gdb_printf (_("Selectors matching \"%s\":\n\n"), + regexp ? regexp : "*"); sym_arr = XALLOCAVEC (struct symbol *, matches); matches = 0; @@ -666,13 +666,13 @@ info_selectors_command (const char *regexp, int from_tty) *p++ = *name++; *p++ = '\0'; /* Print in columns. */ - puts_filtered_tabular(asel, maxlen + 1, 0); + puts_tabular(asel, maxlen + 1, 0); } begin_line(); } else - printf_filtered (_("No selectors matching \"%s\"\n"), - regexp ? regexp : "*"); + gdb_printf (_("No selectors matching \"%s\"\n"), + regexp ? regexp : "*"); } /* @@ -763,8 +763,8 @@ info_classes_command (const char *regexp, int from_tty) } if (matches) { - printf_filtered (_("Classes matching \"%s\":\n\n"), - regexp ? regexp : "*"); + gdb_printf (_("Classes matching \"%s\":\n\n"), + regexp ? regexp : "*"); sym_arr = XALLOCAVEC (struct symbol *, matches); matches = 0; for (objfile *objfile : current_program_space->objfiles ()) @@ -800,12 +800,12 @@ info_classes_command (const char *regexp, int from_tty) *p++ = *name++; *p++ = '\0'; /* Print in columns. */ - puts_filtered_tabular(aclass, maxlen + 1, 0); + puts_tabular(aclass, maxlen + 1, 0); } begin_line(); } else - printf_filtered (_("No classes matching \"%s\"\n"), regexp ? regexp : "*"); + gdb_printf (_("No classes matching \"%s\"\n"), regexp ? regexp : "*"); } static char * @@ -1181,12 +1181,12 @@ print_object_command (const char *args, int from_tty) do { /* Read and print characters up to EOS. */ QUIT; - printf_filtered ("%c", c); + gdb_printf ("%c", c); read_memory (string_addr + i++, &c, 1); } while (c != 0); else - printf_filtered(_("<object returns empty description>")); - printf_filtered ("\n"); + gdb_printf(_("<object returns empty description>")); + gdb_printf ("\n"); } /* The data structure 'methcalls' is used to detect method calls (thru @@ -1249,7 +1249,7 @@ find_objc_msgsend (void) continue; } - methcalls[i].begin = BMSYMBOL_VALUE_ADDRESS (func); + methcalls[i].begin = func.value_address (); methcalls[i].end = minimal_symbol_upper_bound (func); } } |