From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9652 invoked by alias); 23 Jul 2004 19:38:32 -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 9645 invoked from network); 23 Jul 2004 19:38:32 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 23 Jul 2004 19:38:32 -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 i6NJcVe3002796 for ; Fri, 23 Jul 2004 15:38:31 -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 i6NJcVa23776; Fri, 23 Jul 2004 15:38:31 -0400 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 0750C2B9D; Fri, 23 Jul 2004 15:38:16 -0400 (EDT) Message-ID: <41016927.9040300@gnu.org> Date: Fri, 23 Jul 2004 19:38: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 Cc: Mark Kettenis Subject: Re: [commit] Deprecate MIPS only IGNORE_HELPER_CALL References: <40FE7D11.6050001@gnu.org> <200407230059.i6N0x90x004349@elgar.kettenis.dyndns.org> <41012BAB.8070803@gnu.org> In-Reply-To: <41012BAB.8070803@gnu.org> Content-Type: multipart/mixed; boundary="------------070001060908090801080304" X-SW-Source: 2004-07/txt/msg00331.txt.bz2 This is a multi-part message in MIME format. --------------070001060908090801080304 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 35 I've also checked this in. Andrew --------------070001060908090801080304 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 1447 2004-07-23 Andrew Cagney * infrun.c (handle_inferior_event): Separate the STEP_OVER_ALL and DEPRECATED_IGNORE_HELPER_CALL cases, only #ifdef the latter. Index: infrun.c =================================================================== RCS file: /cvs/src/src/gdb/infrun.c,v retrieving revision 1.170 diff -p -u -r1.170 infrun.c --- infrun.c 21 Jul 2004 14:23:36 -0000 1.170 +++ infrun.c 23 Jul 2004 19:12:21 -0000 @@ -2344,8 +2344,7 @@ process_event_stop_test: 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)) + if (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 @@ -2356,6 +2355,16 @@ process_event_stop_test: return; } #endif + if (step_over_calls == STEP_OVER_ALL) + { + /* We're doing a "next", set a breakpoint at callee's return + address (the address at which the caller will + resume). */ + insert_step_resume_breakpoint (get_prev_frame (get_current_frame ()), + ecs); + keep_going (ecs); + return; + } /* If we are in a function call trampoline (a stub between the calling routine and the real function), locate the real --------------070001060908090801080304--