From ca9d61b90f4e1a24d90e5f8944b57a82728808e0 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Mon, 12 Nov 2012 21:59:07 +0000 Subject: [PATCH] rename frame_register_read into deprecated_frame_register_read. gdb/ChangeLog: * frame.h (deprecated_frame_register_read): Renames frame_register_read. * frame.c (deprecated_frame_register_read): Renames frame_register_read. Update all callers. * i386-tdep.c: Update all callers of frame_register_read. * infcmd.c: Likewise. * jit.c: Likewise. * mips-tdep.c: Likewise. * mt-tdep.c: Likewise. * sh64-tdep.c: Likewise. --- gdb/ChangeLog | 13 +++++++++++++ gdb/frame.c | 6 +++--- gdb/frame.h | 2 +- gdb/i386-tdep.c | 3 ++- gdb/infcmd.c | 2 +- gdb/jit.c | 4 ++-- gdb/mips-tdep.c | 6 +++--- gdb/mt-tdep.c | 8 ++++---- gdb/sh64-tdep.c | 4 ++-- 9 files changed, 31 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 510c0e1e85c..250a25599bb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2012-11-12 Joel Brobecker + + * frame.h (deprecated_frame_register_read): Renames + frame_register_read. + * frame.c (deprecated_frame_register_read): Renames + frame_register_read. Update all callers. + * i386-tdep.c: Update all callers of frame_register_read. + * infcmd.c: Likewise. + * jit.c: Likewise. + * mips-tdep.c: Likewise. + * mt-tdep.c: Likewise. + * sh64-tdep.c: Likewise. + 2012-11-12 Joel Brobecker * frame.h (frame_register_read): Remove FIXME comment. diff --git a/gdb/frame.c b/gdb/frame.c index 52498bad6cf..bf034a8708d 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -776,7 +776,7 @@ get_frame_func (struct frame_info *this_frame) static enum register_status do_frame_register_read (void *src, int regnum, gdb_byte *buf) { - if (!frame_register_read (src, regnum, buf)) + if (!deprecated_frame_register_read (src, regnum, buf)) return REG_UNAVAILABLE; else return REG_VALID; @@ -1097,7 +1097,7 @@ put_frame_register (struct frame_info *frame, int regnum, Returns 0 if the register value could not be found. */ int -frame_register_read (struct frame_info *frame, int regnum, +deprecated_frame_register_read (struct frame_info *frame, int regnum, gdb_byte *myaddr) { int optimized; @@ -1218,7 +1218,7 @@ put_frame_register_bytes (struct frame_info *frame, int regnum, { gdb_byte buf[MAX_REGISTER_SIZE]; - frame_register_read (frame, regnum, buf); + deprecated_frame_register_read (frame, regnum, buf); memcpy (buf + offset, myaddr, curr_len); put_frame_register (frame, regnum, buf); } diff --git a/gdb/frame.h b/gdb/frame.h index c0559d90dcb..1032904fb50 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -673,7 +673,7 @@ extern struct frame_info *block_innermost_frame (const struct block *); extern int deprecated_pc_in_call_dummy (struct gdbarch *gdbarch, CORE_ADDR pc); -extern int frame_register_read (struct frame_info *frame, int regnum, +extern int deprecated_frame_register_read (struct frame_info *frame, int regnum, gdb_byte *buf); /* From stack.c. */ diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index b6879b959fe..f0056bea56f 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -1783,7 +1783,8 @@ i386_frame_cache_1 (struct frame_info *this_frame, /* Saved stack pointer has been saved (but the SAVED_SP_REG register may be unavailable). */ if (cache->saved_sp == 0 - && frame_register_read (this_frame, cache->saved_sp_reg, buf)) + && deprecated_frame_register_read (this_frame, + cache->saved_sp_reg, buf)) cache->saved_sp = extract_unsigned_integer (buf, 4, byte_order); } /* Now that we have the base address for the stack frame we can diff --git a/gdb/infcmd.c b/gdb/infcmd.c index c3e602b4fad..7a08e31eda2 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -2155,7 +2155,7 @@ default_print_registers_info (struct gdbarch *gdbarch, val = allocate_value (regtype); /* Get the data in raw format. */ - if (! frame_register_read (frame, i, value_contents_raw (val))) + if (! deprecated_frame_register_read (frame, i, value_contents_raw (val))) mark_value_bytes_unavailable (val, 0, TYPE_LENGTH (value_type (val))); default_print_one_register_info (file, diff --git a/gdb/jit.c b/gdb/jit.c index 2dcafbcd142..1afbee6acc6 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -1061,8 +1061,8 @@ jit_unwind_reg_get_impl (struct gdb_unwind_callbacks *cb, int regnum) gdb_reg = gdbarch_dwarf2_reg_to_regnum (frame_arch, regnum); size = register_size (frame_arch, gdb_reg); value = xmalloc (sizeof (struct gdb_reg_value) + size - 1); - value->defined = frame_register_read (priv->this_frame, gdb_reg, - value->value); + value->defined = deprecated_frame_register_read (priv->this_frame, gdb_reg, + value->value); value->size = size; value->free = reg_value_free_impl; return value; diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 61f2cd209c7..8140f237320 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -6032,7 +6032,7 @@ mips_read_fp_register_single (struct frame_info *frame, int regno, int raw_size = register_size (gdbarch, regno); gdb_byte *raw_buffer = alloca (raw_size); - if (!frame_register_read (frame, regno, raw_buffer)) + if (!deprecated_frame_register_read (frame, regno, raw_buffer)) error (_("can't read register %d (%s)"), regno, gdbarch_register_name (gdbarch, regno)); if (raw_size == 8) @@ -6069,7 +6069,7 @@ mips_read_fp_register_double (struct frame_info *frame, int regno, { /* We have a 64-bit value for this register, and we should use all 64 bits. */ - if (!frame_register_read (frame, regno, rare_buffer)) + if (!deprecated_frame_register_read (frame, regno, rare_buffer)) error (_("can't read register %d (%s)"), regno, gdbarch_register_name (gdbarch, regno)); } @@ -6302,7 +6302,7 @@ print_gp_register_row (struct ui_file *file, struct frame_info *frame, break; /* End row: large register. */ /* OK: get the data in raw format. */ - if (!frame_register_read (frame, regnum, raw_buffer)) + if (!deprecated_frame_register_read (frame, regnum, raw_buffer)) error (_("can't read register %d (%s)"), regnum, gdbarch_register_name (gdbarch, regnum)); /* pad small registers */ diff --git a/gdb/mt-tdep.c b/gdb/mt-tdep.c index 0ae51b35b7c..f45ebcf51d5 100644 --- a/gdb/mt-tdep.c +++ b/gdb/mt-tdep.c @@ -685,7 +685,7 @@ mt_registers_info (struct gdbarch *gdbarch, buff = alloca (regsize); bytes = alloca (regsize * sizeof (*bytes)); - frame_register_read (frame, regnum, buff); + deprecated_frame_register_read (frame, regnum, buff); fputs_filtered (gdbarch_register_name (gdbarch, regnum), file); @@ -710,7 +710,7 @@ mt_registers_info (struct gdbarch *gdbarch, struct value_print_options opts; buf = alloca (register_size (gdbarch, MT_COPRO_REGNUM)); - frame_register_read (frame, MT_COPRO_REGNUM, buf); + deprecated_frame_register_read (frame, MT_COPRO_REGNUM, buf); /* And print. */ regnum = MT_COPRO_PSEUDOREG_REGNUM; fputs_filtered (gdbarch_register_name (gdbarch, regnum), @@ -731,13 +731,13 @@ mt_registers_info (struct gdbarch *gdbarch, gdb_byte buf[3 * sizeof (LONGEST)]; /* Get the two "real" mac registers. */ - frame_register_read (frame, MT_MAC_REGNUM, buf); + deprecated_frame_register_read (frame, MT_MAC_REGNUM, buf); oldmac = extract_unsigned_integer (buf, register_size (gdbarch, MT_MAC_REGNUM), byte_order); if (gdbarch_bfd_arch_info (gdbarch)->mach == bfd_mach_mrisc2 || gdbarch_bfd_arch_info (gdbarch)->mach == bfd_mach_ms2) { - frame_register_read (frame, MT_EXMAC_REGNUM, buf); + deprecated_frame_register_read (frame, MT_EXMAC_REGNUM, buf); ext_mac = extract_unsigned_integer (buf, register_size (gdbarch, MT_EXMAC_REGNUM), byte_order); } diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index e11e7468f01..5d649dfc931 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -1931,7 +1931,7 @@ sh64_do_fp_register (struct gdbarch *gdbarch, struct ui_file *file, alloca (register_size (gdbarch, gdbarch_fp0_regnum (gdbarch))); /* Get the data in raw format. */ - if (!frame_register_read (frame, regnum, raw_buffer)) + if (!deprecated_frame_register_read (frame, regnum, raw_buffer)) error (_("can't read register %d (%s)"), regnum, gdbarch_register_name (gdbarch, regnum)); @@ -2047,7 +2047,7 @@ sh64_do_register (struct gdbarch *gdbarch, struct ui_file *file, (gdbarch, regnum)), file); /* Get the data in raw format. */ - if (!frame_register_read (frame, regnum, raw_buffer)) + if (!deprecated_frame_register_read (frame, regnum, raw_buffer)) fprintf_filtered (file, "*value not available*\n"); get_formatted_print_options (&opts, 'x'); -- 2.30.2