2003-09-09 Andrew Cagney <cagney@redhat.com>

	* rs6000-tdep.c (ppc_push_return_address): Delete function.
	(rs6000_push_dummy_call): Set LR to BP_ADDR.
	(rs6000_gdbarch_init): Do not set deprecated_push_return_address.
	* ppc-sysv-tdep.c (ppc_sysv_abi_push_dummy_call): Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0361a4da36faf4833a1f83e14887224bf68af4bf..3ed38b794d8d084df1a170b03ec090a2f7d9bd2e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2003-09-09  Andrew Cagney  <cagney@redhat.com>
 
+       * rs6000-tdep.c (ppc_push_return_address): Delete function.
+       (rs6000_push_dummy_call): Set LR to BP_ADDR.
+       (rs6000_gdbarch_init): Do not set deprecated_push_return_address.
+       * ppc-sysv-tdep.c (ppc_sysv_abi_push_dummy_call): Ditto.
+
        * rs6000-tdep.c (rs6000_fix_call_dummy): Delete function.
        (rs6000_push_dummy_call): Set the "TOC" register.
 

diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
index bd801881837c19a001259566284f9330c56d7044..954800770efdfb11fe9d5803536782639e2493ca 100644 (file)
--- a/gdb/ppc-sysv-tdep.c
+++ b/gdb/ppc-sysv-tdep.c
@@ -339,6 +339,10 @@ ppc_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr,
         }
     }
 
+  /* Point the inferior function call's return address at the dummy's
+     breakpoint.  */
+  regcache_raw_write_signed (regcache, tdep->ppc_lr_regnum, bp_addr);
+
   target_store_registers (-1);
   return sp;
 }

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 1fc2b2af58c94d92a4e7002246d7c7260a790196..abed029e072689c4df44f9dd323916911d82be38 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -1302,6 +1302,10 @@ ran_out_of_registers_for_arguments:
   store_unsigned_integer (tmp_buffer, 4, saved_sp);
   write_memory (sp, tmp_buffer, 4);
 
+  /* Point the inferior function call's return address at the dummy's
+     breakpoint.  */
+  regcache_raw_write_signed (regcache, tdep->ppc_lr_regnum, bp_addr);
+
   /* Set the TOC register, get the value from the objfile reader
      which, in turn, gets it from the VMAP table.  */
   if (rs6000_find_toc_address_hook != NULL)
@@ -1314,17 +1318,6 @@ ran_out_of_registers_for_arguments:
   return sp;
 }
 
-/* Function: ppc_push_return_address (pc, sp)
-   Set up the return address for the inferior function call.  */
-
-static CORE_ADDR
-ppc_push_return_address (CORE_ADDR pc, CORE_ADDR sp)
-{
-  write_register (gdbarch_tdep (current_gdbarch)->ppc_lr_regnum,
-                 entry_point_address ());
-  return sp;
-}
-
 /* Extract a function return value of type TYPE from raw register array
    REGBUF, and copy that return value into VALBUF in virtual format.  */
 static void
@@ -2935,7 +2928,6 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
     /* PowerOpen / AIX 32 bit.  */
     set_gdbarch_frame_red_zone_size (gdbarch, 220);
   set_gdbarch_deprecated_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos);
-  set_gdbarch_deprecated_push_return_address (gdbarch, ppc_push_return_address);
   set_gdbarch_believe_pcc_promotion (gdbarch, 1);
 
   set_gdbarch_deprecated_register_convertible (gdbarch, rs6000_register_convertible);