From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id E1A833858D34 for ; Sun, 14 Apr 2024 19:37:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E1A833858D34 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 E1A833858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713123432; cv=none; b=C7xYSPbMXTHegHLDSbMJERli95+SkJeP8h47LDbk64JtDM0AwOORbT1Zzr5dv+Ve4gEExWZugqBhiqYgrPT1BJTUjlm3W1oE7XtyHoS59ZlZoOlstqQ59ReZ7/Wm/TisPUTEnGSf7GXhE2qx3xSWVTgMFfR29oSErYWhVj/pXro= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713123432; c=relaxed/simple; bh=XI+oz8pG+3m0saIhGr/vqBy5aitohgqHzCdgCk8+Kns=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=aNerOyePsHB5exIHO7Pi6vyyYIxU+j6CHRopcOFjx415/Py1+To//gvkdzcqWmVvinh5gFJnXXAl9xltX+lvf8eLXq5JKA6u/wzLvFUhUdD37HmmNeRy5q48Rt3qGAka1Y5vSx8uEpRM27RTVGEpd9c0nI7sXD8o075mtuIUCT8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-516d0162fa1so3040299e87.3 for ; Sun, 14 Apr 2024 12:37:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713123427; x=1713728227; 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=iwj9ydf8XDlJl7Fpfui4sGDc4dEymXQAIkzxP61TnXM=; b=hwO6lUlPOBDMGzWXhEkM3ykPm98KVCXvHEoqMccqdsakPwSrq5SDF8N9YxUrjeMcdq hg52lANWtAUNLmBAh5rqScaMJS8KSosG5I/ElEScZLVe96rodlfFUhLW/Ppprsf0D4Et vinKaAslNz6wdlKgvMYw9/bno7B9VbKjDDJy2/sBxeG/Ho/OLBZgjN8xVpXwdlHTCtoc z4HAO8smMO5R+5EFCfvzjT5w/LWrIaB5RuzhGhRH19LjH1d8qQVrHuotB4gDCF4Wruqd 3rl1goebDSkzI7fEUZdt16IvY3EPPlXAu6esuDKv4hQmf51HA0St0a8cKxmMACkYAXpF h3TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713123427; x=1713728227; 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=iwj9ydf8XDlJl7Fpfui4sGDc4dEymXQAIkzxP61TnXM=; b=wJ5jmrGfpaEYy5dAcbFvpbXl11A2FnJj1YnaSamyEbvf6lkh8DnIVd1JHaOz4GRCcW YylRDF7MlbfZw2/17+9cC+iaMj+zjWbQ1ceU1p4VmhLhz13zI9ABV34dAtQRLbPimO41 b1V48QOIL7RmwqonuydhMky7fTb9Dx2iVdONtyjfJUdJZB8DuGrUfZ9PnUNPEqHdzhw3 1gtHi4Gsnc081AbJC91DcKZrpOQfXVw7tWfMbvKQlW8wFLWjco2iUGtXrS1jmmzWW+PU LSqQFuopKf2W21+c8ixPIHzJn9ooaFchywBiVg/kgql6/XAqfrTZpMR4trFFKlHtm71v foyQ== X-Gm-Message-State: AOJu0YwhYQ2RopsGZe5QAAGoTdILIR2H2LxlcCvKksN7d1XMj1ewfRML L/VroYxxvPppVaB84XQDcTaDI2yN1hlUTTlq2jxV7PbcNv43e/mxqAWtk13VsOA= X-Google-Smtp-Source: AGHT+IEWKGU19NlL8L4XTcBx8Kxe7OJZe4vKcdszjvBWxrxywkLu90GjKHyuJ/YEmzRyrUsFESSjJQ== X-Received: by 2002:a05:6512:1246:b0:518:b43e:78ec with SMTP id fb6-20020a056512124600b00518b43e78ecmr3712429lfb.28.1713123427191; Sun, 14 Apr 2024 12:37:07 -0700 (PDT) Received: from localhost.localdomain (195-240-134-144.fixed.kpn.net. [195.240.134.144]) by smtp.gmail.com with ESMTPSA id k7-20020a1709067ac700b00a5238568e7csm3360816ejo.110.2024.04.14.12.37.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 12:37:06 -0700 (PDT) From: Alex Chronopoulos To: gdb-patches@sourceware.org Cc: Alex Chronopoulos Subject: [PATCH v3] Change message when reaching end of reverse history. Date: Sun, 14 Apr 2024 21:36:53 +0200 Message-ID: <20240414193653.3289837-1-achronop@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 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 List-Id: 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 --- 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..a57cfec62be 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..dc7666e2f1a 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 -wrap "End of recorded history; following steps.* end of main .*" { 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 -wrap "End of recorded history; following steps.* end of main .*" { 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..28edddf3517 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 -wrap "End of recorded history; following steps will.* end of main .*" { 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..3d004cf3fee 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 -wrap "End of recorded history; following steps will be.* end main .*" { pass "go to end of main forward" } } -- 2.42.0