From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 744E53858C83 for ; Sun, 23 Apr 2023 17:21:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 744E53858C83 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682270493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i/1Wve7evPZqpUnvldj/1TxcWGB3xx5r9sXIm00RhUo=; b=Q+hDFcOHm0GeFXhtolBR/Cb1Bmiqdk7Gwp/Vk4d9eU/XDGMHJo4a1U86QUHTZWglDCzy0g KgMxYeO3l6bzX4WBWnVVRxgYtKx7zlz2DVCe+CeiTMOTlBw51kb04+QfsF40ayfrb+3MEM 4w9304MMeHofZsdmZZd6LmjI9mPGpdc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-117-3AWViovGOJO_JNaMO2XP_w-1; Sun, 23 Apr 2023 13:21:32 -0400 X-MC-Unique: 3AWViovGOJO_JNaMO2XP_w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1203A185A78B for ; Sun, 23 Apr 2023 17:21:32 +0000 (UTC) Received: from guittard.uglyboxes.com (unknown [10.2.17.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id C557F4C83A for ; Sun, 23 Apr 2023 17:21:31 +0000 (UTC) From: Keith Seitz To: gdb-patches@sourceware.org Subject: [PATCH] Allow strings with printf/eval Date: Sun, 23 Apr 2023 10:21:31 -0700 Message-Id: <20230423172131.1104908-1-keiths@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: If a user attempts to use a string with either `printf' or `eval' commands, gdb returns an error (inferior not running): (gdb) printf "%s\n", "hello" evaluation of this expression requires the target program to be active However, the parser can certainly handle this case: (gdb) p "hello" $1 = "hello" This discrepancy occurs because printf_c_string does not handle this specific case. The passed-in value that we are attempting to print as a string is TYPE_CODE_ARRAY but it's lval type is not_lval. printf_c_string will only attempt to print a string from the value's contents when !TYPE_CODE_PTR, lval is lval_internalvar, and the value's type is considered a string type: if (value->type ()->code () != TYPE_CODE_PTR && value->lval () == lval_internalvar && c_is_string_type_p (value->type ())) { ... } Otherwise, it attempts to read the value of the string from the target's memory (which is what actually generates the "evaluation of this ..." error message). --- gdb/printcmd.c | 4 ++-- gdb/testsuite/gdb.base/eval.exp | 16 ++++++++++++++++ gdb/testsuite/gdb.base/printcmds.exp | 25 +++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/gdb/printcmd.c b/gdb/printcmd.c index dd92e31d31b..7eb28da5e24 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -2447,8 +2447,8 @@ printf_c_string (struct ui_file *stream, const char *format, { const gdb_byte *str; - if (value->type ()->code () != TYPE_CODE_PTR - && value->lval () == lval_internalvar + if (((value->type ()->code () != TYPE_CODE_PTR && value->lval () == lval_internalvar) + || (value->type ()->code () == TYPE_CODE_ARRAY && value->lval () == not_lval)) && c_is_string_type_p (value->type ())) { size_t len = value->type ()->length (); diff --git a/gdb/testsuite/gdb.base/eval.exp b/gdb/testsuite/gdb.base/eval.exp index ead053ca712..8a31c9ea944 100644 --- a/gdb/testsuite/gdb.base/eval.exp +++ b/gdb/testsuite/gdb.base/eval.exp @@ -20,3 +20,19 @@ gdb_test_no_output "set \$a = 10" "initialize \$a." gdb_test "eval \"echo %d\\n\", \$a++" "10" "first eval." gdb_test "eval \"echo %d\\n\", \$a*2" "22" "second eval." + +gdb_test_no_output "set var \$hi = \"Hi\"" +gdb_test {eval "echo %s, %s%c\n", $hi, "mom", '!'} "Hi, mom!" + +set listsize_value -1 +gdb_test_multiple "show listsize" "get listsize value" { + -re "Number of source lines gdb will list by default is (\[0-9\]+)\.\r\n$gdb_prompt $" { + set listsize_value $expect_out(1,string) + } +} + +if {$listsize_value > -1} { + gdb_test {eval "echo %s\n", $_gdb_setting_str("listsize")} $listsize_value +} else { + send_log "warning: could not get listsize\n" +} diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp index 21a2cad458c..db57769c303 100644 --- a/gdb/testsuite/gdb.base/printcmds.exp +++ b/gdb/testsuite/gdb.base/printcmds.exp @@ -957,6 +957,30 @@ proc test_printf_with_dfp {} { gdb_test "printf \"%Hf %Hf\\n\",1.2df,1.3df" "1.2 1.3" } +# Test printf with strings. +proc test_printf_with_strings {} { + global gdb_prompt + + gdb_test {printf "I ate a %s yesterday; it was very %s!\n", "clock", "time-consuming"} \ + "I ate a clock yesterday; it was very time-consuming!" + gdb_test_no_output "set var \$hello = \"Hello\"" + + gdb_test {printf "%s, %s%c\n", $hello, "world", '!'} "Hello, world!" + + set listsize_value -1 + gdb_test_multiple "show listsize" "get listsize value" { + -re "Number of source lines gdb will list by default is (\[0-9\]+)\.\r\n$gdb_prompt $" { + set listsize_value $expect_out(1,string) + } + } + + if {$listsize_value > -1} { + gdb_test {printf "%s\n", $_gdb_setting_str("listsize")} $listsize_value + } else { + send_log "warning: could not get listsize\n" + } +} + proc test_print_symbol {} { gdb_test_no_output "set print symbol on" @@ -1171,6 +1195,7 @@ test_print_array_constants test_print_enums test_printf test_printf_with_dfp +test_printf_with_strings test_print_symbol test_repeat_bytes test_radices -- 2.39.2