This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[rfc] [9/9] Remove macro FETCH_POINTER_ARGUMENT
- From: Markus Deuling <deuling at de dot ibm dot com>
- To: GDB Patches <gdb-patches at sourceware dot org>
- Cc: Ulrich Weigand <uweigand at de dot ibm dot com>
- Date: Fri, 01 Jun 2007 13:40:09 +0200
- Subject: [rfc] [9/9] Remove macro FETCH_POINTER_ARGUMENT
Hello,
this patch removes FETCH_POINTER_ARGUMENT macro from gdbarch.sh
ChangeLog:
* gdbarch.sh (FETCH_POINTER_ARGUMENT): Replace by
gdbarch_fetch_pointer_argument.
* objc-lang.c (OBJC_FETCH_POINTER_ARGUMENT): Likewise.
* gdbarch.c, gdbarch.h: Regenerate.
Is this ok to commit?
Regards,
Markus
--
Markus Deuling
GNU Toolchain for Linux on Cell BE
deuling@de.ibm.com
diff -urN src/gdb/gdbarch.c dev/gdb/gdbarch.c
--- src/gdb/gdbarch.c 2007-05-31 19:31:37.000000000 +0200
+++ dev/gdb/gdbarch.c 2007-06-01 13:01:05.000000000 +0200
@@ -954,21 +954,9 @@
fprintf_unfiltered (file,
"gdbarch_dump: extract_return_value = <0x%lx>\n",
(long) current_gdbarch->extract_return_value);
-#ifdef FETCH_POINTER_ARGUMENT_P
- fprintf_unfiltered (file,
- "gdbarch_dump: %s # %s\n",
- "FETCH_POINTER_ARGUMENT_P()",
- XSTRING (FETCH_POINTER_ARGUMENT_P ()));
-#endif
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_fetch_pointer_argument_p() = %d\n",
gdbarch_fetch_pointer_argument_p (current_gdbarch));
-#ifdef FETCH_POINTER_ARGUMENT
- fprintf_unfiltered (file,
- "gdbarch_dump: %s # %s\n",
- "FETCH_POINTER_ARGUMENT(frame, argi, type)",
- XSTRING (FETCH_POINTER_ARGUMENT (frame, argi, type)));
-#endif
fprintf_unfiltered (file,
"gdbarch_dump: fetch_pointer_argument = <0x%lx>\n",
(long) current_gdbarch->fetch_pointer_argument);
diff -urN src/gdb/gdbarch.h dev/gdb/gdbarch.h
--- src/gdb/gdbarch.h 2007-05-31 19:31:37.000000000 +0200
+++ dev/gdb/gdbarch.h 2007-06-01 13:01:05.000000000 +0200
@@ -1216,30 +1216,11 @@
/* Fetch the pointer to the ith function argument. */
-#if defined (FETCH_POINTER_ARGUMENT)
-/* Legacy for systems yet to multi-arch FETCH_POINTER_ARGUMENT */
-#if !defined (FETCH_POINTER_ARGUMENT_P)
-#define FETCH_POINTER_ARGUMENT_P() (1)
-#endif
-#endif
-
extern int gdbarch_fetch_pointer_argument_p (struct gdbarch *gdbarch);
-#if !defined (GDB_TM_FILE) && defined (FETCH_POINTER_ARGUMENT_P)
-#error "Non multi-arch definition of FETCH_POINTER_ARGUMENT"
-#endif
-#if !defined (FETCH_POINTER_ARGUMENT_P)
-#define FETCH_POINTER_ARGUMENT_P() (gdbarch_fetch_pointer_argument_p (current_gdbarch))
-#endif
typedef CORE_ADDR (gdbarch_fetch_pointer_argument_ftype) (struct frame_info *frame, int argi, struct type *type);
extern CORE_ADDR gdbarch_fetch_pointer_argument (struct gdbarch *gdbarch, struct frame_info *frame, int argi, struct type *type);
extern void set_gdbarch_fetch_pointer_argument (struct gdbarch *gdbarch, gdbarch_fetch_pointer_argument_ftype *fetch_pointer_argument);
-#if !defined (GDB_TM_FILE) && defined (FETCH_POINTER_ARGUMENT)
-#error "Non multi-arch definition of FETCH_POINTER_ARGUMENT"
-#endif
-#if !defined (FETCH_POINTER_ARGUMENT)
-#define FETCH_POINTER_ARGUMENT(frame, argi, type) (gdbarch_fetch_pointer_argument (current_gdbarch, frame, argi, type))
-#endif
/* Return the appropriate register set for a core file section with
name SECT_NAME and size SECT_SIZE. */
diff -urN src/gdb/gdbarch.sh dev/gdb/gdbarch.sh
--- src/gdb/gdbarch.sh 2007-05-31 19:31:37.000000000 +0200
+++ dev/gdb/gdbarch.sh 2007-06-01 13:01:05.000000000 +0200
@@ -661,7 +661,7 @@
# Is a register in a group
m::int:register_reggroup_p:int regnum, struct reggroup *reggroup:regnum, reggroup::default_register_reggroup_p::0
# Fetch the pointer to the ith function argument.
-F:=:CORE_ADDR:fetch_pointer_argument:struct frame_info *frame, int argi, struct type *type:frame, argi, type
+F::CORE_ADDR:fetch_pointer_argument:struct frame_info *frame, int argi, struct type *type:frame, argi, type
# Return the appropriate register set for a core file section with
# name SECT_NAME and size SECT_SIZE.
diff -urN src/gdb/objc-lang.c dev/gdb/objc-lang.c
--- src/gdb/objc-lang.c 2007-01-09 18:58:55.000000000 +0100
+++ dev/gdb/objc-lang.c 2007-06-01 13:01:38.000000000 +0200
@@ -1844,7 +1844,8 @@
}
#define OBJC_FETCH_POINTER_ARGUMENT(argi) \
- FETCH_POINTER_ARGUMENT (get_current_frame (), argi, builtin_type_void_func_ptr)
+ gdbarch_fetch_pointer_argument (current_gdbarch, get_current_frame (), \
+ argi, builtin_type_void_func_ptr)
static int
resolve_msgsend (CORE_ADDR pc, CORE_ADDR *new_pc)