From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27165 invoked by alias); 7 Jul 2009 08:52:25 -0000 Received: (qmail 27156 invoked by uid 22791); 7 Jul 2009 08:52:24 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (212.99.106.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 07 Jul 2009 08:52:18 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 5A033290013 for ; Tue, 7 Jul 2009 10:52:15 +0200 (CEST) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dgq0C8y6m8VJ for ; Tue, 7 Jul 2009 10:52:14 +0200 (CEST) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id A8960290008 for ; Tue, 7 Jul 2009 10:52:14 +0200 (CEST) Message-Id: From: Tristan Gingold To: gdb-patches@sourceware.org Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v935.3) Subject: [RFA Darwin]: handle simultaneous signal posting and single-stepping Date: Tue, 07 Jul 2009 08:52:00 -0000 X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-07/txt/msg00179.txt.bz2 Hi, in some cases (when a signal was received when the execution was stopped on a breakpoint), gdb resumes the inferior with both step=1 and signal != 0. This case wasn't handled correctly by darwin-nat (as the native API isn't able to do that). This patch fixes the issue by first single-stepping and keeping in mind that a signal has to be posted. This patch fixes about 10 regressions (that resulted in timeout). Tristan. 2009-07-07 Tristan Gingold * darwin-nat.c (darwin_resume_thread): Handle simultaneous single-step and signal. * darwin-nat.h (struct private_thread_info): Add signal_to_send field. Improve comment. Index: darwin-nat.c =================================================================== RCS file: /cvs/src/src/gdb/darwin-nat.c,v retrieving revision 1.13 diff -u -p -r1.13 darwin-nat.c --- darwin-nat.c 22 Jun 2009 08:24:29 -0000 1.13 +++ darwin-nat.c 7 Jul 2009 08:50:45 -0000 @@ -640,6 +640,19 @@ darwin_resume_thread (struct inferior *i (3, _("darwin_resume_thread: state=%d, thread=0x%x, step=%d nsignal=%d\n"), thread->msg_state, thread->gdb_port, step, nsignal); + if (step && nsignal) + { + /* We can't handle this in one step. The expected behaviour is single + step first and then post the signal. */ + thread->signal_to_send = nsignal; + nsignal = 0; + } + else if (thread->signal_to_send && !step) + { + nsignal = thread->signal_to_send; + thread->signal_to_send = 0; + } + switch (thread->msg_state) { case DARWIN_MESSAGE: Index: darwin-nat.h =================================================================== RCS file: /cvs/src/src/gdb/darwin-nat.h,v retrieving revision 1.3 diff -u -p -r1.3 darwin-nat.h --- darwin-nat.h 19 Jun 2009 14:30:30 -0000 1.3 +++ darwin-nat.h 7 Jul 2009 08:50:45 -0000 @@ -80,9 +80,13 @@ struct private_thread_info /* True if this thread is single-stepped. */ unsigned char single_step; - /* True if a signal was manually sent to the thread. */ + /* True if a signal was manually sent to the thread. In this case, we don't + report that a signal was posted. */ unsigned char signaled; + /* Signal to be sent. Used to handle simultaneous step and signal. */ + unsigned char signal_to_send; + /* The last exception received. */ struct darwin_exception_msg event; };