OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* annotate.c (annotate_source, annotate_frame_begin): Replace

Browse Source 
deprecated_print_address_numeric with paddress.
	* cli/cli-cmds.c (list_command, edit_command): Likewise.
	* tui/tui-stack.c (tui_make_status_line): Likewise.

	* defs.h (deprecated_print_address_numeric): Remove.
	* printcmd.c (deprecated_print_address_numeric): Remove.
	* maint.c (maint_print_section_info): Fix comment.
This commit is contained in:
Markus Deuling 2008-05-23 04:31:40 +00:00
parent d44e847372
commit 50ee753532
7 changed files with 27 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2008-05-23 Markus Deuling <deuling@de.ibm.com>
* annotate.c (annotate_source, annotate_frame_begin): Replace
deprecated_print_address_numeric with paddress.
* cli/cli-cmds.c (list_command, edit_command): Likewise.
* tui/tui-stack.c (tui_make_status_line): Likewise.
* defs.h (deprecated_print_address_numeric): Remove.
* printcmd.c (deprecated_print_address_numeric): Remove.
* maint.c (maint_print_section_info): Fix comment.
2008-05-23 Markus Deuling <deuling@de.ibm.com>
* valprint.c (print_hex_chars, print_octal_chars, print_decimal_chars,

13
gdb/annotate.c
View File

@ -427,22 +427,15 @@ annotate_source (char *filename, int line, int character, int mid, CORE_ADDR pc)
else
printf_filtered (("\032\032"));
printf_filtered (("%s:%d:%d:%s:0x"), filename,
line, character,
mid ? "middle" : "beg");
deprecated_print_address_numeric (pc, 0, gdb_stdout);
printf_filtered (("\n"));
printf_filtered (("%s:%d:%d:%s:%s\n"), filename, line, character,
mid ? "middle" : "beg", paddress (pc));
}
void
annotate_frame_begin (int level, CORE_ADDR pc)
{
if (annotation_level > 1)
{
printf_filtered (("\n\032\032frame-begin %d 0x"), level);
deprecated_print_address_numeric (pc, 0, gdb_stdout);
printf_filtered (("\n"));
}
printf_filtered (("\n\032\032frame-begin %d %s\n"), level, paddress (pc));
}
void

32
gdb/cli/cli-cmds.c
View File

@ -668,18 +668,12 @@ edit_command (char *arg, int from_tty)
hex_string ((unsigned long) sal.pc));
sym = find_pc_function (sal.pc);
if (sym)
{
deprecated_print_address_numeric (sal.pc, 1, gdb_stdout);
printf_filtered (" is in ");
fputs_filtered (SYMBOL_PRINT_NAME (sym), gdb_stdout);
printf_filtered (" (%s:%d).\n", sal.symtab->filename, sal.line);
}
printf_filtered ("%s is in %s (%s:%d).\n", paddress (sal.pc),
SYMBOL_PRINT_NAME (sym), sal.symtab->filename,
sal.line);
else
{
deprecated_print_address_numeric (sal.pc, 1, gdb_stdout);
printf_filtered (" is at %s:%d.\n",
sal.symtab->filename, sal.line);
}
printf_filtered ("%s is at %s:%d.\n", paddress (sal.pc),
sal.symtab->filename, sal.line);
}
/* If what was given does not imply a symtab, it must be an undebuggable
@ -838,18 +832,12 @@ list_command (char *arg, int from_tty)
hex_string ((unsigned long) sal.pc));
sym = find_pc_function (sal.pc);
if (sym)
{
deprecated_print_address_numeric (sal.pc, 1, gdb_stdout);
printf_filtered (" is in ");
fputs_filtered (SYMBOL_PRINT_NAME (sym), gdb_stdout);
printf_filtered (" (%s:%d).\n", sal.symtab->filename, sal.line);
}
printf_filtered ("%s is in %s (%s:%d).\n",
paddress (sal.pc), SYMBOL_PRINT_NAME (sym),
sal.symtab->filename, sal.line);
else
{
deprecated_print_address_numeric (sal.pc, 1, gdb_stdout);
printf_filtered (" is at %s:%d.\n",
sal.symtab->filename, sal.line);
}
printf_filtered ("%s is at %s:%d.\n", paddress (sal.pc),
sal.symtab->filename, sal.line);
}
/* If line was not specified by just a line number,

4
gdb/defs.h
View File

@ -479,7 +479,7 @@ extern char *paddr_nz (CORE_ADDR addr);
extern char *paddr_u (CORE_ADDR addr);
extern char *paddr_d (LONGEST addr);
/* Like 0x%lx, replaces deprecated_print_address_numeric. */
/* Like 0x%lx. */
extern const char *paddress (CORE_ADDR addr);
extern char *phex (ULONGEST l, int sizeof_l);
@ -565,8 +565,6 @@ extern int build_address_symbolic (CORE_ADDR addr,
int *line,
int *unmapped);
extern void deprecated_print_address_numeric (CORE_ADDR, int, struct ui_file *);
extern void print_address (CORE_ADDR, struct ui_file *);
/* From source.c */

3
gdb/maint.c
View File

@ -306,8 +306,7 @@ maint_print_section_info (const char *name, flagword flags,
CORE_ADDR addr, CORE_ADDR endaddr,
unsigned long filepos)
{
/* FIXME-32x64: Need deprecated_print_address_numeric with field
width. */
/* FIXME-32x64: Need paddress with field width. */
printf_filtered (" 0x%s", paddr (addr));
printf_filtered ("->0x%s", paddr (endaddr));
printf_filtered (" at %s",

17
gdb/printcmd.c
View File

@ -676,23 +676,6 @@ build_address_symbolic (CORE_ADDR addr, /* IN */
return 0;
}
/* Print address ADDR on STREAM. USE_LOCAL means the same thing as for
print_longest. */
void
deprecated_print_address_numeric (CORE_ADDR addr, int use_local,
struct ui_file *stream)
{
if (use_local)
fputs_filtered (paddress (addr), stream);
else
{
int addr_bit = gdbarch_addr_bit (current_gdbarch);
if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
addr &= ((CORE_ADDR) 1 << addr_bit) - 1;
print_longest (stream, 'x', 0, (ULONGEST) addr);
}
}
/* Print address ADDR symbolically on STREAM.
First print it as a number. Then perhaps print

2
gdb/tui/tui-stack.c
View File

@ -102,7 +102,7 @@ tui_make_status_line (struct tui_locator_element *loc)
/* Translate PC address. */
pc_out = tui_sfileopen (128);
deprecated_print_address_numeric (loc->addr, 1, pc_out);
fputs_filtered (paddress (loc->addr), pc_out);
pc_buf = tui_file_get_strbuf (pc_out);
pc_width = strlen (pc_buf);