From patchwork Sun Apr 7 19:55:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Chronopoulos X-Patchwork-Id: 88142 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 17071385828B for ; Sun, 7 Apr 2024 19:56:10 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id ADC5D3858D20 for ; Sun, 7 Apr 2024 19:55:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ADC5D3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org ADC5D3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::632 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712519748; cv=none; b=TL0jlrZcduLDwG9lAxoLkD6oGyvig3HvL9wx6ozdZd/7UY1zZjvhHdQ1+qnohxMqfsJsF0m3tBDZPHmMQJ0l57oraORptYDYBt7Z1R0KlZ6s/M/oNxZnIoXLCsnvxuKDuLmTfHYFAvqCHennIAUJ5LBezBqcEd1exCpPt5rhWyA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712519748; c=relaxed/simple; bh=JAiE0rGfuKzpTwJClI3Jrh95lra+CXg9yR2SCrt/G5Q=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=EpPpkceaw6ZQGOgYhwrtMVlS3chDwTaBn+eyjyyPU4UIGLK/b66YjUf6Tn0fR/dGoFeYVNV47qpVGUzmGcqHdXaBaBRBLVHXzf2Y+cvApRKRO5m3SZnkNpb+3xBXj06ZiR/YS0HFOlBgm2Y3oZh8WF5biEG1ByzIuJzlPDEWjC0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a51d0dda061so54400566b.1 for ; Sun, 07 Apr 2024 12:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712519743; x=1713124543; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=QPvtzeI+qnXqsVwiDUgBobegAK4r6byTqFLKThV/syQ=; b=Pa30TBaFJB3wBIy1CX85sgTCuhfaQ72vlZsX2qz3jBCrcl+v0dosPyiUQ/aX38n28X EfnYcQ0KrpjxKikERD559Gag/1yPqpFRjwuXbWr17Mrki+MRVF0ttRz2qtweOIJvHlaM khaEjjiFmyHhTTfGcsLsHk5FVy7LNsOiGjHlvS1k6S7NXWGT8rU2EeGc153AQ88U2cUS qHvh/2hn6+1zp8Nqu+4bwbPZxYMqXMtaguG1z1EBm7vUoR/g+NIa+SvTVDmP0i4yhv3y 2TwDwmwHdqHmt3RHx+XdUBkA7tC98buQx+XqxCyyfFkIy1kdPjNWef3fvdi96I8YjNlb rq1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712519743; x=1713124543; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QPvtzeI+qnXqsVwiDUgBobegAK4r6byTqFLKThV/syQ=; b=DI4TSpvH3l39Zwso2OD6WsEyCzRdiQb6jGyBEw1u5ylXr4gTLdsp9bjt5Gbjt+fmzQ ZXF5OL7kJojMU+UxaSH9joD86FX8r3mz+dxeALi6lZ52j0N8Pn1IYPFFuOW3E9BaGCbb L3VEOsAg5z6xAb8DJyt+mGbSMwYmspVIsZdcReLLV58/ESoPDF0dbFPbEJK5sQO5o4yI q09OUPr5OMYgGaztDDiZH4pVArRz4NxxAs8S9KUVQVPrWOceNsAiiGIJlv0r5NfRJzSy Idt8J2B/x+DRgePa3OeWMZEdElNWl/U/E2TrpRBHaLr9v8ZBbzCXqWzESrOH8ISp0yph /eMA== X-Gm-Message-State: AOJu0Yzxb88+PIOuVIdRprKm64QYEjStui8VSGHcquJFFr+XsQMGCjhi tgr/zqHFbqZ0bZ4kojEZi+eGc9FBc4+EvB6pjWSDDjLlh6E86keqS+h/lk9lRLA= X-Google-Smtp-Source: AGHT+IE6xLsY1BNaCAzsNiV9tGtiQGRMUrbGJc87AgaslMm3O81jKH3cW9k8gKc1urKR/MvYf/tnNQ== X-Received: by 2002:a17:907:7e85:b0:a51:ab81:6062 with SMTP id qb5-20020a1709077e8500b00a51ab816062mr7791159ejc.30.1712519743242; Sun, 07 Apr 2024 12:55:43 -0700 (PDT) Received: from localhost.localdomain (195-240-134-144.fixed.kpn.net. [195.240.134.144]) by smtp.gmail.com with ESMTPSA id se1-20020a170906ce4100b00a51a9d87570sm3205389ejb.17.2024.04.07.12.55.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 12:55:42 -0700 (PDT) From: Alex Chronopoulos To: gdb-patches@sourceware.org Cc: Alex Chronopoulos Subject: [PATCH v2] Change message when reaching end of reverse history. Date: Sun, 7 Apr 2024 21:55:01 +0200 Message-ID: <20240407195501.3240775-1-achronop@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 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, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org In a record session, when we move backward, GDB switches from normal execution to simulation. Moving forward again, the emulation continues until the end of the reverse history. When the end is reached, the execution stops, and a warning message is shown. This message has been modified to indicate that the forward emulation has reached the end, but the execution can continue as normal, and the recording will also continue. Before this patch, the warning message shown in that case was the same as in the reverse case. This meant that when the end of history was reached in either backward or forward emulation, the same message was displayed: "No more reverse-execution history." This message remains for backward emulation. However, in forward emulation, it has been modified to: "End of recorded history; following steps will be added to history." The reason for this change is that the initial message was deceiving, for the forward case, making the user believe that forward debugging could not continue. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31224 Reviewed-By: Eli Zaretskii Reviewed-By: Guinevere Larsen --- gdb/NEWS | 5 ++++ gdb/infrun.c | 8 ++++- gdb/testsuite/gdb.btrace/non-stop.exp | 30 ++++++++++++------- gdb/testsuite/gdb.reverse/break-precsave.exp | 4 +-- gdb/testsuite/gdb.reverse/break-reverse.exp | 2 +- .../gdb.reverse/machinestate-precsave.exp | 2 +- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index 2638b3e0d9c..f2e85776a53 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -13,6 +13,11 @@ the background, resulting in faster startup. This can be controlled using "maint set dwarf synchronous". +* In a record session, when a forward emulation reaches the end of the reverse + history, the warning message has been changed to indicate that the end of the + history has been reached. It also specifies that the forward execution can + continue, and the recording will also continue. + * Changed commands disassemble diff --git a/gdb/infrun.c b/gdb/infrun.c index bbb98f6dcdb..c0f037c11a2 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -9244,8 +9244,14 @@ print_no_history_reason (struct ui_out *uiout) { if (uiout->is_mi_like_p ()) uiout->field_string ("reason", async_reason_lookup (EXEC_ASYNC_NO_HISTORY)); + else if (execution_direction == EXEC_FORWARD) + uiout->text ("\nEnd of recorded history; following steps will be added to " + "history.\n"); else - uiout->text ("\nNo more reverse-execution history.\n"); + { + gdb_assert (execution_direction == EXEC_REVERSE); + uiout->text ("\nNo more reverse-execution history.\n"); + } } /* Print current location without a level number, if we have changed diff --git a/gdb/testsuite/gdb.btrace/non-stop.exp b/gdb/testsuite/gdb.btrace/non-stop.exp index 62c940e4cd6..e4c91b793ae 100644 --- a/gdb/testsuite/gdb.btrace/non-stop.exp +++ b/gdb/testsuite/gdb.btrace/non-stop.exp @@ -79,7 +79,7 @@ proc gdb_cont_to_bp_line { line threads nthreads } { $nthreads } -proc gdb_cont_to_no_history { threads cmd nthreads } { +proc gdb_cont_to_no_history_backward { threads cmd nthreads } { gdb_cont_to $threads $cmd \ [multi_line \ "No more reverse-execution history\." \ @@ -89,6 +89,16 @@ proc gdb_cont_to_no_history { threads cmd nthreads } { $nthreads } +proc gdb_cont_to_no_history_forward { threads cmd nthreads } { + gdb_cont_to $threads $cmd \ + [multi_line \ + "End of recorded history; following steps will be added to history\." \ + "\[^\\\r\\\n\]*" \ + "\[^\\\r\\\n\]*" \ + ] \ + $nthreads +} + # trace the code between the two breakpoints with_test_prefix "prepare" { gdb_cont_to_bp_line "$srcfile:$bp_1" all 2 @@ -176,14 +186,14 @@ with_test_prefix "reverse-step" { with_test_prefix "continue" { with_test_prefix "thread 1" { with_test_prefix "continue" { - gdb_cont_to_no_history 1 "continue" 1 + gdb_cont_to_no_history_forward 1 "continue" 1 gdb_test "thread apply 1 info record" \ ".*Recorded \[0-9\]+ instructions \[^\\\r\\\n\]*" gdb_test "thread apply 2 info record" \ ".*Replay in progress\. At instruction 5\." } with_test_prefix "reverse-continue" { - gdb_cont_to_no_history 1 "reverse-continue" 1 + gdb_cont_to_no_history_backward 1 "reverse-continue" 1 gdb_test "thread apply 1 info record" \ ".*Replay in progress\. At instruction 1\." gdb_test "thread apply 2 info record" \ @@ -193,14 +203,14 @@ with_test_prefix "continue" { with_test_prefix "thread 2" { with_test_prefix "continue" { - gdb_cont_to_no_history 2 "continue" 1 + gdb_cont_to_no_history_forward 2 "continue" 1 gdb_test "thread apply 1 info record" \ ".*Replay in progress\. At instruction 1\." gdb_test "thread apply 2 info record" \ ".*Recorded \[0-9\]+ instructions \[^\\\r\\\n\]*" } with_test_prefix "reverse-continue" { - gdb_cont_to_no_history 2 "reverse-continue" 1 + gdb_cont_to_no_history_backward 2 "reverse-continue" 1 gdb_test "thread apply 1 info record" \ ".*Replay in progress\. At instruction 1\." gdb_test "thread apply 2 info record" \ @@ -215,8 +225,8 @@ with_test_prefix "no progress" { gdb_test "thread apply 1 record goto end" ".*" gdb_test "thread apply 2 record goto begin" ".*" - gdb_cont_to_no_history 1 "continue" 1 - gdb_cont_to_no_history 1 "step" 1 + gdb_cont_to_no_history_forward 1 "continue" 1 + gdb_cont_to_no_history_forward 1 "step" 1 gdb_test "thread apply 1 info record" \ ".*Recorded \[0-9\]+ instructions \[^\\\r\\\n\]*" gdb_test "thread apply 2 info record" \ @@ -227,8 +237,8 @@ with_test_prefix "no progress" { gdb_test "thread apply 1 record goto begin" ".*" gdb_test "thread apply 2 record goto end" ".*" - gdb_cont_to_no_history 2 "continue" 1 - gdb_cont_to_no_history 2 "step" 1 + gdb_cont_to_no_history_forward 2 "continue" 1 + gdb_cont_to_no_history_forward 2 "step" 1 gdb_test "thread apply 1 info record" \ ".*Replay in progress\. At instruction 1\." gdb_test "thread apply 2 info record" \ @@ -238,7 +248,7 @@ with_test_prefix "no progress" { with_test_prefix "all" { gdb_test "thread apply all record goto begin" ".*" - gdb_cont_to_no_history all "continue" 2 + gdb_cont_to_no_history_forward all "continue" 2 gdb_test "thread apply 1 info record" \ ".*Recorded \[0-9\]+ instructions \[^\\\r\\\n\]*" gdb_test "thread apply 2 info record" \ diff --git a/gdb/testsuite/gdb.reverse/break-precsave.exp b/gdb/testsuite/gdb.reverse/break-precsave.exp index b9d94681247..89ce9d7e854 100644 --- a/gdb/testsuite/gdb.reverse/break-precsave.exp +++ b/gdb/testsuite/gdb.reverse/break-precsave.exp @@ -73,7 +73,7 @@ proc precsave_tests {} { -re ".*Breakpoint $decimal,.*$srcfile:$end_location.*$gdb_prompt $" { pass "go to end of main forward" } - -re "No more reverse-execution history.* end of main .*$gdb_prompt $" { + -re "End of recorded history; following steps will be added to history.* end of main .*$gdb_prompt $" { pass "go to end of main forward" } } @@ -103,7 +103,7 @@ proc precsave_tests {} { -re ".*Breakpoint $decimal,.*$srcfile:$end_location.*$gdb_prompt $" { pass "end of record log" } - -re "No more reverse-execution history.* end of main .*$gdb_prompt $" { + -re "End of recorded history; following steps will be added to history.* end of main .*$gdb_prompt $" { pass "end of record log" } } diff --git a/gdb/testsuite/gdb.reverse/break-reverse.exp b/gdb/testsuite/gdb.reverse/break-reverse.exp index 1dd327ca654..e9c799a506d 100644 --- a/gdb/testsuite/gdb.reverse/break-reverse.exp +++ b/gdb/testsuite/gdb.reverse/break-reverse.exp @@ -80,7 +80,7 @@ gdb_test_multiple "continue" "end of record log" { -re ".*Breakpoint $decimal,.*$srcfile:$end_location.*$gdb_prompt $" { pass "end of record log" } - -re "No more reverse-execution history.* end of main .*$gdb_prompt $" { + -re "End of recorded history; following steps will be added to history.* end of main .*$gdb_prompt $" { pass "end of record log" } } diff --git a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp index 19c5934bfdf..6b3a949e23a 100644 --- a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp +++ b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp @@ -85,7 +85,7 @@ gdb_test_multiple "continue" "go to end of main forward" { -re ".*Breakpoint $decimal,.*$srcfile:$endmain.*$gdb_prompt $" { pass "go to end of main forward" } - -re "No more reverse-execution history.* end main .*$gdb_prompt $" { + -re "End of recorded history; following steps will be added to history.* end main .*$gdb_prompt $" { pass "go to end of main forward" } }