From owner-dev-commits-src-main@freebsd.org Sun Jan 10 21:33:18 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 3F7F84DA560 for ; Sun, 10 Jan 2021 21:33:18 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DDVSZ1Cqwz3khX for ; Sun, 10 Jan 2021 21:33:18 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f54.google.com with SMTP id r4so13274659wmh.5 for ; Sun, 10 Jan 2021 13:33:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=sSsNU83EpOWo5xjXp1Oi9sAuotfmAsXha9zO9zY1W2I=; b=pLY8cxRBDEkauLOyPBCODTpOffL7aoQ2zmEpHtfiO5gjbSm2qHNKeyePPytpmGkHO7 0exYRczAvhC+137ocTs8vRdzdrcwjVoP6+BrxB0qlSbA3pUhJ/CdTUUI2uBHZheQLrO4 blGH3evNHJHiNnugjIsDBMsKCA/WjqHwnmuiLBlS7xcWMFJsuidVQIkWr5XXsp/LrBc9 HJijVni5V96SeMxZqPCalL6F2r/uwGBjovogrRbzPBXVT8of1VjITDU0v/03HiAb3byd lpByx+fQ67UkDbq98Po4OeLjceRCEmZq6n7GEyauedAvLw1Lyzgys5hl5zUBYP4pCGYd 8w4g== X-Gm-Message-State: AOAM532B/mISsnqM7upIvtMiLhUM5fUFiiVmGWaT00xvFGsaNqjD/3v2 /jz9d2YGfSXNdK196JlF3Ddexw== X-Google-Smtp-Source: ABdhPJyOG8UA3hDi5RLyDqgCHwOTUlOaILfsLcYsvrq5I6nSV7p8cYrQg3cY6CGIVHyrK001DhLS+g== X-Received: by 2002:a1c:b608:: with SMTP id g8mr12192391wmf.110.1610314397089; Sun, 10 Jan 2021 13:33:17 -0800 (PST) Received: from [192.168.149.251] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id r7sm19385790wmh.2.2021.01.10.13.33.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jan 2021 13:33:16 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: git: facdd1cd2045 - main - cgem: add 64-bit support From: Jessica Clarke In-Reply-To: Date: Sun, 10 Jan 2021 21:33:16 +0000 Cc: Mitchell Horne , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: 7bit Message-Id: <51C7F0DA-0EA2-45EF-A817-53984205C648@freebsd.org> References: <202101102053.10AKrGqv070360@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4DDVSZ1Cqwz3khX X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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: Sun, 10 Jan 2021 21:33:18 -0000 On 10 Jan 2021, at 21:31, Konstantin Belousov wrote: > On Sun, Jan 10, 2021 at 09:17:48PM +0000, Jessica Clarke wrote: >> On 10 Jan 2021, at 20:53, Mitchell Horne wrote: >>> diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c >>> index 3c5277452469..77337e977dcc 100644 >>> --- a/sys/dev/cadence/if_cgem.c >>> +++ b/sys/dev/cadence/if_cgem.c >>> @@ -77,6 +77,14 @@ __FBSDID("$FreeBSD$"); >>> #include >>> #include >>> >>> +#ifdef EXT_RESOURCES >>> +#include >>> +#endif >>> + >>> +#if INTPTR_MAX == INT64_MAX >>> +#define CGEM64 >>> +#endif >> >> This isn't going to work with CHERI. Perhaps a BUS_SPACE_MAXADDR check, >> or SIZE_MAX? The former is probably preferable for PAE systems. > > Wouldn't it be spelled as __LP64__ ? It shouldn't be, because the P stands for pointer(s), which we make 128-bit, though in practice for compatibility we have a hack to define it anyway (but the compiler *won't*, it's in bsd.cpu.mk or similar). Only the integer addresses are 128-bit. Jess