From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by sourceware.org (Postfix) with ESMTPS id 8569C3861823 for ; Wed, 8 Jul 2020 08:55:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8569C3861823 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wr1-x442.google.com with SMTP id j4so45577253wrp.10 for ; Wed, 08 Jul 2020 01:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f9PCVFq4PP9jDPUTcPPrh41z/RtNq38MznD36qfatg4=; b=UmVk3Xj9sER/q1fbSKkmicpUNzh7OBYx5P27HmnFrISBP615ei0wIX0Y556DMUCgLV POu7FTqifV8ODiErIXAMMqYhxYgKU5mmefNfFSiYR3YYxXBuhiqm70y8Xgfe8BBaePQ7 /v0/aYEoTX1P462ejBTdRtsb9TL+tqAyErtx/WRxpkCyMfS6Z1YxjNFm3HEQ71isq/t2 z283hGnmajNc9jx2TpY0II6hvhYKevELbAmvZhFbPjJP0OmqqgIGV7g6Fvrb2WxJ2C6A xSQdgf/zHewbhjD/ljiss0yLWsoCI1+EcnlZ/Ry0j5z5Y6uoku4WP2a2zlmg1xxmz6KH ZxkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f9PCVFq4PP9jDPUTcPPrh41z/RtNq38MznD36qfatg4=; b=DunjUMxdl5VOS0LK19LF8ciIRDoiTtFVsW2U2HMiNMDZTYuVoCMLWUjHN+TBS50c1+ UMfeHM/EF9UZnr6mPETwQe33qTKo05JzShOvQXXtRX8Zo5WYEbyFvRmaFsuwD9Rd0/Bu tfWyuJML8J1bBNq5hk1virG8/sVBLWC5tnDZ/UjWfALphBRxJl8fKJdLEiKRt7nnjkON Y4BNYiSuakwqb4BSJ/Fz1DIktxo+1blzytwG6loArAh0jpL4Jg7YbF2cOOJ9gNWjAyLI qT1tfbJPj2moO29+bIxWzsXjBhrdCDDlfr6oEy1pdaPrB0CbeGv+DWso3gtJKKzxUMYP E5Xw== X-Gm-Message-State: AOAM532sExviM7fKlBtSFQ8/MqJwVw4l7tNmHHpYBB5QQ4Gq2QiIqTnF niLXvMy/+yFKdFSlAUY85Nat4xwTcMU= X-Google-Smtp-Source: ABdhPJwmjtAahzajN9iZW8IownXc+kbYQWhfw//VO7pnAEOHAqwnOozEfww/r2l6xJMpVLpCo5k5UA== X-Received: by 2002:a5d:5441:: with SMTP id w1mr55002374wrv.381.1594198500380; Wed, 08 Jul 2020 01:55:00 -0700 (PDT) Received: from localhost (host109-154-20-168.range109-154.btcentralplus.com. [109.154.20.168]) by smtp.gmail.com with ESMTPSA id j24sm5239615wrd.43.2020.07.08.01.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2020 01:54:59 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH 1/2] gdb: Improve formatting of 'show architecture' messages Date: Wed, 8 Jul 2020 09:54:54 +0100 Message-Id: <2d73efe4dc489f06fd4e67aa18979e5b655b7100.1594198122.git.andrew.burgess@embecosm.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Wed, 08 Jul 2020 08:55:03 -0000 This commit changes the output of 'show architecture'. Here is a session before this commit: (gdb) show architecture The target architecture is set automatically (currently i386) (gdb) set architecture mips The target architecture is assumed to be mips (gdb) show architecture The target architecture is assumed to be mips (gdb) After this commit the session now looks like this: (gdb) show architecture The target architecture is set to "auto" (currently i386). (gdb) set architecture mips The target architecture is set to "mips". (gdb) show architecture The target architecture is set to "mips". (gdb) The changes are: 1. The value is now enclosed in quotes, 2. Each line ends with '.', and 3. After setting the architecture GDB is now a little more assertive; 'architecture is set to' not 'is assumed to be', the user did just tell us after all! gdb/ChangeLog: * arch-utils.c (show_architecture): Update formatting of messages. gdb/testsuite/ChangeLog: * gdb.arch/amd64-osabi.exp: Update. * gdb.base/all-architectures.exp.tcl: Update. * gdb.base/attach-pie-noexec.exp: Update. * gdb.base/catch-syscall.exp: Update. * gdb.xml/tdesc-arch.exp: Update. --- gdb/ChangeLog | 4 ++++ gdb/arch-utils.c | 6 +++--- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.arch/amd64-osabi.exp | 2 +- gdb/testsuite/gdb.base/all-architectures.exp.tcl | 2 +- gdb/testsuite/gdb.base/attach-pie-noexec.exp | 4 ++-- gdb/testsuite/gdb.base/catch-syscall.exp | 4 ++-- gdb/testsuite/gdb.xml/tdesc-arch.exp | 6 +++--- 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index 04955ea847b..a19fc026623 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -476,11 +476,11 @@ show_architecture (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { if (target_architecture_user == NULL) - fprintf_filtered (file, _("The target architecture is set " - "automatically (currently %s)\n"), + fprintf_filtered (file, _("The target architecture is set to " + "\"auto\" (currently %s).\n"), gdbarch_bfd_arch_info (get_current_arch ())->printable_name); else - fprintf_filtered (file, _("The target architecture is assumed to be %s\n"), + fprintf_filtered (file, _("The target architecture is set to \"%s\".\n"), set_architecture_string); } diff --git a/gdb/testsuite/gdb.arch/amd64-osabi.exp b/gdb/testsuite/gdb.arch/amd64-osabi.exp index aebaaffeeae..7702af99bc8 100644 --- a/gdb/testsuite/gdb.arch/amd64-osabi.exp +++ b/gdb/testsuite/gdb.arch/amd64-osabi.exp @@ -24,7 +24,7 @@ if { ![istarget x86_64-*-* ] } { proc test_osabi_none { arch void_ptr_size long_double_size } { clean_restart - gdb_test "set architecture i386:x86-64" "The target architecture is assumed to be i386:x86-64" + gdb_test "set architecture i386:x86-64" "The target architecture is set to \"i386:x86-64\"\\." gdb_test_no_output "set osabi none" "set osabi none" gdb_test "print sizeof (void*)" " = 8" gdb_test "print sizeof (long double)" " = 16" diff --git a/gdb/testsuite/gdb.base/all-architectures.exp.tcl b/gdb/testsuite/gdb.base/all-architectures.exp.tcl index ebdd3444540..4c59728b8c0 100644 --- a/gdb/testsuite/gdb.base/all-architectures.exp.tcl +++ b/gdb/testsuite/gdb.base/all-architectures.exp.tcl @@ -246,7 +246,7 @@ with_test_prefix "tests" { set arch_re [string_to_regexp $arch] set test "set architecture $arch" gdb_test_multiple $test $test { - -re "^set architecture $arch_re\r\n(${osabi_warning})?The target architecture is assumed to be $arch_re\r\n$gdb_prompt $" { + -re "^set architecture $arch_re\r\n(${osabi_warning})?The target architecture is set to \"$arch_re\"\\.\r\n$gdb_prompt $" { internal_pass $test } -re "Architecture .* not recognized.*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.exp b/gdb/testsuite/gdb.base/attach-pie-noexec.exp index 08573a1c21f..f0d1aab101d 100644 --- a/gdb/testsuite/gdb.base/attach-pie-noexec.exp +++ b/gdb/testsuite/gdb.base/attach-pie-noexec.exp @@ -28,7 +28,7 @@ clean_restart $executable set arch "" set test "show architecture" gdb_test_multiple $test $test { - -re "The target architecture is set automatically \\(currently (.*)\\)\r\n$gdb_prompt $" { + -re "The target architecture is set to \"auto\" \\(currently (.*)\\)\\.\r\n$gdb_prompt $" { set arch $expect_out(1,string) pass $test } @@ -61,7 +61,7 @@ set testpid [spawn_id_get_pid $test_spawn_id] gdb_start file delete -- $binfile gdb_test "attach $testpid" "Attaching to process $testpid\r\n.*" "attach" -gdb_test "set architecture $arch" "The target architecture is assumed to be $arch" +gdb_test "set architecture $arch" "The target architecture is set to \"$arch\"\\." gdb_test "info shared" "From\[ \t\]+To\[ \t\]+Syms Read\[ \t\]+Shared Object Library\r\n0x.*" kill_wait_spawned_process $test_spawn_id diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp index d5f5862c5c1..eb4fdb5e7c1 100644 --- a/gdb/testsuite/gdb.base/catch-syscall.exp +++ b/gdb/testsuite/gdb.base/catch-syscall.exp @@ -593,14 +593,14 @@ proc test_catch_syscall_multi_arch {} { gdb_start gdb_test "set architecture $arch1" \ - "The target architecture is assumed to be $arch1" + "The target architecture is set to \"$arch1\"\\." gdb_test "catch syscall $syscall_number" \ "Catchpoint $decimal \\(syscall .${syscall1_name}. \\\[${syscall_number}\\\]\\)" \ "insert catch syscall on syscall $syscall_number -- $syscall1_name on $arch1" gdb_test "set architecture $arch2" \ - "The target architecture is assumed to be $arch2" + "The target architecture is set to \"$arch2\"\\." gdb_test "catch syscall $syscall_number" \ "Catchpoint $decimal \\(syscall .${syscall2_name}. \\\[${syscall_number}\\\]\\)" \ diff --git a/gdb/testsuite/gdb.xml/tdesc-arch.exp b/gdb/testsuite/gdb.xml/tdesc-arch.exp index 386435dd171..144ff8b2672 100644 --- a/gdb/testsuite/gdb.xml/tdesc-arch.exp +++ b/gdb/testsuite/gdb.xml/tdesc-arch.exp @@ -41,7 +41,7 @@ gdb_test_multiple "set architecture" $msg { set default_arch "" set msg "read default architecture" gdb_test_multiple "show architecture" $msg { - -re "The target architecture is set automatically \\(currently (\[^ \]*)\\)\r\n$gdb_prompt $" { + -re "The target architecture is set to \"auto\" \\(currently (\[^ \]*)\\)\\.\r\n$gdb_prompt $" { set default_arch $expect_out(1,string) pass $msg } @@ -89,7 +89,7 @@ proc set_arch { arch which trans_mode } { set cmd "show architecture" gdb_test $cmd \ - "The target architecture is set automatically \\(currently $arch\\)" \ + "The target architecture is set to \"auto\" \\(currently $arch\\)\\." \ "$cmd ($which architecture)" remote_file host delete $filename @@ -122,7 +122,7 @@ gdb_test $cmd \ set cmd "show architecture" gdb_test $cmd \ - "The target architecture is set automatically \\(currently $default_arch\\)" \ + "The target architecture is set to \"auto\" \\(currently $default_arch\\)\\." \ "$cmd (invalid architecture)" remote_file host delete $filename -- 2.25.4