diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 24093164c6..517f1f6d6c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2007-06-12 Markus Deuling + + * gdbarch.sh (DEPRECATED_STACK_ALIGN): Remove. + * gdbarch.c, gdbarch.h: Regenerate. + 2007-06-12 Markus Deuling * gdbarch.sh (STAB_REG_TO_REGNUM): Replace by diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 772f0ad3be..358d03b35b 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -204,7 +204,6 @@ struct gdbarch gdbarch_unwind_pc_ftype *unwind_pc; gdbarch_unwind_sp_ftype *unwind_sp; gdbarch_frame_num_args_ftype *frame_num_args; - gdbarch_deprecated_stack_align_ftype *deprecated_stack_align; gdbarch_frame_align_ftype *frame_align; gdbarch_deprecated_reg_struct_has_addr_ftype *deprecated_reg_struct_has_addr; gdbarch_stabs_argument_has_addr_ftype *stabs_argument_has_addr; @@ -329,7 +328,6 @@ struct gdbarch startup_gdbarch = 0, /* unwind_pc */ 0, /* unwind_sp */ 0, /* frame_num_args */ - 0, /* deprecated_stack_align */ 0, /* frame_align */ 0, /* deprecated_reg_struct_has_addr */ default_stabs_argument_has_addr, /* stabs_argument_has_addr */ @@ -580,7 +578,6 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of unwind_pc, has predicate */ /* Skip verify of unwind_sp, has predicate */ /* Skip verify of frame_num_args, has predicate */ - /* Skip verify of deprecated_stack_align, has predicate */ /* Skip verify of frame_align, has predicate */ /* Skip verify of deprecated_reg_struct_has_addr, has predicate */ /* Skip verify of stabs_argument_has_addr, invalid_p == 0 */ @@ -817,24 +814,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: deprecated_register_size = %s\n", paddr_d (current_gdbarch->deprecated_register_size)); -#ifdef DEPRECATED_STACK_ALIGN_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_STACK_ALIGN_P()", - XSTRING (DEPRECATED_STACK_ALIGN_P ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_stack_align_p() = %d\n", - gdbarch_deprecated_stack_align_p (current_gdbarch)); -#ifdef DEPRECATED_STACK_ALIGN - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_STACK_ALIGN(sp)", - XSTRING (DEPRECATED_STACK_ALIGN (sp))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_stack_align = <0x%lx>\n", - (long) current_gdbarch->deprecated_stack_align); #ifdef DEPRECATED_USE_STRUCT_CONVENTION fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -2618,30 +2597,6 @@ set_gdbarch_frame_num_args (struct gdbarch *gdbarch, gdbarch->frame_num_args = frame_num_args; } -int -gdbarch_deprecated_stack_align_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_stack_align != NULL; -} - -CORE_ADDR -gdbarch_deprecated_stack_align (struct gdbarch *gdbarch, CORE_ADDR sp) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_stack_align != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_stack_align called\n"); - return gdbarch->deprecated_stack_align (sp); -} - -void -set_gdbarch_deprecated_stack_align (struct gdbarch *gdbarch, - gdbarch_deprecated_stack_align_ftype deprecated_stack_align) -{ - gdbarch->deprecated_stack_align = deprecated_stack_align; -} - int gdbarch_frame_align_p (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index ef60eadd71..36425bd9b4 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -637,36 +637,6 @@ typedef int (gdbarch_frame_num_args_ftype) (struct frame_info *frame); extern int gdbarch_frame_num_args (struct gdbarch *gdbarch, struct frame_info *frame); extern void set_gdbarch_frame_num_args (struct gdbarch *gdbarch, gdbarch_frame_num_args_ftype *frame_num_args); -/* DEPRECATED_STACK_ALIGN has been replaced by an initial aligning call - to frame_align and the requirement that methods such as - push_dummy_call and frame_red_zone_size maintain correct stack/frame - alignment. */ - -#if defined (DEPRECATED_STACK_ALIGN) -/* Legacy for systems yet to multi-arch DEPRECATED_STACK_ALIGN */ -#if !defined (DEPRECATED_STACK_ALIGN_P) -#define DEPRECATED_STACK_ALIGN_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_stack_align_p (struct gdbarch *gdbarch); -#if !defined (GDB_TM_FILE) && defined (DEPRECATED_STACK_ALIGN_P) -#error "Non multi-arch definition of DEPRECATED_STACK_ALIGN" -#endif -#if !defined (DEPRECATED_STACK_ALIGN_P) -#define DEPRECATED_STACK_ALIGN_P() (gdbarch_deprecated_stack_align_p (current_gdbarch)) -#endif - -typedef CORE_ADDR (gdbarch_deprecated_stack_align_ftype) (CORE_ADDR sp); -extern CORE_ADDR gdbarch_deprecated_stack_align (struct gdbarch *gdbarch, CORE_ADDR sp); -extern void set_gdbarch_deprecated_stack_align (struct gdbarch *gdbarch, gdbarch_deprecated_stack_align_ftype *deprecated_stack_align); -#if !defined (GDB_TM_FILE) && defined (DEPRECATED_STACK_ALIGN) -#error "Non multi-arch definition of DEPRECATED_STACK_ALIGN" -#endif -#if !defined (DEPRECATED_STACK_ALIGN) -#define DEPRECATED_STACK_ALIGN(sp) (gdbarch_deprecated_stack_align (current_gdbarch, sp)) -#endif - extern int gdbarch_frame_align_p (struct gdbarch *gdbarch); typedef CORE_ADDR (gdbarch_frame_align_ftype) (struct gdbarch *gdbarch, CORE_ADDR address); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index f4d4a78488..9c297bd576 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -573,11 +573,6 @@ M::CORE_ADDR:unwind_sp:struct frame_info *next_frame:next_frame # frame-base. Enable frame-base before frame-unwind. F::int:frame_num_args:struct frame_info *frame:frame # -# DEPRECATED_STACK_ALIGN has been replaced by an initial aligning call -# to frame_align and the requirement that methods such as -# push_dummy_call and frame_red_zone_size maintain correct stack/frame -# alignment. -F:=:CORE_ADDR:deprecated_stack_align:CORE_ADDR sp:sp M::CORE_ADDR:frame_align:CORE_ADDR address:address # DEPRECATED_REG_STRUCT_HAS_ADDR has been replaced by # stabs_argument_has_addr.