From bceb6e50519a169c044c1d2fef5b3a9f5cda2a06 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Mon, 18 Jun 2007 18:19:00 +0000 Subject: [PATCH] 2007-06-18 Markus Deuling * gdbarch.sh (DEPRECATED_REG_STRUCT_HAS_ADDR): Replace by gdbarch_deprecated_reg_struct_has_addr. * infcall.c (call_function_by_hand): Likewise. (DEPRECATED_REG_STRUCT_HAS_ADDR_P): Replace by * gdbarch_deprecated_reg_struct_has_addr_p. * infcall.c (call_function_by_hand): Likewise. * gdbarch.c, gdbarch.h: Regenerate. --- gdb/ChangeLog | 10 ++++++++++ gdb/gdbarch.c | 12 ------------ gdb/gdbarch.h | 21 +-------------------- gdb/gdbarch.sh | 4 ++-- gdb/infcall.c | 5 +++-- 5 files changed, 16 insertions(+), 36 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c4f093d957c..0f687f7317d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2007-06-18 Markus Deuling + + * gdbarch.sh (DEPRECATED_REG_STRUCT_HAS_ADDR): Replace by + gdbarch_deprecated_reg_struct_has_addr. + * infcall.c (call_function_by_hand): Likewise. + (DEPRECATED_REG_STRUCT_HAS_ADDR_P): Replace by + * gdbarch_deprecated_reg_struct_has_addr_p. + * infcall.c (call_function_by_hand): Likewise. + * gdbarch.c, gdbarch.h: Regenerate. + 2007-06-18 Markus Deuling * gdbarch.sh (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS): Remove. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 66d411b02af..4f92ffc33d8 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -738,21 +738,9 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: deprecated_function_start_offset = 0x%s\n", paddr_nz (current_gdbarch->deprecated_function_start_offset)); -#ifdef DEPRECATED_REG_STRUCT_HAS_ADDR_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_REG_STRUCT_HAS_ADDR_P()", - XSTRING (DEPRECATED_REG_STRUCT_HAS_ADDR_P ())); -#endif fprintf_unfiltered (file, "gdbarch_dump: gdbarch_deprecated_reg_struct_has_addr_p() = %d\n", gdbarch_deprecated_reg_struct_has_addr_p (current_gdbarch)); -#ifdef DEPRECATED_REG_STRUCT_HAS_ADDR - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_REG_STRUCT_HAS_ADDR(gcc_p, type)", - XSTRING (DEPRECATED_REG_STRUCT_HAS_ADDR (gcc_p, type))); -#endif fprintf_unfiltered (file, "gdbarch_dump: deprecated_reg_struct_has_addr = <0x%lx>\n", (long) current_gdbarch->deprecated_reg_struct_has_addr); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 6fc8e1718db..de37e84972d 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -518,33 +518,14 @@ typedef CORE_ADDR (gdbarch_frame_align_ftype) (struct gdbarch *gdbarch, CORE_ADD extern CORE_ADDR gdbarch_frame_align (struct gdbarch *gdbarch, CORE_ADDR address); extern void set_gdbarch_frame_align (struct gdbarch *gdbarch, gdbarch_frame_align_ftype *frame_align); -/* DEPRECATED_REG_STRUCT_HAS_ADDR has been replaced by +/* deprecated_reg_struct_has_addr has been replaced by stabs_argument_has_addr. */ -#if defined (DEPRECATED_REG_STRUCT_HAS_ADDR) -/* Legacy for systems yet to multi-arch DEPRECATED_REG_STRUCT_HAS_ADDR */ -#if !defined (DEPRECATED_REG_STRUCT_HAS_ADDR_P) -#define DEPRECATED_REG_STRUCT_HAS_ADDR_P() (1) -#endif -#endif - extern int gdbarch_deprecated_reg_struct_has_addr_p (struct gdbarch *gdbarch); -#if !defined (GDB_TM_FILE) && defined (DEPRECATED_REG_STRUCT_HAS_ADDR_P) -#error "Non multi-arch definition of DEPRECATED_REG_STRUCT_HAS_ADDR" -#endif -#if !defined (DEPRECATED_REG_STRUCT_HAS_ADDR_P) -#define DEPRECATED_REG_STRUCT_HAS_ADDR_P() (gdbarch_deprecated_reg_struct_has_addr_p (current_gdbarch)) -#endif typedef int (gdbarch_deprecated_reg_struct_has_addr_ftype) (int gcc_p, struct type *type); extern int gdbarch_deprecated_reg_struct_has_addr (struct gdbarch *gdbarch, int gcc_p, struct type *type); extern void set_gdbarch_deprecated_reg_struct_has_addr (struct gdbarch *gdbarch, gdbarch_deprecated_reg_struct_has_addr_ftype *deprecated_reg_struct_has_addr); -#if !defined (GDB_TM_FILE) && defined (DEPRECATED_REG_STRUCT_HAS_ADDR) -#error "Non multi-arch definition of DEPRECATED_REG_STRUCT_HAS_ADDR" -#endif -#if !defined (DEPRECATED_REG_STRUCT_HAS_ADDR) -#define DEPRECATED_REG_STRUCT_HAS_ADDR(gcc_p, type) (gdbarch_deprecated_reg_struct_has_addr (current_gdbarch, gcc_p, type)) -#endif typedef int (gdbarch_stabs_argument_has_addr_ftype) (struct gdbarch *gdbarch, struct type *type); extern int gdbarch_stabs_argument_has_addr (struct gdbarch *gdbarch, struct type *type); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 33ad4de1c78..c81e9bc1052 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -550,9 +550,9 @@ M::CORE_ADDR:unwind_sp:struct frame_info *next_frame:next_frame F::int:frame_num_args:struct frame_info *frame:frame # M::CORE_ADDR:frame_align:CORE_ADDR address:address -# DEPRECATED_REG_STRUCT_HAS_ADDR has been replaced by +# deprecated_reg_struct_has_addr has been replaced by # stabs_argument_has_addr. -F:=:int:deprecated_reg_struct_has_addr:int gcc_p, struct type *type:gcc_p, type +F::int:deprecated_reg_struct_has_addr:int gcc_p, struct type *type:gcc_p, type m::int:stabs_argument_has_addr:struct type *type:type::default_stabs_argument_has_addr::0 v::int:frame_red_zone_size # diff --git a/gdb/infcall.c b/gdb/infcall.c index 525cf2fd8e8..f7f75f4fd37 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -586,7 +586,7 @@ You must use a pointer to function type variable. Command ignored."), arg_name); } } - if (DEPRECATED_REG_STRUCT_HAS_ADDR_P ()) + if (gdbarch_deprecated_reg_struct_has_addr_p (current_gdbarch)) { int i; /* This is a machine like the sparc, where we may need to pass a @@ -603,7 +603,8 @@ You must use a pointer to function type variable. Command ignored."), arg_name); || (TYPE_CODE (arg_type) == TYPE_CODE_FLT && TYPE_LENGTH (arg_type) > 8) ) - && DEPRECATED_REG_STRUCT_HAS_ADDR (using_gcc, arg_type)) + && gdbarch_deprecated_reg_struct_has_addr + (current_gdbarch, using_gcc, arg_type)) { CORE_ADDR addr; int len; /* = TYPE_LENGTH (arg_type); */ -- 2.30.2