From 0b1553bcdd4db0c7ddb09f01cd281917447d5769 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Fri, 5 Sep 2008 12:57:16 +0000 Subject: [PATCH] * gdbarch.sh (gdbarch_dump): Use core_addr_to_string_nz instead of paddr_nz. * gdbarch.c: Regenerate. * target.c (target_xfer_partial, debug_print_register): Use core_addr_to_string_nz instead of paddr_nz. --- gdb/ChangeLog | 9 +++++++++ gdb/gdbarch.c | 12 ++++++------ gdb/gdbarch.sh | 8 ++++---- gdb/target.c | 9 +++++---- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 56a34e4d669..9a12c36caf2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2008-09-05 Ulrich Weigand + + * gdbarch.sh (gdbarch_dump): Use core_addr_to_string_nz + instead of paddr_nz. + * gdbarch.c: Regenerate. + + * target.c (target_xfer_partial, debug_print_register): Use + core_addr_to_string_nz instead of paddr_nz. + 2008-09-05 Ulrich Weigand * rs6000-tdep.c (rs6000_gdbarch_init): Setup displaced stepping diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 1986e258050..1ec3a3378e2 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -743,14 +743,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: core_xfer_shared_libraries = <0x%lx>\n", (long) gdbarch->core_xfer_shared_libraries); fprintf_unfiltered (file, - "gdbarch_dump: decr_pc_after_break = 0x%s\n", - paddr_nz (gdbarch->decr_pc_after_break)); + "gdbarch_dump: decr_pc_after_break = %s\n", + core_addr_to_string_nz (gdbarch->decr_pc_after_break)); fprintf_unfiltered (file, "gdbarch_dump: deprecated_fp_regnum = %s\n", plongest (gdbarch->deprecated_fp_regnum)); fprintf_unfiltered (file, - "gdbarch_dump: deprecated_function_start_offset = 0x%s\n", - paddr_nz (gdbarch->deprecated_function_start_offset)); + "gdbarch_dump: deprecated_function_start_offset = %s\n", + core_addr_to_string_nz (gdbarch->deprecated_function_start_offset)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_displaced_step_copy_insn_p() = %d\n", gdbarch_displaced_step_copy_insn_p (gdbarch)); @@ -818,8 +818,8 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: frame_align = <0x%lx>\n", (long) gdbarch->frame_align); fprintf_unfiltered (file, - "gdbarch_dump: frame_args_skip = 0x%s\n", - paddr_nz (gdbarch->frame_args_skip)); + "gdbarch_dump: frame_args_skip = %s\n", + core_addr_to_string_nz (gdbarch->frame_args_skip)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_frame_num_args_p() = %d\n", gdbarch_frame_num_args_p (gdbarch)); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index a497d114c11..2856396d6d7 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -318,8 +318,8 @@ do # An optional expression that convers MEMBER to a value # suitable for formatting using %s. - # If PRINT is empty, paddr_nz (for CORE_ADDR) or plongest - # (anything else) is used. + # If PRINT is empty, core_addr_to_string_nz (for CORE_ADDR) + # or plongest (anything else) is used. garbage_at_eol ) : ;; @@ -1474,8 +1474,8 @@ do # It is a variable case "${print}:${returntype}" in :CORE_ADDR ) - fmt="0x%s" - print="paddr_nz (gdbarch->${function})" + fmt="%s" + print="core_addr_to_string_nz (gdbarch->${function})" ;; :* ) fmt="%s" diff --git a/gdb/target.c b/gdb/target.c index 7b5596a6906..a7ceec4cbd4 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1168,12 +1168,13 @@ target_xfer_partial (struct target_ops *ops, const unsigned char *myaddr = NULL; fprintf_unfiltered (gdb_stdlog, - "%s:target_xfer_partial (%d, %s, 0x%lx, 0x%lx, 0x%s, %s) = %s", + "%s:target_xfer_partial (%d, %s, 0x%lx, 0x%lx, %s, %s) = %s", ops->to_shortname, (int) object, (annex ? annex : "(null)"), (long) readbuf, (long) writebuf, - paddr_nz (offset), plongest (len), plongest (retval)); + core_addr_to_string_nz (offset), + plongest (len), plongest (retval)); if (readbuf) myaddr = readbuf; @@ -2565,8 +2566,8 @@ debug_print_register (const char * func, if (size <= sizeof (LONGEST)) { ULONGEST val = extract_unsigned_integer (buf, size); - fprintf_unfiltered (gdb_stdlog, " 0x%s %s", - paddr_nz (val), plongest (val)); + fprintf_unfiltered (gdb_stdlog, " %s %s", + core_addr_to_string_nz (val), plongest (val)); } } fprintf_unfiltered (gdb_stdlog, "\n"); -- 2.30.2