From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26383 invoked by alias); 1 Jun 2003 04:02:40 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 26354 invoked from network); 1 Jun 2003 04:02:40 -0000 Received: from unknown (199.72.38.5) by sources.redhat.com with QMTP; 1 Jun 2003 04:02:40 -0000 Received: (qmail 8559 invoked from network); 1 Jun 2003 04:03:39 -0000 Received: from cpe-24-221-209-215.co.sprintbbd.net (HELO doc.com) (24.221.209.215) by external1.doc.com with SMTP; 1 Jun 2003 04:03:39 -0000 Message-ID: <3ED97ADC.5070405@doc.com> Date: Sun, 01 Jun 2003 04:02:00 -0000 From: Adam Fedor User-Agent: Mozilla/5.0 (X11; U; Linux ppc; en-US; rv:1.1) Gecko/20020905 X-Accept-Language: en-us, en MIME-Version: 1.0 To: GDB Patches CC: Andrew Cagney , Daniel Jacobowitz Subject: Re: [RFA]: gdbarch FETCH_POINTER_ARGUMENT References: <3EC84B9A.8030505@doc.com> <3ECA8AF1.10001@redhat.com> <3ECD2201.5040306@redhat.com> <3ED6CA78.9010109@doc.com> <3ED7B064.3020708@redhat.com> Content-Type: multipart/mixed; boundary="------------000609070306010909050408" X-SW-Source: 2003-06/txt/msg00005.txt.bz2 This is a multi-part message in MIME format. --------------000609070306010909050408 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 485 Andrew Cagney wrote: > >> Here's an updated patch. The more I looked at the "struct type *type" >> argument, the less I understood about how it should be used. I assume >> it would only be used, so far, on i386, but I'm easily confused by >> stacks and registers (and how things are stored there), so any >> pointers would be appreciated. > > > The patch is almost fine. Change it to `F' instead of `f' - so that a > predicate is also available. > OK, I made this change. --------------000609070306010909050408 Content-Type: text/plain; name="newgdbarch.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="newgdbarch.patch" Content-length: 12288 2003-05-18 Adam Fedor * gdbarch.sh (function_list): Add FETCH_POINTER_ARGUMENT. * gdbarch.[ch]: Regenerate. * hppa-tdep.c (hppa_fetch_pointer_argument): New function. (hppa_gdbarch_init): Set it in the gdbarch vector. * i386-tdep.c (i386_fetch_pointer_argument): New (i386_gdbarch_init): Set it into gdbarch. * rs6000-tdep.c (rs6000_fetch_pointer_argument): New. (rs6000_gdbarch_init): Set it in gdbarch. * sparc-tdep.c (sparc_fetch_pointer_argument): New (sparc_gdbarch_init): Set it in gdbarch. Index: gdbarch.c =================================================================== RCS file: /cvs/src/src/gdb/gdbarch.c,v retrieving revision 1.216 diff -u -p -r1.216 gdbarch.c --- gdbarch.c 17 May 2003 05:59:58 -0000 1.216 +++ gdbarch.c 1 Jun 2003 03:55:39 -0000 @@ -280,6 +280,7 @@ struct gdbarch gdbarch_address_class_type_flags_to_name_ftype *address_class_type_flags_to_name; gdbarch_address_class_name_to_type_flags_ftype *address_class_name_to_type_flags; gdbarch_register_reggroup_p_ftype *register_reggroup_p; + gdbarch_fetch_pointer_argument_ftype *fetch_pointer_argument; }; @@ -446,6 +447,7 @@ struct gdbarch startup_gdbarch = 0, 0, default_register_reggroup_p, + 0, /* startup_gdbarch() */ }; @@ -762,6 +764,7 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of address_class_type_flags_to_name, has predicate */ /* Skip verify of address_class_name_to_type_flags, has predicate */ /* Skip verify of register_reggroup_p, invalid_p == 0 */ + /* Skip verify of fetch_pointer_argument, has predicate */ buf = ui_file_xstrdup (log, &dummy); make_cleanup (xfree, buf); if (strlen (buf) > 0) @@ -1693,6 +1696,26 @@ gdbarch_dump (struct gdbarch *gdbarch, s (long) current_gdbarch->extract_struct_value_address /*EXTRACT_STRUCT_VALUE_ADDRESS ()*/); #endif +#ifdef FETCH_POINTER_ARGUMENT_P + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "FETCH_POINTER_ARGUMENT_P()", + XSTRING (FETCH_POINTER_ARGUMENT_P ())); + fprintf_unfiltered (file, + "gdbarch_dump: FETCH_POINTER_ARGUMENT_P() = %d\n", + FETCH_POINTER_ARGUMENT_P ()); +#endif +#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))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: FETCH_POINTER_ARGUMENT = <0x%08lx>\n", + (long) current_gdbarch->fetch_pointer_argument + /*FETCH_POINTER_ARGUMENT ()*/); +#endif #ifdef FP0_REGNUM fprintf_unfiltered (file, "gdbarch_dump: FP0_REGNUM # %s\n", @@ -5689,6 +5712,32 @@ set_gdbarch_register_reggroup_p (struct gdbarch_register_reggroup_p_ftype register_reggroup_p) { gdbarch->register_reggroup_p = register_reggroup_p; +} + +int +gdbarch_fetch_pointer_argument_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->fetch_pointer_argument != 0; +} + +CORE_ADDR +gdbarch_fetch_pointer_argument (struct gdbarch *gdbarch, struct frame_info *frame, int argi, struct type *type) +{ + gdb_assert (gdbarch != NULL); + if (gdbarch->fetch_pointer_argument == 0) + internal_error (__FILE__, __LINE__, + "gdbarch: gdbarch_fetch_pointer_argument invalid"); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_fetch_pointer_argument called\n"); + return gdbarch->fetch_pointer_argument (frame, argi, type); +} + +void +set_gdbarch_fetch_pointer_argument (struct gdbarch *gdbarch, + gdbarch_fetch_pointer_argument_ftype fetch_pointer_argument) +{ + gdbarch->fetch_pointer_argument = fetch_pointer_argument; } Index: gdbarch.h =================================================================== RCS file: /cvs/src/src/gdb/gdbarch.h,v retrieving revision 1.185 diff -u -p -r1.185 gdbarch.h --- gdbarch.h 17 May 2003 05:59:58 -0000 1.185 +++ gdbarch.h 1 Jun 2003 03:55:42 -0000 @@ -3184,6 +3184,45 @@ typedef int (gdbarch_register_reggroup_p extern int gdbarch_register_reggroup_p (struct gdbarch *gdbarch, int regnum, struct reggroup *reggroup); extern void set_gdbarch_register_reggroup_p (struct gdbarch *gdbarch, gdbarch_register_reggroup_p_ftype *register_reggroup_p); +/* 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 + +/* Default predicate for non- multi-arch targets. */ +#if (!GDB_MULTI_ARCH) && !defined (FETCH_POINTER_ARGUMENT_P) +#define FETCH_POINTER_ARGUMENT_P() (0) +#endif + +extern int gdbarch_fetch_pointer_argument_p (struct gdbarch *gdbarch); +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (FETCH_POINTER_ARGUMENT_P) +#error "Non multi-arch definition of FETCH_POINTER_ARGUMENT" +#endif +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (FETCH_POINTER_ARGUMENT_P) +#define FETCH_POINTER_ARGUMENT_P() (gdbarch_fetch_pointer_argument_p (current_gdbarch)) +#endif + +/* Default (function) for non- multi-arch platforms. */ +#if (!GDB_MULTI_ARCH) && !defined (FETCH_POINTER_ARGUMENT) +#define FETCH_POINTER_ARGUMENT(frame, argi, type) (internal_error (__FILE__, __LINE__, "FETCH_POINTER_ARGUMENT"), 0) +#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 (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (FETCH_POINTER_ARGUMENT) +#error "Non multi-arch definition of FETCH_POINTER_ARGUMENT" +#endif +#if GDB_MULTI_ARCH +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (FETCH_POINTER_ARGUMENT) +#define FETCH_POINTER_ARGUMENT(frame, argi, type) (gdbarch_fetch_pointer_argument (current_gdbarch, frame, argi, type)) +#endif +#endif + extern struct gdbarch_tdep *gdbarch_tdep (struct gdbarch *gdbarch); Index: gdbarch.sh =================================================================== RCS file: /cvs/src/src/gdb/gdbarch.sh,v retrieving revision 1.237 diff -u -p -r1.237 gdbarch.sh --- gdbarch.sh 17 May 2003 05:59:58 -0000 1.237 +++ gdbarch.sh 1 Jun 2003 03:55:45 -0000 @@ -716,6 +716,8 @@ M:2:ADDRESS_CLASS_TYPE_FLAGS_TO_NAME:con M:2:ADDRESS_CLASS_NAME_TO_TYPE_FLAGS:int:address_class_name_to_type_flags:const char *name, int *type_flags_ptr:name, type_flags_ptr # 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::FETCH_POINTER_ARGUMENT:CORE_ADDR:fetch_pointer_argument:struct frame_info *frame, int argi, struct type *type:frame, argi, type::::::::: EOF } Index: hppa-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/hppa-tdep.c,v retrieving revision 1.79 diff -u -p -r1.79 hppa-tdep.c --- hppa-tdep.c 22 May 2003 02:04:05 -0000 1.79 +++ hppa-tdep.c 1 Jun 2003 03:55:54 -0000 @@ -4993,6 +4993,16 @@ hppa_smash_text_address (CORE_ADDR addr) return (addr &= ~0x3); } +/* Get the ith function argument for the current function. */ +CORE_ADDR +hppa_fetch_pointer_argument (struct frame_info *frame, int argi, + struct type *type) +{ + CORE_ADDR addr; + frame_read_register (frame, R0_REGNUM + 26 - argi, &addr); + return addr; +} + static struct gdbarch * hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -5070,6 +5080,9 @@ hppa_gdbarch_init (struct gdbarch_info i set_gdbarch_read_pc (gdbarch, hppa_target_read_pc); set_gdbarch_write_pc (gdbarch, hppa_target_write_pc); set_gdbarch_deprecated_target_read_fp (gdbarch, hppa_target_read_fp); + + /* Helper for function argument information. */ + set_gdbarch_fetch_pointer_argument (gdbarch, hppa_fetch_pointer_argument); return gdbarch; } Index: i386-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/i386-tdep.c,v retrieving revision 1.144 diff -u -p -r1.144 i386-tdep.c --- i386-tdep.c 17 May 2003 05:59:58 -0000 1.144 +++ i386-tdep.c 1 Jun 2003 03:55:55 -0000 @@ -1420,6 +1420,16 @@ i386_register_reggroup_p (struct gdbarch return default_register_reggroup_p (gdbarch, regnum, group); } +/* Get the ith function argument for the current function. */ +CORE_ADDR +i386_fetch_pointer_argument (struct frame_info *frame, int argi, + struct type *type) +{ + CORE_ADDR stack; + frame_read_register (frame, SP_REGNUM, &stack); + return read_memory_unsigned_integer (stack + (4 * (argi + 1)), 4); +} + static struct gdbarch * i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) @@ -1551,6 +1561,9 @@ i386_gdbarch_init (struct gdbarch_info i /* Add the i386 register groups. */ i386_add_reggroups (gdbarch); set_gdbarch_register_reggroup_p (gdbarch, i386_register_reggroup_p); + + /* Helper for function argument information. */ + set_gdbarch_fetch_pointer_argument (gdbarch, i386_fetch_pointer_argument); /* Should be using push_dummy_call. */ set_gdbarch_deprecated_dummy_write_sp (gdbarch, generic_target_write_sp); Index: rs6000-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v retrieving revision 1.135 diff -u -p -r1.135 rs6000-tdep.c --- rs6000-tdep.c 29 May 2003 19:47:14 -0000 1.135 +++ rs6000-tdep.c 1 Jun 2003 03:55:59 -0000 @@ -230,6 +230,16 @@ rs6000_saved_pc_after_call (struct frame return read_register (gdbarch_tdep (current_gdbarch)->ppc_lr_regnum); } +/* Get the ith function argument for the current function. */ +CORE_ADDR +rs6000_fetch_pointer_argument (struct frame_info *frame, int argi, + struct type *type) +{ + CORE_ADDR addr; + frame_read_register (frame, 3 + argi, &addr); + return addr; +} + /* Calculate the destination of a branch/jump. Return -1 if not a branch. */ static CORE_ADDR @@ -2990,6 +3000,9 @@ rs6000_gdbarch_init (struct gdbarch_info set_gdbarch_frame_args_address (gdbarch, rs6000_frame_args_address); set_gdbarch_frame_locals_address (gdbarch, rs6000_frame_args_address); set_gdbarch_deprecated_saved_pc_after_call (gdbarch, rs6000_saved_pc_after_call); + + /* Helpers for function argument information. */ + set_gdbarch_fetch_pointer_argument (gdbarch, rs6000_fetch_pointer_argument); /* We can't tell how many args there are now that the C compiler delays popping them. */ Index: sparc-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/sparc-tdep.c,v retrieving revision 1.103 diff -u -p -r1.103 sparc-tdep.c --- sparc-tdep.c 25 May 2003 15:47:26 -0000 1.103 +++ sparc-tdep.c 1 Jun 2003 03:56:07 -0000 @@ -3243,6 +3243,15 @@ sparc_return_value_on_stack (struct type return 0; } +/* Get the ith function argument for the current function. */ +CORE_ADDR +sparc_fetch_pointer_argument (struct frame_info *frame, int argi, struct type *type) +{ + CORE_ADDR addr; + frame_read_register (frame, O0_REGNUM + argi, &addr); + return addr; +} + /* * Gdbarch "constructor" function. */ @@ -3353,6 +3362,9 @@ sparc_gdbarch_init (struct gdbarch_info set_gdbarch_sp_regnum (gdbarch, SPARC_SP_REGNUM); set_gdbarch_deprecated_use_generic_dummy_frames (gdbarch, 0); set_gdbarch_write_pc (gdbarch, generic_target_write_pc); + + /* Helper for function argument information. */ + set_gdbarch_fetch_pointer_argument (gdbarch, sparc_fetch_pointer_argument); /* * Settings that depend only on 32/64 bit word size --------------000609070306010909050408--