From 794a477ae35a6044a569a6936b81bf2ba383b1b0 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 9 Sep 2003 22:21:36 +0000 Subject: [PATCH] 2003-09-09 Andrew Cagney * rs6000-tdep.c (rs6000_fix_call_dummy): Delete function. (rs6000_push_dummy_call): Set the "TOC" register. --- gdb/ChangeLog | 3 +++ gdb/rs6000-tdep.c | 28 ++++++++-------------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 63b14289363..0361a4da36f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ 2003-09-09 Andrew Cagney + * rs6000-tdep.c (rs6000_fix_call_dummy): Delete function. + (rs6000_push_dummy_call): Set the "TOC" register. + * rs6000-tdep.c (rs6000_gdbarch_init): Do not set the deprecated methods "max_register_raw_size", "max_register_virtual_size" or "register_virtual_size". diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index f3e3d8c8dad..1fc2b2af58c 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -1075,25 +1075,6 @@ rs6000_pop_frame (void) flush_cached_frames (); } -/* Fixup the call sequence of a dummy function, with the real function - address. Its arguments will be passed by gdb. */ - -static void -rs6000_fix_call_dummy (char *dummyname, CORE_ADDR pc, CORE_ADDR fun, - int nargs, struct value **args, struct type *type, - int gcc_p) -{ - int ii; - CORE_ADDR target_addr; - - if (rs6000_find_toc_address_hook != NULL) - { - CORE_ADDR tocvalue = (*rs6000_find_toc_address_hook) (fun); - write_register (gdbarch_tdep (current_gdbarch)->ppc_toc_regnum, - tocvalue); - } -} - /* All the ABI's require 16 byte alignment. */ static CORE_ADDR rs6000_frame_align (struct gdbarch *gdbarch, CORE_ADDR addr) @@ -1321,6 +1302,14 @@ ran_out_of_registers_for_arguments: store_unsigned_integer (tmp_buffer, 4, saved_sp); write_memory (sp, tmp_buffer, 4); + /* 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) + { + CORE_ADDR tocvalue = (*rs6000_find_toc_address_hook) (func_addr); + regcache_raw_write_signed (regcache, tdep->ppc_toc_regnum, tocvalue); + } + target_store_registers (-1); return sp; } @@ -2938,7 +2927,6 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_long_double_bit (gdbarch, 8 * TARGET_CHAR_BIT); set_gdbarch_char_signed (gdbarch, 0); - set_gdbarch_deprecated_fix_call_dummy (gdbarch, rs6000_fix_call_dummy); set_gdbarch_frame_align (gdbarch, rs6000_frame_align); if (sysv_abi && wordsize == 8) /* PPC64 SYSV. */ -- 2.30.2