[PATCH v2 1/4] Use field_core_addr in more places

Tom Tromey
2019-07-02T15:36:07Z

This changes a few spots that use field_fmt to use field_core_addr
instead.

gdb/ChangeLog
2019-07-02 Tom Tromey <tromey@adacore.com>

* target.c (flash_erase_command): Use field_core_addr.
* symfile.c (generic_load): Use field_core_addr.
* sparc64-linux-tdep.c (sparc64_linux_handle_segmentation_fault):
Use field_core_addr.
* i386-linux-tdep.c (i386_linux_handle_segmentation_fault): Use
field_core_addr.
---
gdb/ChangeLog | 9 +++++++++
gdb/i386-linux-tdep.c | 6 +++---
gdb/sparc64-linux-tdep.c | 6 +++---
gdb/symfile.c | 2 +-
gdb/target.c | 2 +-
5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 74f429b49af..b5c3ef2b71e 100644
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -432,13 +432,13 @@ i386_linux_handle_segmentation_fault (struct gdbarch *gdbarch,
uiout->field_string ("sigcode-meaning", _("Lower bound violation"));

uiout->text (_(" while accessing address "));
- uiout->field_fmt ("bound-access", "%s", paddress (gdbarch, access));
+ uiout->field_core_addr ("bound-access", gdbarch, access);

uiout->text (_("\nBounds: [lower = "));
- uiout->field_fmt ("lower-bound", "%s", paddress (gdbarch, lower_bound));
+ uiout->field_core_addr ("lower-bound", gdbarch, lower_bound);

uiout->text (_(", upper = "));
- uiout->field_fmt ("upper-bound", "%s", paddress (gdbarch, upper_bound));
+ uiout->field_core_addr ("upper-bound", gdbarch, upper_bound);

uiout->text (_("]"));
}
diff --git a/gdb/sparc64-linux-tdep.c b/gdb/sparc64-linux-tdep.c
index 158db97ec61..563d21e4b4c 100644
--- a/gdb/sparc64-linux-tdep.c
+++ b/gdb/sparc64-linux-tdep.c
@@ -150,19 +150,19 @@ sparc64_linux_handle_segmentation_fault (struct gdbarch *gdbarch,
uiout->text ("\n");
uiout->field_string ("sigcode-meaning", _("ADI disabled"));
uiout->text (_(" while accessing address "));
- uiout->field_fmt ("bound-access", "%s", paddress (gdbarch, addr));
+ uiout->field_core_addr ("bound-access", gdbarch, addr);
break;
case SEGV_ADIDERR: /* disrupting mismatch */
uiout->text ("\n");
uiout->field_string ("sigcode-meaning", _("ADI deferred mismatch"));
uiout->text (_(" while accessing address "));
- uiout->field_fmt ("bound-access", "%s", paddress (gdbarch, addr));
+ uiout->field_core_addr ("bound-access", gdbarch, addr);
break;
case SEGV_ADIPERR: /* precise mismatch */
uiout->text ("\n");
uiout->field_string ("sigcode-meaning", _("ADI precise mismatch"));
uiout->text (_(" while accessing address "));
- uiout->field_fmt ("bound-access", "%s", paddress (gdbarch, addr));
+ uiout->field_core_addr ("bound-access", gdbarch, addr);
break;
default:
break;
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 59647bfe9d8..d1c7b0e0034 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -2083,7 +2083,7 @@ generic_load (const char *args, int from_tty)
CORE_ADDR entry = bfd_get_start_address (loadfile_bfd.get ());
entry = gdbarch_addr_bits_remove (target_gdbarch (), entry);
uiout->text ("Start address ");
- uiout->field_fmt ("address", "%s", paddress (target_gdbarch (), entry));
+ uiout->field_core_addr ("address", target_gdbarch (), entry);
uiout->text (", load size ");
uiout->field_fmt ("load-size", "%lu", total_progress.data_count);
uiout->text ("\n");
diff --git a/gdb/target.c b/gdb/target.c
index 1c04095fd63..febb3390339 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3793,7 +3793,7 @@ flash_erase_command (const char *cmd, int from_tty)
ui_out_emit_tuple tuple_emitter (current_uiout, "erased-regions");

current_uiout->message (_("Erasing flash memory region at address "));
- current_uiout->field_fmt ("address", "%s", paddress (gdbarch, m.lo));
+ current_uiout->field_core_addr ("address", gdbarch, m.lo);
current_uiout->message (", size = ");
current_uiout->field_fmt ("size", "%s", hex_string (m.hi - m.lo));
current_uiout->message ("\n");
--
2.20.1