From patchwork Sat Nov 25 02:25:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 80767 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 1687F385828E for ; Sat, 25 Nov 2023 02:26:03 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 397C63858C74 for ; Sat, 25 Nov 2023 02:25:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 397C63858C74 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 397C63858C74 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700879148; cv=none; b=pgkM0snvhSn5vqNFmoyycUNRW3XgPFl8Mh5piKqV06PV4NZuAK8pTNF5++JYCkCbD1gRGtKHzEQH84jXfsYCfWYAo7i7Yug34c4G2B1pU55nmfhobgm6VWNcmt44ckJPfnqBdNXtlmoNfH9HrrRp3isphsibrOYnBYb2GLDkQ0A= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700879148; c=relaxed/simple; bh=Lr+i/jfmkeF5Q4ajlZttWBfPP42FN8DXWSOWq/vDwhE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=RMb8BpiXVQhZ8Tsrrx+gzcOK+abgD0mWIF4btveBpzBgPQ4mLAHG5mpXQyCzBNQX7zPYUkVDoKglSL30vtlQVhqIdU3G01hnrMPBVKXXuUsZUPl63vc3Nn6tlDQgeAPKHZO1oI9aS4ns93QLRL/1WtSoiunsuvppfrP+ZewY6NA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6005a.ext.cloudfilter.net ([10.0.30.201]) by cmsmtp with ESMTPS id 6WiyrB72U6nOZ6iMbrdoTB; Sat, 25 Nov 2023 02:25:45 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id 6iMaraYz68KNv6iMar1P4y; Sat, 25 Nov 2023 02:25:44 +0000 X-Authority-Analysis: v=2.4 cv=dp3Itns4 c=1 sm=1 tr=0 ts=65615b28 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=BNY50KLci1gA:10 a=Qbun_eYptAEA:10 a=CCpqsmhAAAAA:8 a=Ru2VFRnuLYb451rmObYA:9 a=ul9cdbp4aOFLsgKbc677:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=+99EvesLYp4PIY8TE36Jn+zXbSndwbvczuKp8zgjFfg=; b=hRmgveDd+PgjqL9w02znZVxdOC zGDJbV4VCODXMx5yMMNQMCx0d1wDrnT3GqqlpJTVx1LHGubpTb+HcW1HAOohNMp/d6/QSkuLqiq7E sIbtbVJQPmnL3E7TcZWtpRSDc; Received: from 97-122-77-73.hlrn.qwest.net ([97.122.77.73]:60846 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1r6iMZ-001vuz-34; Fri, 24 Nov 2023 19:25:43 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Allow cast of 128-bit integer to pointer Date: Fri, 24 Nov 2023 19:25:48 -0700 Message-ID: <20231125022548.1613394-1-tom@tromey.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.77.73 X-Source-L: No X-Exim-ID: 1r6iMZ-001vuz-34 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-77-73.hlrn.qwest.net (localhost.localdomain) [97.122.77.73]:60846 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfBwbeb6XfKujFE0gUPE/eHtoI21Cb4dnCVt69k5tD2mCgUi1e6IgaSk3dtH9m+e16tEsJQGbEaRLGKNED8CrUl8n5tRG2xplGX9srvI+rfnNp/14nEUE PJiNc99X04OZacnPej9nKckgFUgIk9m6RlaqWuwfyIruRJlrqWJspRjzUYbXxKlGMoHAnYWllQcWu7AnejZXZEtn72taoU1L6Hk= X-Spam-Status: No, score=-3024.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, 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.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 PR rust/31082 points out that casting a 128-bit integer to a pointer will fail. This happens because a case in value_cast was not converted to use GMP. This patch fixes the problem. I am not really sure that testing against the negative value here makes sense, but I opted to just preserve the existing behavior rather than change it. Regression tested on x86-64 Fedora 38. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31082 --- gdb/gmp-utils.h | 15 ++++++++++++++- gdb/testsuite/gdb.rust/expr.exp | 5 +++++ gdb/valops.c | 14 ++++++-------- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/gdb/gmp-utils.h b/gdb/gmp-utils.h index a5c27feb59f..52052e30d26 100644 --- a/gdb/gmp-utils.h +++ b/gdb/gmp-utils.h @@ -251,19 +251,32 @@ struct gdb_mpz return result; } + gdb_mpz operator- () const + { + gdb_mpz result; + mpz_neg (result.m_val, m_val); + return result; + } + gdb_mpz &operator<<= (unsigned long nbits) { mpz_mul_2exp (m_val, m_val, nbits); return *this; } - gdb_mpz operator<< (unsigned long nbits) const + gdb_mpz operator<< (unsigned long nbits) const & { gdb_mpz result; mpz_mul_2exp (result.m_val, m_val, nbits); return result; } + gdb_mpz operator<< (unsigned long nbits) && + { + mpz_mul_2exp (m_val, m_val, nbits); + return *this; + } + gdb_mpz operator>> (unsigned long nbits) const { gdb_mpz result; diff --git a/gdb/testsuite/gdb.rust/expr.exp b/gdb/testsuite/gdb.rust/expr.exp index ce2cce2677c..cec3c1fccd8 100644 --- a/gdb/testsuite/gdb.rust/expr.exp +++ b/gdb/testsuite/gdb.rust/expr.exp @@ -169,3 +169,8 @@ gdb_test "with debug expression 1 -- print \"foo\"" \ " Constant: 0" \ "evaluation of this expression requires the target program to be active"] \ "print a string with expression debug turned on" + +# PR rust/31082 - truncating to a pointer would fail. Depending on +# the default host architecture, this may or may not print a warning. +gdb_test "print (0xffffffd00000009a as *mut u64)" \ + "(warning: value truncated\[\r\n\]+)?.* = \\(\\*mut u64\\) $hex" diff --git a/gdb/valops.c b/gdb/valops.c index a8760ccf3e4..bf376921ca3 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -603,15 +603,13 @@ value_cast (struct type *type, struct value *arg2) pointers and four byte addresses. */ int addr_bit = gdbarch_addr_bit (type2->arch ()); - LONGEST longest = value_as_long (arg2); + gdb_mpz longest = value_as_mpz (arg2); - if (addr_bit < sizeof (LONGEST) * HOST_CHAR_BIT) - { - if (longest >= ((LONGEST) 1 << addr_bit) - || longest <= -((LONGEST) 1 << addr_bit)) - warning (_("value truncated")); - } - return value_from_longest (to_type, longest); + gdb_mpz addr_val = gdb_mpz (1) << addr_bit; + if (longest >= addr_val || longest <= -addr_val) + warning (_("value truncated")); + + return value_from_mpz (to_type, longest); } else if (code1 == TYPE_CODE_METHODPTR && code2 == TYPE_CODE_INT && value_as_long (arg2) == 0)