From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18848 invoked by alias); 21 Jul 2004 14:26:21 -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 18837 invoked from network); 21 Jul 2004 14:26:21 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 21 Jul 2004 14:26:21 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i6LEQLe3028352 for ; Wed, 21 Jul 2004 10:26:21 -0400 Received: from localhost.redhat.com (porkchop.devel.redhat.com [172.16.58.2]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i6LEQKa28956; Wed, 21 Jul 2004 10:26:20 -0400 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 70A1A2B9D; Wed, 21 Jul 2004 10:26:25 -0400 (EDT) Message-ID: <40FE7D11.6050001@gnu.org> Date: Wed, 21 Jul 2004 14:26:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-GB; rv:1.4.1) Gecko/20040217 MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [commit] Deprecate MIPS only IGNORE_HELPER_CALL Content-Type: multipart/mixed; boundary="------------060704030209000306030805" X-SW-Source: 2004-07/txt/msg00279.txt.bz2 This is a multi-part message in MIME format. --------------060704030209000306030805 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 112 FYI, this MIPS only macro won't be added to the architecture vector. Deprecating it makes that clear. Andrew --------------060704030209000306030805 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 5079 2004-07-21 Andrew Cagney * config/mips/tm-mips.h (DEPRECATED_IGNORE_HELPER_CALL): Deprecate. * mips-tdep.c (mips_dump_tdep, mips_ignore_helper): Update. * infrun.c (DEPRECATED_IGNORE_HELPER_CALL): Delete macro. (handle_inferior_event): Wrap call to deprecated IGNORE_HELPER_CALL in #ifdef. * config/mips/tm-nbsd.h: Update. Index: infrun.c =================================================================== RCS file: /cvs/src/src/gdb/infrun.c,v retrieving revision 1.169 diff -p -u -r1.169 infrun.c --- infrun.c 16 Jul 2004 19:41:48 -0000 1.169 +++ infrun.c 21 Jul 2004 14:21:43 -0000 @@ -161,14 +161,6 @@ static int may_follow_exec = MAY_FOLLOW_ #define SOLIB_IN_DYNAMIC_LINKER(pid,pc) 0 #endif -/* On MIPS16, a function that returns a floating point value may call - a library helper function to copy the return value to a floating point - register. The IGNORE_HELPER_CALL macro returns non-zero if we - should ignore (i.e. step over) this function call. */ -#ifndef IGNORE_HELPER_CALL -#define IGNORE_HELPER_CALL(pc) 0 -#endif - /* On some systems, the PC may be left pointing at an instruction that won't actually be executed. This is usually indicated by a bit in the PSW. If we find ourselves in such a state, then we step the target beyond the @@ -2341,7 +2333,19 @@ process_event_stop_test: return; } - if (step_over_calls == STEP_OVER_ALL || IGNORE_HELPER_CALL (stop_pc)) +#ifdef DEPRECATED_IGNORE_HELPER_CALL + /* On MIPS16, a function that returns a floating point value may + call a library helper function to copy the return value to a + floating point register. The DEPRECATED_IGNORE_HELPER_CALL + macro returns non-zero if we should ignore (i.e. step over) + this function call. */ + /* FIXME: cagney/2004-07-21: These custom ``ignore frame when + stepping'' function attributes (SIGTRAMP_FRAME, + DEPRECATED_IGNORE_HELPER_CALL, SKIP_TRAMPOLINE_CODE, + skip_language_trampoline frame, et.al.) need to be replaced + with generic attributes bound to the frame's function. */ + if (step_over_calls == STEP_OVER_ALL + || DEPRECATED_IGNORE_HELPER_CALL (stop_pc)) { /* We're doing a "next", set a breakpoint at callee's return address (the address at which the caller will @@ -2351,7 +2355,8 @@ process_event_stop_test: keep_going (ecs); return; } - +#endif + /* If we are in a function call trampoline (a stub between the calling routine and the real function), locate the real function. That's what tells us (a) whether we want to step Index: mips-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/mips-tdep.c,v retrieving revision 1.302 diff -p -u -r1.302 mips-tdep.c --- mips-tdep.c 20 Jul 2004 19:45:06 -0000 1.302 +++ mips-tdep.c 21 Jul 2004 14:21:44 -0000 @@ -5260,8 +5260,9 @@ mips_in_return_stub (CORE_ADDR pc, char } -/* Return non-zero if the PC is in a library helper function that should - be ignored. This implements the IGNORE_HELPER_CALL macro. */ +/* Return non-zero if the PC is in a library helper function that + should be ignored. This implements the + DEPRECATED_IGNORE_HELPER_CALL macro. */ int mips_ignore_helper (CORE_ADDR pc) @@ -5930,8 +5931,8 @@ mips_dump_tdep (struct gdbarch *current_ "mips_dump_tdep: FIRST_EMBED_REGNUM = %d\n", FIRST_EMBED_REGNUM); fprintf_unfiltered (file, - "mips_dump_tdep: IGNORE_HELPER_CALL # %s\n", - XSTRING (IGNORE_HELPER_CALL (PC))); + "mips_dump_tdep: DEPRECATED_IGNORE_HELPER_CALL # %s\n", + XSTRING (DEPRECATED_IGNORE_HELPER_CALL (PC))); fprintf_unfiltered (file, "mips_dump_tdep: IN_SOLIB_CALL_TRAMPOLINE # %s\n", XSTRING (IN_SOLIB_CALL_TRAMPOLINE (PC, NAME))); Index: config/mips/tm-mips.h =================================================================== RCS file: /cvs/src/src/gdb/config/mips/tm-mips.h,v retrieving revision 1.60 diff -p -u -r1.60 tm-mips.h --- config/mips/tm-mips.h 22 Jun 2004 00:01:04 -0000 1.60 +++ config/mips/tm-mips.h 21 Jul 2004 14:21:44 -0000 @@ -99,7 +99,7 @@ typedef struct mips_extra_func_info extern struct frame_info *setup_arbitrary_frame (int, CORE_ADDR *); /* Functions for dealing with MIPS16 call and return stubs. */ -#define IGNORE_HELPER_CALL(pc) mips_ignore_helper (pc) +#define DEPRECATED_IGNORE_HELPER_CALL(pc) mips_ignore_helper (pc) extern int mips_ignore_helper (CORE_ADDR pc); /* Definitions and declarations used by mips-tdep.c and remote-mips.c */ Index: config/mips/tm-nbsd.h =================================================================== RCS file: /cvs/src/src/gdb/config/mips/tm-nbsd.h,v retrieving revision 1.5 diff -p -u -r1.5 tm-nbsd.h --- config/mips/tm-nbsd.h 30 Apr 2004 20:52:17 -0000 1.5 +++ config/mips/tm-nbsd.h 21 Jul 2004 14:21:44 -0000 @@ -29,6 +29,6 @@ #undef IN_SOLIB_CALL_TRAMPOLINE #undef IN_SOLIB_RETURN_TRAMPOLINE #undef SKIP_TRAMPOLINE_CODE -#undef IGNORE_HELPER_CALL +#undef DEPRECATED_IGNORE_HELPER_CALL #endif /* TM_NBSD_H */ --------------060704030209000306030805--