diff options
| author | Pedro Alves <palves@redhat.com> | 2013-09-05 14:49:12 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2013-09-05 14:49:12 +0000 |
| commit | 50bbcd63620eb5818309f801780bf8b96cbfc515 (patch) | |
| tree | 1bf110dda906f2822c239c06f1a7d14c44326ee8 | |
| parent | ceb4a1a934d144f1eff9b6a1747c4928dc168767 (diff) | |
| download | gdb-50bbcd63620eb5818309f801780bf8b96cbfc515.tar.gz | |
dwarf2loc.c: minor cleanup. don't print integer with paddress.
A couple years ago, dwarf_expr_fetch used to return a CORE_ADDR. It
was made to return a ULONGEST since, and the 'dwarf_regnum' local
adjusted accordingly, but, we kept printing it with paddress.
gdbarch_dwarf2_reg_to_regnum takes the register number as 'int', so
there's really no point in using ULONGEST/pulongest either.
gdb/
2013-09-05 Pedro Alves <palves@redhat.com>
* dwarf2loc.c (dwarf2_evaluate_loc_desc_full): 'dwarf_regnum'
local is now int instead of ULONGEST. Print it with %d
instead of paddress.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/dwarf2loc.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8788b3bec58..92452a90ac2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-09-05 Pedro Alves <palves@redhat.com> + + * dwarf2loc.c (dwarf2_evaluate_loc_desc_full): 'dwarf_regnum' + local is now int instead of ULONGEST. Print it with %d + instead of paddress. + 2013-09-05 Tristan Gingold <gingold@adacore.com> * MAINTAINERS: Remove avr maintainership. diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index a1a384a201b..55d43f1d0c0 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -2283,7 +2283,8 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame, case DWARF_VALUE_REGISTER: { struct gdbarch *arch = get_frame_arch (frame); - ULONGEST dwarf_regnum = value_as_long (dwarf_expr_fetch (ctx, 0)); + int dwarf_regnum + = longest_to_int (value_as_long (dwarf_expr_fetch (ctx, 0))); int gdb_regnum = gdbarch_dwarf2_reg_to_regnum (arch, dwarf_regnum); if (byte_offset != 0) @@ -2292,8 +2293,8 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame, if (gdb_regnum != -1) retval = value_from_register (type, gdb_regnum, frame); else - error (_("Unable to access DWARF register number %s"), - paddress (arch, dwarf_regnum)); + error (_("Unable to access DWARF register number %d"), + dwarf_regnum); } break; |