Unify gdb printf functions
Now that filtered and unfiltered output can be treated identically, we can unify the printf family of functions. This is done under the name "gdb_printf". Most of this patch was written by script.
This commit is contained in:
parent
a11ac3b3e8
commit
6cb06a8cda
249 changed files with 8449 additions and 8463 deletions
|
@ -188,23 +188,23 @@ dsbt_print_loadmap (struct int_elf32_dsbt_loadmap *map)
|
|||
int i;
|
||||
|
||||
if (map == NULL)
|
||||
printf_filtered ("(null)\n");
|
||||
gdb_printf ("(null)\n");
|
||||
else if (map->version != 0)
|
||||
printf_filtered (_("Unsupported map version: %d\n"), map->version);
|
||||
gdb_printf (_("Unsupported map version: %d\n"), map->version);
|
||||
else
|
||||
{
|
||||
printf_filtered ("version %d\n", map->version);
|
||||
gdb_printf ("version %d\n", map->version);
|
||||
|
||||
for (i = 0; i < map->nsegs; i++)
|
||||
printf_filtered ("%s:%s -> %s:%s\n",
|
||||
print_core_address (target_gdbarch (),
|
||||
map->segs[i].p_vaddr),
|
||||
print_core_address (target_gdbarch (),
|
||||
map->segs[i].p_vaddr
|
||||
+ map->segs[i].p_memsz),
|
||||
print_core_address (target_gdbarch (), map->segs[i].addr),
|
||||
print_core_address (target_gdbarch (), map->segs[i].addr
|
||||
+ map->segs[i].p_memsz));
|
||||
gdb_printf ("%s:%s -> %s:%s\n",
|
||||
print_core_address (target_gdbarch (),
|
||||
map->segs[i].p_vaddr),
|
||||
print_core_address (target_gdbarch (),
|
||||
map->segs[i].p_vaddr
|
||||
+ map->segs[i].p_memsz),
|
||||
print_core_address (target_gdbarch (), map->segs[i].addr),
|
||||
print_core_address (target_gdbarch (), map->segs[i].addr
|
||||
+ map->segs[i].p_memsz));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -461,9 +461,9 @@ lm_base (void)
|
|||
{
|
||||
addr = BMSYMBOL_VALUE_ADDRESS (got_sym);
|
||||
if (solib_dsbt_debug)
|
||||
fprintf_unfiltered (gdb_stdlog,
|
||||
"lm_base: get addr %x by _GLOBAL_OFFSET_TABLE_.\n",
|
||||
(unsigned int) addr);
|
||||
gdb_printf (gdb_stdlog,
|
||||
"lm_base: get addr %x by _GLOBAL_OFFSET_TABLE_.\n",
|
||||
(unsigned int) addr);
|
||||
}
|
||||
else if (gdb_bfd_scan_elf_dyntag (DT_PLTGOT,
|
||||
current_program_space->exec_bfd (),
|
||||
|
@ -475,32 +475,32 @@ lm_base (void)
|
|||
ldm = info->exec_loadmap;
|
||||
addr += displacement_from_map (ldm, addr);
|
||||
if (solib_dsbt_debug)
|
||||
fprintf_unfiltered (gdb_stdlog,
|
||||
"lm_base: get addr %x by DT_PLTGOT.\n",
|
||||
(unsigned int) addr);
|
||||
gdb_printf (gdb_stdlog,
|
||||
"lm_base: get addr %x by DT_PLTGOT.\n",
|
||||
(unsigned int) addr);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (solib_dsbt_debug)
|
||||
fprintf_unfiltered (gdb_stdlog,
|
||||
"lm_base: _GLOBAL_OFFSET_TABLE_ not found.\n");
|
||||
gdb_printf (gdb_stdlog,
|
||||
"lm_base: _GLOBAL_OFFSET_TABLE_ not found.\n");
|
||||
return 0;
|
||||
}
|
||||
addr += GOT_MODULE_OFFSET;
|
||||
|
||||
if (solib_dsbt_debug)
|
||||
fprintf_unfiltered (gdb_stdlog,
|
||||
"lm_base: _GLOBAL_OFFSET_TABLE_ + %d = %s\n",
|
||||
GOT_MODULE_OFFSET, hex_string_custom (addr, 8));
|
||||
gdb_printf (gdb_stdlog,
|
||||
"lm_base: _GLOBAL_OFFSET_TABLE_ + %d = %s\n",
|
||||
GOT_MODULE_OFFSET, hex_string_custom (addr, 8));
|
||||
|
||||
if (target_read_memory (addr, buf, sizeof buf) != 0)
|
||||
return 0;
|
||||
info->lm_base_cache = extract_unsigned_integer (buf, sizeof buf, byte_order);
|
||||
|
||||
if (solib_dsbt_debug)
|
||||
fprintf_unfiltered (gdb_stdlog,
|
||||
"lm_base: lm_base_cache = %s\n",
|
||||
hex_string_custom (info->lm_base_cache, 8));
|
||||
gdb_printf (gdb_stdlog,
|
||||
"lm_base: lm_base_cache = %s\n",
|
||||
hex_string_custom (info->lm_base_cache, 8));
|
||||
|
||||
return info->lm_base_cache;
|
||||
}
|
||||
|
@ -553,9 +553,9 @@ dsbt_current_sos (void)
|
|||
int ret;
|
||||
|
||||
if (solib_dsbt_debug)
|
||||
fprintf_unfiltered (gdb_stdlog,
|
||||
"current_sos: reading link_map entry at %s\n",
|
||||
hex_string_custom (lm_addr, 8));
|
||||
gdb_printf (gdb_stdlog,
|
||||
"current_sos: reading link_map entry at %s\n",
|
||||
hex_string_custom (lm_addr, 8));
|
||||
|
||||
ret = target_read_memory (lm_addr, (gdb_byte *) &lm_buf, sizeof (lm_buf));
|
||||
if (ret)
|
||||
|
@ -614,8 +614,8 @@ dsbt_current_sos (void)
|
|||
else
|
||||
{
|
||||
if (solib_dsbt_debug)
|
||||
fprintf_unfiltered (gdb_stdlog, "current_sos: name = %s\n",
|
||||
name_buf.get ());
|
||||
gdb_printf (gdb_stdlog, "current_sos: name = %s\n",
|
||||
name_buf.get ());
|
||||
|
||||
strncpy (sop->so_name, name_buf.get (), SO_NAME_MAX_PATH_SIZE - 1);
|
||||
sop->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
|
||||
|
@ -763,15 +763,15 @@ enable_break (void)
|
|||
if (addr != 0)
|
||||
{
|
||||
if (solib_dsbt_debug)
|
||||
fprintf_unfiltered (gdb_stdlog,
|
||||
"enable_break: _dl_debug_state (prior to relocation) = %s\n",
|
||||
hex_string_custom (addr, 8));
|
||||
gdb_printf (gdb_stdlog,
|
||||
"enable_break: _dl_debug_state (prior to relocation) = %s\n",
|
||||
hex_string_custom (addr, 8));
|
||||
addr += displacement_from_map (ldm, addr);
|
||||
|
||||
if (solib_dsbt_debug)
|
||||
fprintf_unfiltered (gdb_stdlog,
|
||||
"enable_break: _dl_debug_state (after relocation) = %s\n",
|
||||
hex_string_custom (addr, 8));
|
||||
gdb_printf (gdb_stdlog,
|
||||
"enable_break: _dl_debug_state (after relocation) = %s\n",
|
||||
hex_string_custom (addr, 8));
|
||||
|
||||
/* Now (finally!) create the solib breakpoint. */
|
||||
create_solib_event_breakpoint (target_gdbarch (), addr);
|
||||
|
@ -781,8 +781,8 @@ enable_break (void)
|
|||
else
|
||||
{
|
||||
if (solib_dsbt_debug)
|
||||
fprintf_unfiltered (gdb_stdlog,
|
||||
"enable_break: _dl_debug_state is not found\n");
|
||||
gdb_printf (gdb_stdlog,
|
||||
"enable_break: _dl_debug_state is not found\n");
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
|
@ -921,7 +921,7 @@ static void
|
|||
show_dsbt_debug (struct ui_file *file, int from_tty,
|
||||
struct cmd_list_element *c, const char *value)
|
||||
{
|
||||
fprintf_filtered (file, _("solib-dsbt debugging is %s.\n"), value);
|
||||
gdb_printf (file, _("solib-dsbt debugging is %s.\n"), value);
|
||||
}
|
||||
|
||||
struct target_so_ops dsbt_so_ops;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue