From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 51546 invoked by alias); 2 Nov 2015 19:45:18 -0000 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 Received: (qmail 51520 invoked by uid 89); 2 Nov 2015 19:45:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 02 Nov 2015 19:45:17 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 3A023220 for ; Mon, 2 Nov 2015 19:36:20 +0000 (UTC) Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tA2JaAQ1009459 for ; Mon, 2 Nov 2015 14:36:19 -0500 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 08/11] [C++/mingw] Simplify first chance exception handling Date: Mon, 02 Nov 2015 19:45:00 -0000 Message-Id: <1446492970-21432-9-git-send-email-palves@redhat.com> In-Reply-To: <1446492970-21432-1-git-send-email-palves@redhat.com> References: <1446492970-21432-1-git-send-email-palves@redhat.com> X-SW-Source: 2015-11/txt/msg00038.txt.bz2 I can't figure out why we treat first chance exceptions any different here. We set last_sig to 1, and then call windows_resume passing signal==1, so the DBG_EXCEPTION_NOT_HANDLED code path in win32_resume is taken: ~~~ if (sig != GDB_SIGNAL_0) { if (current_event.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) { OUTMSG (("Cannot continue with signal %d here.\n", sig)); } else if (sig == last_sig) continue_status = DBG_EXCEPTION_NOT_HANDLED; else OUTMSG (("Can only continue with recieved signal %d.\n", last_sig)); } ~~~ Fix this by removing this special casing. gdbserver also goes straight to continuing with DBG_EXCEPTION_NOT_HANDLED, AFAICS. gdb/ChangeLog: 2015-11-01 Pedro Alves * windows-nat.c (handle_exception): Return 0 for first chance exceptions. (get_windows_debug_event): Adjust. --- gdb/windows-nat.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 2e12493..cfbd74a 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -1124,7 +1124,7 @@ handle_exception (struct target_waitstatus *ourstatus) default: /* Treat unhandled first chance exceptions specially. */ if (current_event.u.Exception.dwFirstChance) - return -1; + return 0; printf_unfiltered ("gdb: unknown target exception 0x%08x at %s\n", (unsigned) current_event.u.Exception.ExceptionRecord.ExceptionCode, host_address_to_string ( @@ -1491,19 +1491,10 @@ get_windows_debug_event (struct target_ops *ops, "EXCEPTION_DEBUG_EVENT")); if (saw_create != 1) break; - switch (handle_exception (ourstatus)) - { - case 0: - continue_status = DBG_EXCEPTION_NOT_HANDLED; - break; - case 1: - thread_id = current_event.dwThreadId; - break; - case -1: - last_sig = 1; - continue_status = -1; - break; - } + if (handle_exception (ourstatus)) + thread_id = current_event.dwThreadId; + else + continue_status = DBG_EXCEPTION_NOT_HANDLED; break; case OUTPUT_DEBUG_STRING_EVENT: /* Message from the kernel. */ @@ -1529,10 +1520,7 @@ get_windows_debug_event (struct target_ops *ops, if (!thread_id || saw_create != 1) { - if (continue_status == -1) - windows_resume (ops, minus_one_ptid, 0, 1); - else - CHECK (windows_continue (continue_status, -1, 0)); + CHECK (windows_continue (continue_status, -1, 0)); } else { -- 1.9.3