2007-06-06 Markus Deuling <deuling@de.ibm.com>

	* gdbarch.sh (FETCH_POINTER_ARGUMENT): Replace by
	gdbarch_fetch_pointer_argument.
	* objc-lang.c (OBJC_FETCH_POINTER_ARGUMENT): Likewise.
	* gdbarch.c, gdbarch.h: Regenerate.

5 files changed, 10 insertions, 33 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 766de2d..ba256a4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 2007-06-06  Markus Deuling  <deuling@de.ibm.com>
 
+	* gdbarch.sh (FETCH_POINTER_ARGUMENT): Replace by
+	gdbarch_fetch_pointer_argument.
+	* objc-lang.c (OBJC_FETCH_POINTER_ARGUMENT): Likewise.
+	* gdbarch.c, gdbarch.h: Regenerate.
+
+2007-06-06  Markus Deuling  <deuling@de.ibm.com>
+
 	* gdbarch.sh (HAVE_NONSTEPPABLE_WATCHPOINT): Replace by
 	gdbarch_have_nonsteppable_watchpoint.
 	* infrun.c (handle_inferior_event, adjust_pc_after_break): Likewise.
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index cc1ba62..d1825b3 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -931,21 +931,9 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
   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 --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 2446a31..7b404b3 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -1125,30 +1125,11 @@ extern void set_gdbarch_register_reggroup_p (struct gdbarch *gdbarch, gdbarch_re
 
 /* 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 --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index ca298b8..3b24f47 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -662,7 +662,7 @@ M::int:address_class_name_to_type_flags:const char *name, int *type_flags_ptr:na
 # 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 --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 6cfe3c5..1f30d7c 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -1844,7 +1844,8 @@ find_implementation (CORE_ADDR object, CORE_ADDR sel)
 }
 
 #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)