From 45b7523071aa1bffee8795fbb0d3b4cb8a61ca2a Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 7 Jun 2004 17:58:33 +0000 Subject: [PATCH] 2004-06-07 Andrew Cagney * target.h (PC_REQUIRES_RUN_BEFORE_USE): Delete definition. * config/pa/tm-hppa.h (DEPRECATED_PC_REQUIRES_RUN_BEFORE_USE): Rename PC_REQUIRES_RUN_BEFORE_USE. * breakpoint.c (breakpoint_sals_to_pc): Update. Wrap reference in #ifdef. --- gdb/ChangeLog | 8 ++++++++ gdb/breakpoint.c | 4 +++- gdb/config/pa/tm-hppa.h | 2 +- gdb/target.h | 9 --------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 02be965..f6ad170 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2004-06-07 Andrew Cagney + + * target.h (PC_REQUIRES_RUN_BEFORE_USE): Delete definition. + * config/pa/tm-hppa.h (DEPRECATED_PC_REQUIRES_RUN_BEFORE_USE): + Rename PC_REQUIRES_RUN_BEFORE_USE. + * breakpoint.c (breakpoint_sals_to_pc): Update. Wrap reference in + #ifdef. + 2004-06-07 Randolph Chung * hppa-tdep.c (hppa_frame_cache): Handle the cases when we start diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 8d0b3c8..b9386f0 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -5025,7 +5025,8 @@ breakpoint_sals_to_pc (struct symtabs_and_lines *sals, Give the target a chance to bless sals.sals[i].pc before we try to make a breakpoint for it. */ - if (PC_REQUIRES_RUN_BEFORE_USE (sals->sals[i].pc)) +#ifdef DEPRECATED_PC_REQUIRES_RUN_BEFORE_USE + if (DEPRECATED_PC_REQUIRES_RUN_BEFORE_USE (sals->sals[i].pc)) { if (address == NULL) error ("Cannot break without a running program."); @@ -5033,6 +5034,7 @@ breakpoint_sals_to_pc (struct symtabs_and_lines *sals, error ("Cannot break on %s without a running program.", address); } +#endif } } diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h index e5a5658..225d5ba 100644 --- a/gdb/config/pa/tm-hppa.h +++ b/gdb/config/pa/tm-hppa.h @@ -29,7 +29,7 @@ #define GDB_MULTI_ARCH 1 extern int hppa_pc_requires_run_before_use (CORE_ADDR pc); -#define PC_REQUIRES_RUN_BEFORE_USE(pc) hppa_pc_requires_run_before_use (pc) +#define DEPRECATED_PC_REQUIRES_RUN_BEFORE_USE(pc) hppa_pc_requires_run_before_use (pc) /* PA specific macro to see if the current instruction is nullified. */ #ifndef INSTRUCTION_NULLIFIED diff --git a/gdb/target.h b/gdb/target.h index 664e242..92becca 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1088,15 +1088,6 @@ extern void (*deprecated_target_new_objfile_hook) (struct objfile *); (*current_target.to_stopped_data_address) () #endif -/* Sometimes gdb may pick up what appears to be a valid target address - from a minimal symbol, but the value really means, essentially, - "This is an index into a table which is populated when the inferior - is run. Therefore, do not attempt to use this as a PC." */ - -#if !defined(PC_REQUIRES_RUN_BEFORE_USE) -#define PC_REQUIRES_RUN_BEFORE_USE(pc) (0) -#endif - /* This will only be defined by a target that supports catching vfork events, such as HP-UX. -- 2.7.4