From b4b8817765a197496048fe0386b925242a7732f2 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 26 Nov 2002 19:01:30 +0000 Subject: [PATCH] 2002-11-26 Andrew Cagney * inferior.h (deprecated_pc_in_call_dummy_before_text_end): Rename pc_in_call_dummy_before_text_end (deprecated_pc_in_call_dummy_after_text_end): Rename pc_in_call_dummy_after_text_end. (deprecated_pc_in_call_dummy_on_stack): Rename pc_in_call_dummy_on_stack. (deprecated_pc_in_call_dummy_at_entry_point): Rename pc_in_call_dummy_at_entry_point. * m68k-tdep.c (m68k_gdbarch_init): Update. * s390-tdep.c (s390_gdbarch_init): Update. * x86-64-tdep.c (x86_64_gdbarch_init): Update. * vax-tdep.c (vax_gdbarch_init): Update. * sparc-tdep.c (sparc_gdbarch_init): Update. * ns32k-tdep.c (ns32k_gdbarch_init): Update. * mn10300-tdep.c (mn10300_gdbarch_init): Update. * i386-tdep.c (i386_gdbarch_init): Update. * frv-tdep.c (frv_gdbarch_init): Update. * cris-tdep.c (cris_gdbarch_init): Update. * config/sparc/tm-sparc.h (PC_IN_CALL_DUMMY): Update. * blockframe.c (deprecated_pc_in_call_dummy_before_text_end) (deprecated_pc_in_call_dummy_after_text_end) (deprecated_pc_in_call_dummy_on_stack) (deprecated_pc_in_call_dummy_at_entry_point): Update. * alpha-tdep.c (alpha_gdbarch_init): Update. --- gdb/ChangeLog | 27 +++++++++++++++++++++ gdb/alpha-tdep.c | 2 +- gdb/blockframe.c | 15 ++++++------ gdb/config/sparc/tm-sparc.h | 2 +- gdb/cris-tdep.c | 2 +- gdb/frv-tdep.c | 2 +- gdb/i386-tdep.c | 2 +- gdb/inferior.h | 48 +++++++++++++++++++++++++++---------- gdb/m68k-tdep.c | 2 +- gdb/mn10300-tdep.c | 2 +- gdb/ns32k-tdep.c | 2 +- gdb/s390-tdep.c | 2 +- gdb/sparc-tdep.c | 8 +++---- gdb/vax-tdep.c | 2 +- gdb/x86-64-tdep.c | 2 +- 15 files changed, 86 insertions(+), 34 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 70203b94435..8350fef6438 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,30 @@ +2002-11-26 Andrew Cagney + + * inferior.h (deprecated_pc_in_call_dummy_before_text_end): Rename + pc_in_call_dummy_before_text_end + (deprecated_pc_in_call_dummy_after_text_end): Rename + pc_in_call_dummy_after_text_end. + (deprecated_pc_in_call_dummy_on_stack): Rename + pc_in_call_dummy_on_stack. + (deprecated_pc_in_call_dummy_at_entry_point): Rename + pc_in_call_dummy_at_entry_point. + * m68k-tdep.c (m68k_gdbarch_init): Update. + * s390-tdep.c (s390_gdbarch_init): Update. + * x86-64-tdep.c (x86_64_gdbarch_init): Update. + * vax-tdep.c (vax_gdbarch_init): Update. + * sparc-tdep.c (sparc_gdbarch_init): Update. + * ns32k-tdep.c (ns32k_gdbarch_init): Update. + * mn10300-tdep.c (mn10300_gdbarch_init): Update. + * i386-tdep.c (i386_gdbarch_init): Update. + * frv-tdep.c (frv_gdbarch_init): Update. + * cris-tdep.c (cris_gdbarch_init): Update. + * config/sparc/tm-sparc.h (PC_IN_CALL_DUMMY): Update. + * blockframe.c (deprecated_pc_in_call_dummy_before_text_end) + (deprecated_pc_in_call_dummy_after_text_end) + (deprecated_pc_in_call_dummy_on_stack) + (deprecated_pc_in_call_dummy_at_entry_point): Update. + * alpha-tdep.c (alpha_gdbarch_init): Update. + 2002-11-25 Daniel Jacobowitz * acconfig.h (HAVE_PREAD64): Add. diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index 0f1c274b165..eb6f184f4de 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -1892,7 +1892,7 @@ alpha_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_call_dummy_breakpoint_offset_p (gdbarch, 1); set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 0); set_gdbarch_call_dummy_start_offset (gdbarch, 0); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_at_entry_point); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); set_gdbarch_push_dummy_frame (gdbarch, alpha_push_dummy_frame); set_gdbarch_fix_call_dummy (gdbarch, alpha_fix_call_dummy); diff --git a/gdb/blockframe.c b/gdb/blockframe.c index d21fc9b6036..ee3b47489e5 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -650,16 +650,16 @@ block_innermost_frame (struct block *block) extern CORE_ADDR text_end; int -pc_in_call_dummy_before_text_end (CORE_ADDR pc, CORE_ADDR sp, - CORE_ADDR frame_address) +deprecated_pc_in_call_dummy_before_text_end (CORE_ADDR pc, CORE_ADDR sp, + CORE_ADDR frame_address) { return ((pc) >= text_end - CALL_DUMMY_LENGTH && (pc) <= text_end + DECR_PC_AFTER_BREAK); } int -pc_in_call_dummy_after_text_end (CORE_ADDR pc, CORE_ADDR sp, - CORE_ADDR frame_address) +deprecated_pc_in_call_dummy_after_text_end (CORE_ADDR pc, CORE_ADDR sp, + CORE_ADDR frame_address) { return ((pc) >= text_end && (pc) <= text_end + CALL_DUMMY_LENGTH + DECR_PC_AFTER_BREAK); @@ -684,7 +684,8 @@ pc_in_call_dummy_after_text_end (CORE_ADDR pc, CORE_ADDR sp, allocate other kinds of code on the stack. */ int -pc_in_call_dummy_on_stack (CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR frame_address) +deprecated_pc_in_call_dummy_on_stack (CORE_ADDR pc, CORE_ADDR sp, + CORE_ADDR frame_address) { return (INNER_THAN ((sp), (pc)) && (frame_address != 0) @@ -692,8 +693,8 @@ pc_in_call_dummy_on_stack (CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR frame_address) } int -pc_in_call_dummy_at_entry_point (CORE_ADDR pc, CORE_ADDR sp, - CORE_ADDR frame_address) +deprecated_pc_in_call_dummy_at_entry_point (CORE_ADDR pc, CORE_ADDR sp, + CORE_ADDR frame_address) { return ((pc) >= CALL_DUMMY_ADDRESS () && (pc) <= (CALL_DUMMY_ADDRESS () + DECR_PC_AFTER_BREAK)); diff --git a/gdb/config/sparc/tm-sparc.h b/gdb/config/sparc/tm-sparc.h index 6042ac6cecb..e130daf77a6 100644 --- a/gdb/config/sparc/tm-sparc.h +++ b/gdb/config/sparc/tm-sparc.h @@ -661,7 +661,7 @@ extern void sparc_print_extra_frame_info (struct frame_info *); /* Method for detecting dummy frames. */ #define PC_IN_CALL_DUMMY(PC, SP, FRAME_ADDRESS) \ - pc_in_call_dummy_on_stack (PC, SP, FRAME_ADDRESS) + deprecated_pc_in_call_dummy_on_stack (PC, SP, FRAME_ADDRESS) #endif /* GDB_MULTI_ARCH */ diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 7fc8e7e1f7b..c39830ece8c 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -4261,7 +4261,7 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Read all about dummy frames in blockframe.c. */ set_gdbarch_call_dummy_length (gdbarch, 0); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_at_entry_point); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); /* Defined to 1 to indicate that the target supports inferior function calls. */ diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index 72c83cd3c3d..f86e381e846 100644 --- a/gdb/frv-tdep.c +++ b/gdb/frv-tdep.c @@ -1119,7 +1119,7 @@ frv_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_call_dummy_address (gdbarch, entry_point_address); set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 0); set_gdbarch_call_dummy_start_offset (gdbarch, 0); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_at_entry_point); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); set_gdbarch_push_dummy_frame (gdbarch, generic_push_dummy_frame); set_gdbarch_fix_call_dummy (gdbarch, generic_fix_call_dummy); diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index becb7956227..aa13128cd0e 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -1597,7 +1597,7 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) i386_register_convert_to_virtual); set_gdbarch_register_convert_to_raw (gdbarch, i386_register_convert_to_raw); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_at_entry_point); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); /* "An argument's size is increased, if necessary, to make it a multiple of [32-bit] words. This may require tail padding, diff --git a/gdb/inferior.h b/gdb/inferior.h index 5cf3540b1c0..eaa0a367a29 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -486,35 +486,59 @@ extern int attach_flag; /* Are we in a call dummy? */ -extern int pc_in_call_dummy_before_text_end (CORE_ADDR pc, CORE_ADDR sp, - CORE_ADDR frame_address); +/* NOTE: cagney/2002-11-24: Targets need to both switch to generic + dummy frames, and use generic_pc_in_call_dummy(). The generic + version should be able to handle all cases since that code works by + saving the address of the dummy's breakpoint (where ever it is). */ + +extern int deprecated_pc_in_call_dummy_before_text_end (CORE_ADDR pc, + CORE_ADDR sp, + CORE_ADDR frame_address); #if !GDB_MULTI_ARCH #if !defined (PC_IN_CALL_DUMMY) && CALL_DUMMY_LOCATION == BEFORE_TEXT_END -#define PC_IN_CALL_DUMMY(pc, sp, frame_address) pc_in_call_dummy_before_text_end (pc, sp, frame_address) +#define PC_IN_CALL_DUMMY(pc, sp, frame_address) deprecated_pc_in_call_dummy_before_text_end (pc, sp, frame_address) #endif /* Before text_end. */ #endif -extern int pc_in_call_dummy_after_text_end (CORE_ADDR pc, CORE_ADDR sp, - CORE_ADDR frame_address); +/* NOTE: cagney/2002-11-24: Targets need to both switch to generic + dummy frames, and use generic_pc_in_call_dummy(). The generic + version should be able to handle all cases since that code works by + saving the address of the dummy's breakpoint (where ever it is). */ + +extern int deprecated_pc_in_call_dummy_after_text_end (CORE_ADDR pc, + CORE_ADDR sp, + CORE_ADDR frame_address); #if !GDB_MULTI_ARCH #if !defined (PC_IN_CALL_DUMMY) && CALL_DUMMY_LOCATION == AFTER_TEXT_END -#define PC_IN_CALL_DUMMY(pc, sp, frame_address) pc_in_call_dummy_after_text_end (pc, sp, frame_address) +#define PC_IN_CALL_DUMMY(pc, sp, frame_address) deprecated_pc_in_call_dummy_after_text_end (pc, sp, frame_address) #endif #endif -extern int pc_in_call_dummy_on_stack (CORE_ADDR pc, CORE_ADDR sp, - CORE_ADDR frame_address); +/* NOTE: cagney/2002-11-24: Targets need to both switch to generic + dummy frames, and use generic_pc_in_call_dummy(). The generic + version should be able to handle all cases since that code works by + saving the address of the dummy's breakpoint (where ever it is). */ + +extern int deprecated_pc_in_call_dummy_on_stack (CORE_ADDR pc, + CORE_ADDR sp, + CORE_ADDR frame_address); #if !GDB_MULTI_ARCH #if !defined (PC_IN_CALL_DUMMY) && CALL_DUMMY_LOCATION == ON_STACK -#define PC_IN_CALL_DUMMY(pc, sp, frame_address) pc_in_call_dummy_on_stack (pc, sp, frame_address) +#define PC_IN_CALL_DUMMY(pc, sp, frame_address) deprecated_pc_in_call_dummy_on_stack (pc, sp, frame_address) #endif #endif -extern int pc_in_call_dummy_at_entry_point (CORE_ADDR pc, CORE_ADDR sp, - CORE_ADDR frame_address); +/* NOTE: cagney/2002-11-24: Targets need to both switch to generic + dummy frames, and use generic_pc_in_call_dummy(). The generic + version should be able to handle all cases since that code works by + saving the address of the dummy's breakpoint (where ever it is). */ + +extern int deprecated_pc_in_call_dummy_at_entry_point (CORE_ADDR pc, + CORE_ADDR sp, + CORE_ADDR frame_address); #if !GDB_MULTI_ARCH #if !defined (PC_IN_CALL_DUMMY) && CALL_DUMMY_LOCATION == AT_ENTRY_POINT -#define PC_IN_CALL_DUMMY(pc, sp, frame_address) pc_in_call_dummy_at_entry_point (pc, sp, frame_address) +#define PC_IN_CALL_DUMMY(pc, sp, frame_address) deprecated_pc_in_call_dummy_at_entry_point (pc, sp, frame_address) #endif #endif diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 097555e3d22..d9570581044 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -1035,7 +1035,7 @@ m68k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_call_dummy_location (gdbarch, ON_STACK); set_gdbarch_call_dummy_breakpoint_offset_p (gdbarch, 1); set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 24); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_on_stack); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack); set_gdbarch_call_dummy_p (gdbarch, 1); set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); set_gdbarch_call_dummy_length (gdbarch, 28); diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index cc8e411268d..6526b011da8 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -1196,7 +1196,7 @@ mn10300_gdbarch_init (struct gdbarch_info info, set_gdbarch_call_dummy_length (gdbarch, 0); set_gdbarch_fix_call_dummy (gdbarch, generic_fix_call_dummy); set_gdbarch_call_dummy_start_offset (gdbarch, 0); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_at_entry_point); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); set_gdbarch_use_generic_dummy_frames (gdbarch, 1); set_gdbarch_push_dummy_frame (gdbarch, generic_push_dummy_frame); set_gdbarch_push_arguments (gdbarch, mn10300_push_arguments); diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c index 0a0e8e2d470..c14404ee332 100644 --- a/gdb/ns32k-tdep.c +++ b/gdb/ns32k-tdep.c @@ -616,7 +616,7 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_call_dummy_start_offset (gdbarch, 3); set_gdbarch_call_dummy_breakpoint_offset_p (gdbarch, 0); set_gdbarch_use_generic_dummy_frames (gdbarch, 0); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_on_stack); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack); set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); /* Breakpoint info */ diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index f028ac1baed..aca049a2194 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1827,7 +1827,7 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_call_dummy_location (gdbarch, AT_ENTRY_POINT); set_gdbarch_call_dummy_address (gdbarch, entry_point_address); set_gdbarch_call_dummy_start_offset (gdbarch, 0); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_at_entry_point); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); set_gdbarch_push_dummy_frame (gdbarch, generic_push_dummy_frame); set_gdbarch_push_arguments (gdbarch, s390_push_arguments); set_gdbarch_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos); diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index b5251ef291a..6a876aaca38 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -3197,7 +3197,7 @@ sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* 32-bit machine types: */ #ifdef SPARC32_CALL_DUMMY_ON_STACK - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_on_stack); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack); set_gdbarch_call_dummy_address (gdbarch, sparc_call_dummy_address); set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 0x30); set_gdbarch_call_dummy_length (gdbarch, 0x38); @@ -3248,7 +3248,7 @@ sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_call_dummy_location (gdbarch, ON_STACK); set_gdbarch_call_dummy_words (gdbarch, call_dummy_32); #else - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_at_entry_point); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); set_gdbarch_call_dummy_address (gdbarch, entry_point_address); set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 0); set_gdbarch_call_dummy_length (gdbarch, 0); @@ -3296,7 +3296,7 @@ sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) default: /* Any new machine type is likely to be 64-bit. */ #ifdef SPARC64_CALL_DUMMY_ON_STACK - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_on_stack); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack); set_gdbarch_call_dummy_address (gdbarch, sparc_call_dummy_address); set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 8 * 4); set_gdbarch_call_dummy_length (gdbarch, 192); @@ -3304,7 +3304,7 @@ sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_call_dummy_start_offset (gdbarch, 148); set_gdbarch_call_dummy_words (gdbarch, call_dummy_64); #else - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_at_entry_point); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); set_gdbarch_call_dummy_address (gdbarch, entry_point_address); set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 0); set_gdbarch_call_dummy_length (gdbarch, 0); diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c index ad650742601..3b7de9602d3 100644 --- a/gdb/vax-tdep.c +++ b/gdb/vax-tdep.c @@ -691,7 +691,7 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_call_dummy_breakpoint_offset_p (gdbarch, 1); set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 7); set_gdbarch_use_generic_dummy_frames (gdbarch, 0); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_on_stack); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack); set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); /* Breakpoint info */ diff --git a/gdb/x86-64-tdep.c b/gdb/x86-64-tdep.c index f4d0301055a..13aa37bda58 100644 --- a/gdb/x86-64-tdep.c +++ b/gdb/x86-64-tdep.c @@ -1102,7 +1102,7 @@ x86_64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_fix_call_dummy (gdbarch, generic_fix_call_dummy); set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_at_entry_point); + set_gdbarch_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); set_gdbarch_push_dummy_frame (gdbarch, generic_push_dummy_frame); -- 2.30.2