From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17439 invoked by alias); 9 Sep 2003 21:48:16 -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 17432 invoked from network); 9 Sep 2003 21:48:15 -0000 Received: from unknown (HELO localhost.redhat.com) (207.219.125.105) by sources.redhat.com with SMTP; 9 Sep 2003 21:48:15 -0000 Received: from redhat.com (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id B633B2B7F for ; Tue, 9 Sep 2003 17:48:13 -0400 (EDT) Message-ID: <3F5E4A9D.7080500@redhat.com> Date: Tue, 09 Sep 2003 21:48:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-US; rv:1.0.2) Gecko/20030820 X-Accept-Language: en-us, en MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [rfa:rs6000] Move rs6000_fix_call_dummy into push_dummy_call Content-Type: multipart/mixed; boundary="------------090807000706070003040504" X-SW-Source: 2003-09/txt/msg00178.txt.bz2 This is a multi-part message in MIME format. --------------090807000706070003040504 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 719 Hello, This isn't so obvious. The rs6000 was unconditionally setting the FIX_CALL_DUMMY method and then using it as a way of setting the TOC register. #include "the thing is" ... The function looks like: 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); } but "rs6000_find_toc_address_hook" is only non NULL when the GDB build includes "rs6000-nat.c" which is AIX specific. Hence, since this is an AIX / RS6000 / PowerOpen specific thing (and not PPC SysV), I'm only moving it to rs6000_push_dummy_call. make sense? ok? Andrew --------------090807000706070003040504 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 2000 2003-09-09 Andrew Cagney * rs6000-tdep.c (rs6000_fix_call_dummy): Delete function. (rs6000_push_dummy_call): Set the "TOC" register. Index: rs6000-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v retrieving revision 1.152 diff -u -r1.152 rs6000-tdep.c --- rs6000-tdep.c 9 Sep 2003 20:22:37 -0000 1.152 +++ rs6000-tdep.c 9 Sep 2003 21:45:46 -0000 @@ -1075,25 +1075,6 @@ 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 @@ 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; } @@ -2941,7 +2930,6 @@ 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. */ --------------090807000706070003040504--