From faaf634c109b5b97c2a51a9a0ef5ecdc596b270a Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 31 May 2007 16:57:30 +0000 Subject: [PATCH] 2007-05-31 Markus Deuling * gdbarch.sh (CALL_DUMMY_LOCATION): Replace by gdbarch_call_dummy_location. * infcall.c (call_function_by_hand): Likewise. * inferior.h: Change comment. * arch-utils.c: Change comment. * gdbarch.c, gdbarch.h: Regenerate. --- gdb/ChangeLog | 9 +++++++++ gdb/gdbarch.c | 7 +------ gdb/gdbarch.h | 6 ------ gdb/gdbarch.sh | 4 ++-- gdb/infcall.c | 2 +- gdb/inferior.h | 2 +- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 60bbf19e3ec..2cae69dbcf5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2007-05-31 Markus Deuling + + * gdbarch.sh (CALL_DUMMY_LOCATION): Replace by + gdbarch_call_dummy_location. + * infcall.c (call_function_by_hand): Likewise. + * inferior.h: Change comment. + * arch-utils.c: Change comment. + * gdbarch.c, gdbarch.h: Regenerate. + 2007-05-28 Joel Brobecker * solib-aix5.c: Delete. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 154aa4a8a84..73d87e1a92c 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -39,7 +39,7 @@ #include "arch-utils.h" #include "gdbcmd.h" -#include "inferior.h" /* enum CALL_DUMMY_LOCATION et.al. */ +#include "inferior.h" #include "symcat.h" #include "floatformat.h" @@ -759,11 +759,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: byte_order = %s\n", paddr_d (current_gdbarch->byte_order)); -#ifdef CALL_DUMMY_LOCATION - fprintf_unfiltered (file, - "gdbarch_dump: CALL_DUMMY_LOCATION # %s\n", - XSTRING (CALL_DUMMY_LOCATION)); -#endif fprintf_unfiltered (file, "gdbarch_dump: call_dummy_location = %s\n", paddr_d (current_gdbarch->call_dummy_location)); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 02557bb44a9..64715de67d7 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -496,12 +496,6 @@ extern void set_gdbarch_deprecated_register_size (struct gdbarch *gdbarch, int d extern int gdbarch_call_dummy_location (struct gdbarch *gdbarch); extern void set_gdbarch_call_dummy_location (struct gdbarch *gdbarch, int call_dummy_location); -#if !defined (GDB_TM_FILE) && defined (CALL_DUMMY_LOCATION) -#error "Non multi-arch definition of CALL_DUMMY_LOCATION" -#endif -#if !defined (CALL_DUMMY_LOCATION) -#define CALL_DUMMY_LOCATION (gdbarch_call_dummy_location (current_gdbarch)) -#endif extern int gdbarch_push_dummy_code_p (struct gdbarch *gdbarch); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index b865c570c55..b454e9c3462 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -470,7 +470,7 @@ v:=:int:deprecated_fp_regnum:::-1:-1::0 M::CORE_ADDR:push_dummy_call:struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr:function, regcache, bp_addr, nargs, args, sp, struct_return, struct_addr # DEPRECATED_REGISTER_SIZE can be deleted. v:=:int:deprecated_register_size -v:=:int:call_dummy_location::::AT_ENTRY_POINT::0 +v::int:call_dummy_location::::AT_ENTRY_POINT::0 M::CORE_ADDR:push_dummy_code:CORE_ADDR sp, CORE_ADDR funaddr, int using_gcc, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr:sp, funaddr, using_gcc, args, nargs, value_type, real_pc, bp_addr m::void:print_registers_info:struct ui_file *file, struct frame_info *frame, int regnum, int all:file, frame, regnum, all::default_print_registers_info::0 @@ -1179,7 +1179,7 @@ cat <