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 BE3893829BEE for ; Fri, 10 Jun 2022 13:08:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BE3893829BEE Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-359-vTyT7l5KOw6Y-A9NcagaSg-1; Fri, 10 Jun 2022 09:08:24 -0400 X-MC-Unique: vTyT7l5KOw6Y-A9NcagaSg-1 Received: by mail-wr1-f71.google.com with SMTP id p8-20020a5d4588000000b0021033f1f79aso6195697wrq.5 for ; Fri, 10 Jun 2022 06:08:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LqlomOlwLLcfhl7Z16ZrZ6qlNSyGXnZjFUUJNGrtTls=; b=7/kzPqEhdqP7n2yajVvMfJo9JHiVOq9VUQxCBAk55ASmE4XpKmYF/cyC+TAM7s54fR rsvn3P7NGysSFMa4/o3VYjadd3lJbyJbmkbQCX0almku5OxEiAUxJyws1x9w9OoA9ayI S8MOvedWo4xSgEAwvCNCp/rx99fI/KFkgf8vPtZrUt/DJL6eu83nz57OHLCeomtoZmwE S8FDcZkQNCgDaRxWSExVmeHSrda5WROHU3LiUKWtdZTC16o7nqtSq4Dcj9TEYUSgbZHP ftm3343Ansm8qgZX91TAw3Srh85qLP/nGAchIvQBeLwFpoH40tz+vLZHpWRK6/wjGo+o teGQ== X-Gm-Message-State: AOAM533O+s3HvwNlkSe32/eM+VN7MgwUFhIX2NZtlaGaJpCPsNQZRcPo rS8crW2RUntgz+NPdRDGWETb/hNThzBVqIb/EDfcZiSLMYMDdHtRuZpASrG2cbfIBXOYMpBXdE2 ebgFg9fLyDyCAQAritKmioRBaAy3o5oLJ481OuF0ktR3UOj6eV/lDXx7/PPWnTk/ZxOZPjgH0vA == X-Received: by 2002:a1c:f70e:0:b0:39c:76e7:f176 with SMTP id v14-20020a1cf70e000000b0039c76e7f176mr5813031wmh.82.1654866503014; Fri, 10 Jun 2022 06:08:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrXn+Jr+MgCvdmsDY3ZZ2j4avX4myJIQ1zQC66OpZnqAUwS8dFxe3yMSofk7CGZYDdBLNTfA== X-Received: by 2002:a1c:f70e:0:b0:39c:76e7:f176 with SMTP id v14-20020a1cf70e000000b0039c76e7f176mr5812995wmh.82.1654866502656; Fri, 10 Jun 2022 06:08:22 -0700 (PDT) Received: from localhost (host109-152-215-36.range109-152.btcentralplus.com. [109.152.215.36]) by smtp.gmail.com with ESMTPSA id 16-20020a05600c231000b0039c463e909asm2929639wmo.18.2022.06.10.06.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jun 2022 06:08:22 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 2/6] gdb/mips: rewrite show_mask_address Date: Fri, 10 Jun 2022 14:08:10 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 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=-10.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, 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 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: Fri, 10 Jun 2022 13:08:27 -0000 This commit is similar to the previous commit, but in this case GDB is actually relying on undefined behaviour. Consider building GDB for all targets on x86-64/GNU-Linux, then doing this: (gdb) show mips mask-address Zeroing of upper 32 bits of 64-bit addresses is auto. The 32 bit address mask is set automatically. Currently disabled (gdb) The 'show mips mask-address' command ends up in show_mask_address in mips-tdep.c, and this function does this: mips_gdbarch_tdep *tdep = (mips_gdbarch_tdep *) gdbarch_tdep (target_gdbarch ()); Later we might pass TDEP to mips_mask_address_p. However, in my example above, on an x86-64 native target, the current target architecture will be an x86-64 gdbarch, and the tdep field within the gdbarch will be of type i386_gdbarch_tdep, not of type mips_gdbarch_tdep, as a result the cast above was incorrect, and TDEP is not pointing at what it thinks it is. I also think the current output is a little confusing, we appear to have two lines that show the same information, but using different words. The first line comes from calling deprecated_show_value_hack, while the second line is printed directly from show_mask_address. However, both of these lines are printing the same mask_address_var value. I don't think the two lines actually adds any value here. Finally, none of the text in this function is passed through the internationalisation mechanism. It would be nice to remove another use of deprecated_show_value_hack if possible, so this commit does a complete rewrite of show_mask_address. After this commit the output of the above example command, still on my x86-64 native target is: (gdb) show mips mask-address Zeroing of upper 32 bits of 64-bit addresses is "auto" (current architecture is not MIPS). The 'current architecture is not MIPS' text is only displayed when the current architecture is not MIPS. If the architecture is mips then we get the more commonly seen 'currently "on"' or 'currently "off"', like this: (gdb) set architecture mips The target architecture is set to "mips". (gdb) show mips mask-address Zeroing of upper 32 bits of 64-bit addresses is "auto" (currently "off"). (gdb) All the text is passed through the internationalisation mechanism, and we only call gdbarch_tdep when we know the gdbarch architecture is bfd_arch_mips. --- gdb/mips-tdep.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 805c5beba59..fc1cb46de84 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -1183,28 +1183,25 @@ static void show_mask_address (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { - mips_gdbarch_tdep *tdep - = (mips_gdbarch_tdep *) gdbarch_tdep (target_gdbarch ()); - - deprecated_show_value_hack (file, from_tty, c, value); - switch (mask_address_var) + const char *additional_text = ""; + if (mask_address_var == AUTO_BOOLEAN_AUTO) { - case AUTO_BOOLEAN_TRUE: - gdb_printf (file, "The 32 bit mips address mask is enabled\n"); - break; - case AUTO_BOOLEAN_FALSE: - gdb_printf (file, "The 32 bit mips address mask is disabled\n"); - break; - case AUTO_BOOLEAN_AUTO: - gdb_printf - (file, - "The 32 bit address mask is set automatically. Currently %s\n", - mips_mask_address_p (tdep) ? "enabled" : "disabled"); - break; - default: - internal_error (__FILE__, __LINE__, _("show_mask_address: bad switch")); - break; + if (gdbarch_bfd_arch_info (target_gdbarch ())->arch != bfd_arch_mips) + additional_text = _(" (current architecture is not MIPS)"); + else + { + mips_gdbarch_tdep *tdep + = (mips_gdbarch_tdep *) gdbarch_tdep (target_gdbarch ()); + + if (mips_mask_address_p (tdep)) + additional_text = _(" (currently \"on\")"); + else + additional_text = _(" (currently \"off\")"); + } } + + gdb_printf (file, _("Zeroing of upper 32 bits of 64-bit addresses is \"%s\"%s.\n"), + value, additional_text); } /* Tell if the program counter value in MEMADDR is in a standard ISA -- 2.25.4