Use entry values for 32-bit PPC struct return

AdaCore has a local patch for PPC "finish", but last year, Ulrich
Weigand pointed out that this patch was incorrect.  It may work for
simple functions like the one in the internal test, but nothing
guarantees that r3 will be preserved by the callee, so checking r3 on
exit is not always correct.

This patch fixes the problem using the same approach as PPC64: use the
entry value of r3, if available.  Ulrich confirmed this matches the
PPC32 ABI.

diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
index ab859fbe14329994b67656eba85d2f151b5f4d3d..66630793e86e5f61ef1241f3b86dbab19401aeca 100644 (file)
--- a/gdb/ppc-sysv-tdep.c
+++ b/gdb/ppc-sysv-tdep.c
@@ -2159,8 +2159,7 @@ ppc64_sysv_abi_return_value (struct gdbarch *gdbarch, struct value *function,
 }
 
 CORE_ADDR
-ppc64_sysv_get_return_buf_addr (struct type *val_type,
-                               frame_info_ptr cur_frame)
+ppc_sysv_get_return_buf_addr (struct type *val_type, frame_info_ptr cur_frame)
 {
   /* The PowerPC ABI specifies aggregates that are not returned by value
      are returned in a storage buffer provided by the caller.  The

diff --git a/gdb/ppc-tdep.h b/gdb/ppc-tdep.h
index db4e53205a69e1aa04deff9f804fc14d6d1330dc..ddeb810f35b8ce555b4d84705fcdd249218e1e55 100644 (file)
--- a/gdb/ppc-tdep.h
+++ b/gdb/ppc-tdep.h
@@ -175,7 +175,9 @@ extern void ppc_collect_vsxregset (const struct regset *regset,
                                  const struct regcache *regcache,
                                  int regnum, void *vsxregs, size_t len);
 
-extern CORE_ADDR ppc64_sysv_get_return_buf_addr (type*, frame_info_ptr);
+/* Implementation of the gdbarch get_return_buf_addr hook.  */
+
+extern CORE_ADDR ppc_sysv_get_return_buf_addr (type*, frame_info_ptr);
 
 /* Private data that this module attaches to struct gdbarch.  */
 

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index ee18b495d4c4f91ac765b13d3443f4ad2bbb06f6..966b75b8baa80abe9bfc2cdfb11bcff5d2c4b6a7 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -8273,12 +8273,11 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   if (wordsize == 8)
     {
       set_gdbarch_return_value (gdbarch, ppc64_sysv_abi_return_value);
-      set_gdbarch_get_return_buf_addr (gdbarch,
-                                      ppc64_sysv_get_return_buf_addr);
       set_gdbarch_update_call_site_pc (gdbarch, ppc64_update_call_site_pc);
     }
   else
     set_gdbarch_return_value (gdbarch, ppc_sysv_abi_return_value);
+  set_gdbarch_get_return_buf_addr (gdbarch, ppc_sysv_get_return_buf_addr);
 
   /* Set lr_frame_offset.  */
   if (wordsize == 8)