From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id QJVoHDCEa19WYQAAWB0awg (envelope-from ) for ; Wed, 23 Sep 2020 13:21:52 -0400 Received: by simark.ca (Postfix, from userid 112) id 700D41EF4B; Wed, 23 Sep 2020 13:21:52 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 5447E1E509 for ; Wed, 23 Sep 2020 13:21:51 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E47713950C24; Wed, 23 Sep 2020 17:21:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E47713950C24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1600881710; bh=CJR3rouCBRgw2MIUrLvQp579CWB57WWvKsyPTxK63qE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=isM+33YuRvI9e3Aw3N2uPN7Onyzm0D750WN5b8tlYzMuy0sTZtaNTPA5B0h47GNhW OIGc5HV86UvHuCWUET+idmO1zd/HHQasgdFRJehwiXR/uw09qokf+JKK70oiRLO/AZ Z1rk28Fj+yBW7ko2e6/0AKncoi5K9SdrT7OS6PNM= Received: from sonic307-54.consmr.mail.ir2.yahoo.com (sonic307-54.consmr.mail.ir2.yahoo.com [87.248.110.31]) by sourceware.org (Postfix) with ESMTPS id 460B13937421 for ; Wed, 23 Sep 2020 17:21:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 460B13937421 X-YMail-OSG: AqVP9AIVM1n.IVkqEJ2xy87qDOP1xfbiMc__n9NSu7CQWijzu3Veg7yqwIDyRWH op7Zh8coCEhnivWhDA2b2Z.hsklaA.MvVot.hQ_bdj6DogV9nLKBTvUIQuI7leuvBsRZHEaX27tw p5691RYJBseD8UQifZHjRGAgGE9ES0fWeZTMA5HnbAlWJZ6wRIeXUMdUM2a5eq4UPZzzSYxA28Ib Anh5ntj7d68lKy3JBi6c1941EYeALnSV5hm7R6_c8vxL.twIPpI_loksy9qaLHc.G6HlXf9eb4PT u3Vt1Qr0nmTbQlCeBK2RfWksrjEBaeLXLXWnmduB.7XwDxDMSb3EKqi3ahgpyasXLEReaPM5IGBx nC_MuAqdVj1SMFLqE_AbR_M6DEXl2LV7EecB8R6UpeDuaCb6o7wEfQGb3gXwKLvxBgJkWdemLmPR oYWeJy6To.QTZpHDQ.VoiQ2ltjIcD_Zu5eriFH9FgLaUVlU7EEpHayqHkiHVbVax07iz3y8xzVcd zfzoJqx80yLx4dduQyA7vepHrxYo5iqDzPYTApnHJizwNVm5CYF0D9zKDu79bFSFisWmWpByw3OQ l3mOY5nT3wJzk3Ca5wLSjoQ0NA7RkHT8u5cKU_FBtOLHfBnCv4T13KucbJOb4RR6N32.cHsajpZz HvucMDrHKPaEDbEW52QdHQ5BPRlnEaJP36h4snIb.UI2fer.6_x5gWV.szBsiIbIWa9A_720qDkF bh5j04GS7_M15eFB6QJoKmiiDEe2QUskxc9W6O8BVGMeGE4sV_IfWD8WSxL0YU_s6Ltaa7LoVrbe itZ.1NkCzh1RNeCOxNowEO2E4RiW4FqZg1Q8qlzwoP70AzKb.iObWyr3Sv_RtRSHzsi65KSPg94W jYJP24K536a68yl.OoF.atmz9IvE2o9WBuWVxSJyQ0qAQTny2szCn0A1wYUHPso7rEjHt30qAgVr emTqT1AnsxFO6WnA3laKoUZ6z0Yanetd6ml1y2GKn1s_Gu25Gut6Mea2eTuhzmMUnSowb_NS6mpK 5hAxXmBzA6RWxt1P0kMhvnh.0tN2At8Cxg7eQiI6zSu3GrP.n1BSqiBdH_MAW9UB3pCNdtpPxejl FngyUPXAKxin.QxWPBUWrXRU4acB2g8VYHj08uWbGKeb3YX6Lf9VQPjXJlRDbwc4h07NnBdnfSXE cJaDiDDmqEZx8r0vgHQQqu5zqfej.UV1_2ubV9q1wsnjFmnVZxMiEogX9449F8zuTL0KS74Up1uR 4pNWQ3_kTwU4.zIN.CfXc7Irv1zP4tqGDpnBBcKXiZuCVFzzWopNl8ohWbt6x2FEtvlg1k0adlnP I3ZJqmkPUjnJlAxZHOgzTPjZx1TSlErTU0vWXJhS7WwWYOwtB9JYIvxLbvMo.spFt7P7lsuBvr8L YGzzEolyy2hQ3P63ODaFAfYdWVvsl0_Cv8qs0FgTOhWyHjg23P7rCzkdb0ts4fyx9i6gUcudMZh. zj0PUjHphdPstzWJFtu0Ifw1liS85LMmuFalsfEg5PCCnOXxHLFxd910wobtpEB3FhbA_R7txeNH iEQ-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic307.consmr.mail.ir2.yahoo.com with HTTP; Wed, 23 Sep 2020 17:21:47 +0000 Received: by smtp405.mail.ir2.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 09a9a830d4366d0a19bd006c6c28dbf6; Wed, 23 Sep 2020 17:21:43 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 2/3] Revert "Fix ctrl-c when debugging WOW64 processes" Date: Wed, 23 Sep 2020 19:21:21 +0200 Message-Id: <20200923172122.2089-2-ssbssa@yahoo.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200923172122.2089-1-ssbssa@yahoo.de> References: <20200923172122.2089-1-ssbssa@yahoo.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Antivirus: Avast (VPS 200923-0, 09/23/2020), Outbound message X-Antivirus-Status: Clean X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Hannes Domani via Gdb-patches Reply-To: Hannes Domani Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" This is no longer needed, since breakpoints in 64bit code can now be handled by gdb. 2020-09-23 Hannes Domani * windows-nat.c (ctrl_c_handler): Remove special handling for WOW64 processes. --- gdb/windows-nat.c | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 1e8e21446f..f9172c3a7f 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -71,7 +71,6 @@ #include "gdbsupport/pathstuff.h" #include "gdbsupport/gdb_wait.h" #include "nat/windows-nat.h" -#include "gdbsupport/symbol.h" using namespace windows_nat; @@ -234,9 +233,6 @@ static std::vector thread_list; /* Counts of things. */ static int saw_create; static int open_process_used = 0; -#ifdef __x86_64__ -static void *wow64_dbgbreak; -#endif /* User options. */ static bool new_console = false; @@ -1523,36 +1519,9 @@ ctrl_c_handler (DWORD event_type) if (!new_console && !attach_flag) return TRUE; -#ifdef __x86_64__ - if (wow64_process) - { - /* Call DbgUiRemoteBreakin of the 32bit ntdll.dll in the target process. - DebugBreakProcess would call the one of the 64bit ntdll.dll, which - can't be correctly handled by gdb. */ - if (wow64_dbgbreak == nullptr) - { - CORE_ADDR addr; - if (!find_minimal_symbol_address ("ntdll!DbgUiRemoteBreakin", - &addr, 0)) - wow64_dbgbreak = (void *) addr; - } - - if (wow64_dbgbreak != nullptr) - { - HANDLE thread = CreateRemoteThread (current_process_handle, NULL, - 0, (LPTHREAD_START_ROUTINE) - wow64_dbgbreak, NULL, 0, NULL); - if (thread) - CloseHandle (thread); - } - } - else -#endif - { - if (!DebugBreakProcess (current_process_handle)) - warning (_("Could not interrupt program. " - "Press Ctrl-c in the program console.")); - } + if (!DebugBreakProcess (current_process_handle)) + warning (_("Could not interrupt program. " + "Press Ctrl-c in the program console.")); /* Return true to tell that Ctrl-C has been handled. */ return TRUE; -- 2.27.0