diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/arch-utils.c | 11 | ||||
| -rw-r--r-- | gdb/arch-utils.h | 4 | ||||
| -rw-r--r-- | gdb/doc/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/doc/gdbint.texinfo | 6 | ||||
| -rw-r--r-- | gdb/frame.h | 2 | ||||
| -rw-r--r-- | gdb/gdbarch.c | 45 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 29 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 4 | ||||
| -rw-r--r-- | gdb/inferior.h | 4 | ||||
| -rw-r--r-- | gdb/regcache.c | 35 |
11 files changed, 28 insertions, 127 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 922ca9e..7aa71a7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2004-08-05 Andrew Cagney <cagney@gnu.org> + + * gdbarch.sh (deprecated_frame_saved_pc): Delete. + * gdbarch.h, gdbarch.c: Re-generate. + * regcache.c (deprecated_read_fp, deprecated_write_sp): Delete. + * inferior.h (deprecated_read_fp, deprecated_write_sp): Delete. + * frame.h: Delete deprecated_read_fp from comments. + * arch-utils.c (deprecated_init_frame_pc_default): Delete. + * arch-utils.h (deprecated_init_frame_pc_default): Delete. + 2004-08-04 Mark Kettenis <kettenis@gnu.org> * i386obsd-tdep.c (i386obsd_sigtramp_p): Adjust for changed signal diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index abebf55..b60ed33 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -228,17 +228,6 @@ no_op_reg_to_regnum (int reg) return reg; } -CORE_ADDR -deprecated_init_frame_pc_default (int fromleaf, struct frame_info *prev) -{ - if (fromleaf && DEPRECATED_SAVED_PC_AFTER_CALL_P ()) - return DEPRECATED_SAVED_PC_AFTER_CALL (get_next_frame (prev)); - else if (get_next_frame (prev) != NULL) - return DEPRECATED_FRAME_SAVED_PC (get_next_frame (prev)); - else - return read_pc (); -} - void default_elf_make_msymbol_special (asymbol *sym, struct minimal_symbol *msym) { diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index 4d1e48e..cf63b31 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -72,10 +72,6 @@ extern gdbarch_convert_from_func_ptr_addr_ftype convert_from_func_ptr_addr_ident extern int no_op_reg_to_regnum (int reg); -/* Versions of init_frame_pc(). Do nothing; do the default. */ - -extern CORE_ADDR deprecated_init_frame_pc_default (int fromleaf, struct frame_info *prev); - /* Do nothing version of elf_make_msymbol_special. */ void default_elf_make_msymbol_special (asymbol *sym, struct minimal_symbol *msym); diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 90cea68..c6c3fff 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2004-08-05 Andrew Cagney <cagney@gnu.org> + + * gdbint.texinfo (Target Architecture Definition): Delete + reference to deprecated_read_fp. + 2004-08-02 Andrew Cagney <cagney@gnu.org> * gdbint.texinfo (Target Architecture Definition): Delete diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index 2f8e04a..b2e4352 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -3834,9 +3834,9 @@ Number of bits in a short integer; defaults to @code{2 * TARGET_CHAR_BIT}. @findex read_sp @findex read_fp @anchor{TARGET_READ_SP} These change the behavior of @code{read_pc}, -@code{write_pc}, @code{read_sp} and @code{deprecated_read_fp}. For most -targets, these may be left undefined. @value{GDBN} will call the read -and write register functions with the relevant @code{_REGNUM} argument. +@code{write_pc} and @code{read_sp}. For most targets, these may be +left undefined. @value{GDBN} will call the read and write register +functions with the relevant @code{_REGNUM} argument. These macros are useful when a target keeps one of these registers in a hard to get at place; for example, part in a segment register and part diff --git a/gdb/frame.h b/gdb/frame.h index 6dda5ff..ee2934d 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -650,7 +650,7 @@ extern void deprecated_update_frame_pc_hack (struct frame_info *frame, /* FIXME: cagney/2002-12-18: Has the frame's base changed? Or to be more exact, was that initial guess at the frame's base as returned - by deprecated_read_fp() wrong? If it was, fix it. This shouldn't + by the deleted read_fp() wrong? If it was, fix it. This shouldn't be necessary since the code should be getting the frame's base correct from the outset. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index dba1c06..c77a70e 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -186,7 +186,6 @@ struct gdbarch CORE_ADDR deprecated_function_start_offset; gdbarch_remote_translate_xfer_address_ftype *remote_translate_xfer_address; CORE_ADDR frame_args_skip; - gdbarch_deprecated_frame_saved_pc_ftype *deprecated_frame_saved_pc; gdbarch_unwind_pc_ftype *unwind_pc; gdbarch_unwind_sp_ftype *unwind_sp; gdbarch_deprecated_saved_pc_after_call_ftype *deprecated_saved_pc_after_call; @@ -313,7 +312,6 @@ struct gdbarch startup_gdbarch = 0, /* deprecated_function_start_offset */ generic_remote_translate_xfer_address, /* remote_translate_xfer_address */ 0, /* frame_args_skip */ - 0, /* deprecated_frame_saved_pc */ 0, /* unwind_pc */ 0, /* unwind_sp */ 0, /* deprecated_saved_pc_after_call */ @@ -570,7 +568,6 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of deprecated_function_start_offset, invalid_p == 0 */ /* Skip verify of remote_translate_xfer_address, invalid_p == 0 */ /* Skip verify of frame_args_skip, invalid_p == 0 */ - /* Skip verify of deprecated_frame_saved_pc, has predicate */ /* Skip verify of unwind_pc, has predicate */ /* Skip verify of unwind_sp, has predicate */ /* Skip verify of deprecated_saved_pc_after_call, has predicate */ @@ -845,24 +842,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: deprecated_fp_regnum = %s\n", paddr_d (current_gdbarch->deprecated_fp_regnum)); -#ifdef DEPRECATED_FRAME_SAVED_PC_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_SAVED_PC_P()", - XSTRING (DEPRECATED_FRAME_SAVED_PC_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_frame_saved_pc_p() = %d\n", - gdbarch_deprecated_frame_saved_pc_p (current_gdbarch)); -#ifdef DEPRECATED_FRAME_SAVED_PC - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FRAME_SAVED_PC(fi)", - XSTRING (DEPRECATED_FRAME_SAVED_PC (fi))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_frame_saved_pc = <0x%lx>\n", - (long) current_gdbarch->deprecated_frame_saved_pc); #ifdef DEPRECATED_FUNCTION_START_OFFSET fprintf_unfiltered (file, "gdbarch_dump: DEPRECATED_FUNCTION_START_OFFSET # %s\n", @@ -3021,30 +3000,6 @@ set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, } int -gdbarch_deprecated_frame_saved_pc_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_frame_saved_pc != NULL; -} - -CORE_ADDR -gdbarch_deprecated_frame_saved_pc (struct gdbarch *gdbarch, struct frame_info *fi) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_frame_saved_pc != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_frame_saved_pc called\n"); - return gdbarch->deprecated_frame_saved_pc (fi); -} - -void -set_gdbarch_deprecated_frame_saved_pc (struct gdbarch *gdbarch, - gdbarch_deprecated_frame_saved_pc_ftype deprecated_frame_saved_pc) -{ - gdbarch->deprecated_frame_saved_pc = deprecated_frame_saved_pc; -} - -int gdbarch_unwind_pc_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index b691945..fc0fe50 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -987,35 +987,6 @@ extern void set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, CORE_ADDR fram #define FRAME_ARGS_SKIP (gdbarch_frame_args_skip (current_gdbarch)) #endif -/* DEPRECATED_FRAME_SAVED_PC has been replaced by UNWIND_PC. Please - note, per UNWIND_PC's doco, that while the two have similar - interfaces they have very different underlying implementations. */ - -#if defined (DEPRECATED_FRAME_SAVED_PC) -/* Legacy for systems yet to multi-arch DEPRECATED_FRAME_SAVED_PC */ -#if !defined (DEPRECATED_FRAME_SAVED_PC_P) -#define DEPRECATED_FRAME_SAVED_PC_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_frame_saved_pc_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_SAVED_PC_P) -#error "Non multi-arch definition of DEPRECATED_FRAME_SAVED_PC" -#endif -#if !defined (DEPRECATED_FRAME_SAVED_PC_P) -#define DEPRECATED_FRAME_SAVED_PC_P() (gdbarch_deprecated_frame_saved_pc_p (current_gdbarch)) -#endif - -typedef CORE_ADDR (gdbarch_deprecated_frame_saved_pc_ftype) (struct frame_info *fi); -extern CORE_ADDR gdbarch_deprecated_frame_saved_pc (struct gdbarch *gdbarch, struct frame_info *fi); -extern void set_gdbarch_deprecated_frame_saved_pc (struct gdbarch *gdbarch, gdbarch_deprecated_frame_saved_pc_ftype *deprecated_frame_saved_pc); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FRAME_SAVED_PC) -#error "Non multi-arch definition of DEPRECATED_FRAME_SAVED_PC" -#endif -#if !defined (DEPRECATED_FRAME_SAVED_PC) -#define DEPRECATED_FRAME_SAVED_PC(fi) (gdbarch_deprecated_frame_saved_pc (current_gdbarch, fi)) -#endif - extern int gdbarch_unwind_pc_p (struct gdbarch *gdbarch); typedef CORE_ADDR (gdbarch_unwind_pc_ftype) (struct gdbarch *gdbarch, struct frame_info *next_frame); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index a5c68c1..7278783 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -575,10 +575,6 @@ v:=:CORE_ADDR:deprecated_function_start_offset::::0:::0 m::void:remote_translate_xfer_address:struct regcache *regcache, CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR *rem_addr, int *rem_len:regcache, gdb_addr, gdb_len, rem_addr, rem_len:::generic_remote_translate_xfer_address::0 # v:=:CORE_ADDR:frame_args_skip::::0:::0 -# DEPRECATED_FRAME_SAVED_PC has been replaced by UNWIND_PC. Please -# note, per UNWIND_PC's doco, that while the two have similar -# interfaces they have very different underlying implementations. -F:=:CORE_ADDR:deprecated_frame_saved_pc:struct frame_info *fi:fi M::CORE_ADDR:unwind_pc:struct frame_info *next_frame:next_frame M::CORE_ADDR:unwind_sp:struct frame_info *next_frame:next_frame # DEPRECATED_FRAME_LOCALS_ADDRESS as been replaced by the per-frame diff --git a/gdb/inferior.h b/gdb/inferior.h index 76ec0b0..e80f2d7 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -176,10 +176,6 @@ extern void generic_target_write_pc (CORE_ADDR, ptid_t); extern CORE_ADDR read_sp (void); -extern void deprecated_write_sp (CORE_ADDR); - -extern CORE_ADDR deprecated_read_fp (void); - extern CORE_ADDR unsigned_pointer_to_address (struct type *type, const void *buf); extern void unsigned_address_to_pointer (struct type *type, void *buf, diff --git a/gdb/regcache.c b/gdb/regcache.c index 411392c..dd88eb8 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -1066,19 +1066,18 @@ regcache_raw_collect (const struct regcache *regcache, int regnum, void *buf) } -/* read_pc, write_pc, read_sp, deprecated_read_fp, etc. Special - handling for registers PC, SP, and FP. */ +/* read_pc, write_pc, read_sp, etc. Special handling for registers + PC, SP, and FP. */ -/* NOTE: cagney/2001-02-18: The functions read_pc_pid(), read_pc(), - read_sp(), and deprecated_read_fp(), will eventually be replaced by - per-frame methods. Instead of relying on the global INFERIOR_PTID, - they will use the contextual information provided by the FRAME. - These functions do not belong in the register cache. */ +/* NOTE: cagney/2001-02-18: The functions read_pc_pid(), read_pc() and + read_sp(), will eventually be replaced by per-frame methods. + Instead of relying on the global INFERIOR_PTID, they will use the + contextual information provided by the FRAME. These functions do + not belong in the register cache. */ /* NOTE: cagney/2003-06-07: The functions generic_target_write_pc(), - write_pc_pid(), write_pc(), and deprecated_read_fp(), all need to - be replaced by something that does not rely on global state. But - what? */ + write_pc_pid() and write_pc(), all need to be replaced by something + that does not rely on global state. But what? */ CORE_ADDR read_pc_pid (ptid_t ptid) @@ -1157,22 +1156,6 @@ read_sp (void) internal_error (__FILE__, __LINE__, "read_sp: Unable to find SP"); } -void -deprecated_write_sp (CORE_ADDR val) -{ - gdb_assert (SP_REGNUM >= 0); - write_register (SP_REGNUM, val); -} - -CORE_ADDR -deprecated_read_fp (void) -{ - if (DEPRECATED_FP_REGNUM >= 0) - return read_register (DEPRECATED_FP_REGNUM); - else - internal_error (__FILE__, __LINE__, "deprecated_read_fp"); -} - static void reg_flush_command (char *command, int from_tty) { |