From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sonic304-22.consmr.mail.ir2.yahoo.com (sonic304-22.consmr.mail.ir2.yahoo.com [77.238.179.147]) by sourceware.org (Postfix) with ESMTPS id BDC963858D35 for ; Tue, 21 Nov 2023 16:43:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BDC963858D35 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=yahoo.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=yahoo.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BDC963858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=77.238.179.147 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700584987; cv=none; b=FJzZSHVlr/oQ/EQM5umsIKl2MuT0hAIK5LQO4fm6Zx+u6aReIvZmw0rmHe06vtxDY3rdN8SXqBKy+w3iKxfwR1FGAS5xiLqnea81zcgHbZiFq0Nk+p8LZBu5MJdrOgokXGxulffVLpwMrIRdGLRosxeScRG7U7epqkIs+XCwJ8k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700584987; c=relaxed/simple; bh=q9JckPmlPxUJ3sVcnXRpZ794XsNJhakDR3iX6h+Phvg=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=F8xZFVyzkmTml0ftkJWwTpSED2eh3pxKUVPRB0suhqHt2+LenAEsCZuB8faKqyDyXeDGkV5IsvxzUpu9LTbOwymUJcPVfL1g3stRsKcz7h9hcmriF0nSUJDUkHnAApnMWVmzXF8mrOSHOJ2ATMErKUNOhc8jAGB4q0LowS/n83s= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s2048; t=1700584984; bh=8bRcZJTbxfPphxmmk4SExL7C6/Fq2CeT8mX0FSqVEH4=; h=From:To:Cc:Subject:Date:References:From:Subject:Reply-To; b=F7f2db3I9TkYKXFUt0wvmnJdNeu1ArZRTuRs2MwllfOTDvjlvnoI3ksfKugf9BqfmaTJeZucqMCK4kay8eAwnj9v5J3z+jbtJIeAruJKQHTlwd7bl2lc+mrJB2I5+4lxX3TW+vO0qR5GXIFu98pB6rBoC9E1R8+hjQIBIFc9+1ps5J2BlgvN57cXT27d+MKUXqFphZMwKAJTyYdYYiQqBlgJuIkwmjPnhwRFXaHfrMVSqYRE7vrJ2Qi3CFiSjUG7mDMZl2lL+WGosZeu8Oai2X+36zgrQy1f9OE1f6JNElHAojTYtqOXQ7vG8Om3mIRgqeuCCfJAuDNdrRGreTY+/A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1700584984; bh=hwgbD80MeXbw2Z2JMuqDT+uWQgqUtCGqcFUP2VAkjTj=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=HSbb9nNyquKXO2Df05FbGyW7YjpXd6SAjcqcAGf629u0apX+cp07VHJo9ftbACNPqoOkyMKAVJhSTdUioHhHq/W4AYaHonSYrCar6Kgo3euZLFJe9Tip2Gf24ThrUDfyK/zaHV9OAAJRxu+yas6/Y1szQtH+LrkbYOweL7RhWkkAOIKFUhnUPbKK3u7L6o1UGUMYmXsNUieo7gcgoXKCo48QViGH3RG6SrLgn4XaS7Fy7UGYjNGiXcqBXKnTfotgwV58h+IW0X2/HjO97zSZBFyo/oupIIxQVczxlU7VuVvOg204vxPH2MIaut3QAh9Gl1AA1rDn2aKsjJ4yRghZrw== X-YMail-OSG: kkSL6_wVM1krPj6ZNYlH5de7K_xphh_fbUx9OK86UzQUp5C6B9vOGGhlmKL0bG8 6PRJhWyKWPzlacalpgz14n5DUe10ARwgo2EB51s041WX82IRD3tvWk4HBEPrlVuf9rMAVuggJLpI 75Hxl8r7FB3xSm5uXk6uEks10EE8tsGvd_o2A4o8kUuM6UO28O.dJUBa8uCm.._UYYOCygERQ_zg VGGYA6sm6oNUPWsEZapGw4Zt2wSARMqW1Xz.XOloC01InlfLwmy8UqMMx0uERKb3bUUCzzdsCk.O EpXnMeJEdbHlLOurhAXGojGhGJicgFIxhMb8lypNfOxRg3deJlGc5k8ZHcOQlffiiVOsA4Byqvqe tteEy2Yj6VaIt7sa0XarSV4_wnTS.KzZSpVDR6dhi3XOFqDND.bSGvHk9g4I9bP1XMIn7.yGPsZQ UpivY6t0f1wO.yb7UOxpnHpcz_bht7k9Ay1L1ARuLPprem0LX6Ac3p1phDQb6GfS6iKbpxZYe4eQ lD9x7c1WhkPwzihT5OvFIb0Tcsa5M9fGGxGQds5dyAbPZ4GEb1MiLkrNLSzCZVTBBlDWP3dSEfQ4 L_9nlKQoGoj6uWlGr7QiWwpFVllx4YcionOzLH6UvJLZUr9TMyvBiJJAvP6IEE_GjV82kF8aXQ8v uYcw12izd6uopBB6WHxAWZKsdi_u5PUafzIo2.9phFz6TQPlIy9Q6ZLAOHH0bos11e9OMKss_Pq1 1ns6JEOkK4D8RcBoOfL0YVIYozoR3WYVI5QcjMrsyeI620nHj_AwGtwC6WIXJYOQVu4M4b1K1zMy b0laeZNK.oMn_0VG1SMwNdRg.xMC8gBfoQ4lPsPoqM2aAdtc4dyXvlDcFjUTKp1zSqrwWv7rplXJ GEB6ToRn65UuJT1BpnoCogYxsf8sflYvVSpxGjkFIDacIIW4dXZBEMxfMKqqaOWs1PHeQmXpzcEs E6E0hTWfOfgwnilDnLtikvWAGVTQFcaMGulirCGt_z3Dju2tPdblSweZQCpMaR6pps5jV9hT1XUk fPWkEshpwWNKqhq8evHYJBFQi8WVtfAOeIKopUXh.ykKa7.mJZAmDGXao_6PUfb4kY7ByOR1lwOc 1BzZMboFGgJA7GQ35RU8yQeK_tARPFLmXnCMbaZavexsiMKvvATwAMyXZUpJv.ZhTyghZ5TAiWRs 0Eh48XO7y8DP_enmXnqbet2iOdog7aXi0cHu23qYuNROh44ehWycO8rnW8J1mQIJDEHhhfpjYbxs fUJNaBTA5fikc1aQ7bN6iay4F.UMuk6PToIPnELHxRudvFLeQKwSqMS3wXXvvOegNIQA9UVWj0fM vyiZws0VvlD4LoiyXoFaLYmoHJj6eQX_qrzlGXqi1d7Go5idMAZjtmUmaLWBxjtmtZZ82fK75p1J 9U3hHSuvPUeSP7n4NURtyJpTzHuhLoN3d2Q77RzQVjEAhRIh.sGfeTT1O2.3roNEg1_0gtIKQ4g4 kRcEqIqpDXsbH13IRvlTk0XFT.IQtd8ztd.0_ri0osAaVLS.93eHQ2aKAgv4FQ5I01DTyBtKIsI9 RqU8jiDlULRXuRO7OrXBkuW5GtGoDEFr8Z6SVz3vDOul26iI_h2rkeEzrMyb44O3CBuheJjU9Tm7 GZSbNth8SIB6srNPC0OzJ_nYTw6ymXAJE5Ye0yz6jtPfmC84.55ZipHfY4noqadcwW7v2sEin6HI 16hoVdl85Se.B62Rs6Oj52Ks1k4ov8kOtSJw5ej90jgUzZ1OS43jQrcmF7M1Hr.kLCv3kPf2DEXX OvbKLoFE35F26QWYqFRHEdJHTjz0qS0kQIRqgRZAgN.i69lKBRQxms279n4CEAiVdGXc0PH1REjC TfFtDqNnvyLfO2XseysDBSB.nrG6D3_9Jp2Xt2wWMvifOG9gai.xDxOzSByF3xmMaw_oNUAejyy5 akGBka9XdcBaBU25kJ6VJXA1xPEqszVqZeaZL6hxqThQ0DoN3LX34ofZLvibrXHjh5_9M3G0Zg37 J.ZtbxWGLfc7iIfDGFbZN1qENypHisYvijKCPPHlltPRXdeC3El5Fe5UaPD.EYuEpmS_B0mfdxGC XRjnzd8J1ktNhPKuDx.AiPQoSYldtknMR_yVM3wWwSsxD_8D1LLiEsH3k91NMbCAtPKm8WsVS1F8 X3CeftGVy2NHwhAg9MzuNjZO3rODwZISvZ6HAFC0HWRM01pV9oCYq4IAeSEJ94oif2WZc1fy9SL6 qRMv2Qyw0FJ9ln8v8xeVw75eoWfOPgFPMzKEFXYuUoQQ- X-Sonic-MF: X-Sonic-ID: c1cbe503-9a5a-4d96-ae68-c7b17db863ff Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.ir2.yahoo.com with HTTP; Tue, 21 Nov 2023 16:43:04 +0000 Received: by hermes--production-ir2-864cfb66d6-69j7s (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID d4d711ce412d1eb777a67c8f5c95ff3b; Tue, 21 Nov 2023 16:43:01 +0000 (UTC) From: Hannes Domani To: gdb-patches@sourceware.org Cc: pedro@palves.net Subject: [PATCH v3] Fix hardware watchpoints in replay mode Date: Tue, 21 Nov 2023 17:42:41 +0100 Message-Id: <20231121164241.302-1-ssbssa@yahoo.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Antivirus: Avast (VPS 231121-0, 11/21/2023), Outbound message X-Antivirus-Status: Clean References: <20231121164241.302-1-ssbssa.ref@yahoo.de> X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Changes introduced by commit 9e8915c6cee5c37637521b424d723e990e06d597 caused a regression that meant hardware watchpoint stops would not trigger in reverse execution or replay mode. This was documented in PR breakpoints/21969. The problem is that record_check_stopped_by_breakpoint always overwrites record_full_stop_reason, thus loosing the TARGET_STOPPED_BY_WATCHPOINT value which would be checked afterwards. This commit fixes that by not overwriting the stop-reason in record_full_stop_reason if we're not stopped at a breakpoint. And the test for hw watchpoints in gdb.reverse/watch-reverse.exp actually tested sw watchpoints again, since "set can-use-hw-watchpoints 1" doesn't convert enabled watchpoints to use hardware. This is fixed by disabling said watchpoint while enabling hw watchpoints. The same is not done for gdb.reverse/watch-precsave.exp, since it's not possible to use hw watchpoints in restored recordings anyways. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=21969 --- gdb/record.c | 1 - gdb/testsuite/gdb.reverse/watch-reverse.exp | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gdb/record.c b/gdb/record.c index f7c82665b05..88235e36da7 100644 --- a/gdb/record.c +++ b/gdb/record.c @@ -248,7 +248,6 @@ record_check_stopped_by_breakpoint (const address_space *aspace, return 1; } - *reason = TARGET_STOPPED_BY_NO_REASON; return 0; } diff --git a/gdb/testsuite/gdb.reverse/watch-reverse.exp b/gdb/testsuite/gdb.reverse/watch-reverse.exp index 6b81a6fdf88..a7126ac9b1d 100644 --- a/gdb/testsuite/gdb.reverse/watch-reverse.exp +++ b/gdb/testsuite/gdb.reverse/watch-reverse.exp @@ -118,8 +118,12 @@ gdb_test "continue" \ ".*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = -1.*ival3 = count; ival4 = count;.*" \ "watchpoint hit in reverse, fifth time" +gdb_test_no_output "disable \$bpnum" "disable non-hw watchpoint" + gdb_test_no_output "set can-use-hw-watchpoints 1" "enable hw watchpoints" +gdb_test_no_output "enable \$bpnum" "enable hw watchpoint" + ### ### ### -- 2.35.1