From owner-dev-commits-src-main@freebsd.org Tue Jun 8 17:31:25 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 20A3D63BA82; Tue, 8 Jun 2021 17:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fzy2j0TK9z3tFY; Tue, 8 Jun 2021 17:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EDA4A4E78; Tue, 8 Jun 2021 17:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 158HVOMS035999; Tue, 8 Jun 2021 17:31:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 158HVO7d035986; Tue, 8 Jun 2021 17:31:24 GMT (envelope-from git) Date: Tue, 8 Jun 2021 17:31:24 GMT Message-Id: <202106081731.158HVO7d035986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: de295884c4ef - main - tip: Cast via intptr_t not long when casting between pointer and int MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de295884c4efd9a126dfdd8d98247de345d1f468 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 17:31:25 -0000 The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=de295884c4efd9a126dfdd8d98247de345d1f468 commit de295884c4efd9a126dfdd8d98247de345d1f468 Author: Jessica Clarke AuthorDate: 2021-06-08 17:30:59 +0000 Commit: Jessica Clarke CommitDate: 2021-06-08 17:30:59 +0000 tip: Cast via intptr_t not long when casting between pointer and int Whilst all FreeBSD architectures have the same representation for intptr_t and long (even if the former is int on ILP32 architectures), this is more general and correct, and on CHERI they are not the same so warnings are generated by default for integer-to-pointer casts that aren't via (u)intptr_t. Reviewed by: imp, kib Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D30696 --- usr.bin/tip/tip/tip.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h index ab6b2c4cd9a0..6bf94521cdfd 100644 --- a/usr.bin/tip/tip/tip.h +++ b/usr.bin/tip/tip/tip.h @@ -153,16 +153,16 @@ typedef */ #define value(v) vtable[v].v_value -#define lvalue(v) (long)vtable[v].v_value +#define lvalue(v) (long)(intptr_t)vtable[v].v_value -#define number(v) ((long)(v)) -#define boolean(v) ((short)(long)(v)) -#define character(v) ((char)(long)(v)) -#define address(v) ((long *)(v)) +#define number(v) ((long)(intptr_t)(v)) +#define boolean(v) ((short)(intptr_t)(v)) +#define character(v) ((char)(intptr_t)(v)) +#define address(v) ((long *)(v)) -#define setnumber(v,n) do { (v) = (char *)(long)(n); } while (0) -#define setboolean(v,n) do { (v) = (char *)(long)(n); } while (0) -#define setcharacter(v,n) do { (v) = (char *)(long)(n); } while (0) +#define setnumber(v,n) do { (v) = (char *)(intptr_t)(n); } while (0) +#define setboolean(v,n) do { (v) = (char *)(intptr_t)(n); } while (0) +#define setcharacter(v,n) do { (v) = (char *)(intptr_t)(n); } while (0) #define setaddress(v,n) do { (v) = (char *)(n); } while (0) /*