From nobody Wed Feb 21 15:51:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tg13Z4Vx7z59pw5; Wed, 21 Feb 2024 15:51:38 +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 4Tg13Y6m0Tz4HpQ; Wed, 21 Feb 2024 15:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708530697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xL1w+AqE2wY00K6xOXzduJvQ9xm+EJz70bO3bSogjiY=; b=lF8xI1mxW6lQ9J4Sa2UVRzdVs2qgjodvk+MHW430V/nrnvZtAOfA5MG+t0B1e9cCD6Dkev QgSIURN6M8M1JjVtnlYoSNsREHO0PEUEokbL4hFF5Ou9gKnpQO8Dsxb3hCUQRM7QYBVWqL eMxwJRXRAbHh0h6UyKweHJ+bMr+IN06Ay5Po1pKeSNk6YHWi4IuriRt1ErjziQp28ZKZF0 nkutPIseSvYc4DpbPUh7bDPipWDHghi+BwUYY9FNrco8xcGvHlbf639wjYdkCmHqvTE56U dIlW3BTXf8tBPk82rklOtWTI1BF3Rm9RW5SP+hi13FhcOOip2ICiNzYf/ty1uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708530697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xL1w+AqE2wY00K6xOXzduJvQ9xm+EJz70bO3bSogjiY=; b=dnCtgY1QUBcCK9HuDsEb9KGgYb8qlAijRfx/Q83Os3Ccr6pdVMUIMNLYdkVH0MVRccegse +bg0+yDwQ5DyNeZPda5T/tUehyNs8lLPonCHqW4GFLlWzwG7J2Qj3rFDUtTFol6PuoyPh6 rCqeJRwsIQP9W3ACjUpfzqQz0Zc9Nsk+mk90m4bBOZoc18Bxm/zt+fw73/opTTN9ddp+93 Ifcnh5kh2viYpctgBsYb9JI82dzeK5R2pw+VCxnvSetBGNfFhC446p3G6wIU6je+K+t/DS S1+zQVyG2ho7p1VpuTnDVpl+981gcyjlBnvOvXb/+bHZoRPmexiHBxQquzwbsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708530697; a=rsa-sha256; cv=none; b=Kiv+/IRlYgiH37rEYfb8kmu4LprHemqXc4A46aeI7RQSPAS0qL5cwjHGXNx9HobJZs24XC uM3yIqwP/hHP1GPjkBgbO6gXN6hXpimqc+1JbBi92EWKwRXeCP+GqHs3uvZSjZdcGvjVQ3 MYz5tQRdTWfLzCUuc1FROlS0G0oPPjdmEOvXKT7fGr5yf/lDpTYBC9L2dFLTtkfeyR7SYh IXULZQu2RdGxWM4DhYsYjlYmI5kuPEvKFXLAaYOqdEBeI9zIkbAQUFiodmxbt8U5ETc+tY 7PL5ma9xNYaimPqfwdUNCpVAD2kv+4glIhggSkTv6kOBIXBXycVPgL1eRmXnlw== 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 4Tg13Y5sNvz18Cl; Wed, 21 Feb 2024 15:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LFpbNk023898; Wed, 21 Feb 2024 15:51:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFpbHF023895; Wed, 21 Feb 2024 15:51:37 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:51:37 GMT Message-Id: <202402211551.41LFpbHF023895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 32568e5f2435 - main - loader: Retire CTASSERT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32568e5f2435a2539b0c4177a6fefe7a9e0a0c89 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=32568e5f2435a2539b0c4177a6fefe7a9e0a0c89 commit 32568e5f2435a2539b0c4177a6fefe7a9e0a0c89 Author: Warner Losh AuthorDate: 2024-02-21 15:48:32 +0000 Commit: Warner Losh CommitDate: 2024-02-21 15:51:34 +0000 loader: Retire CTASSERT The project is moving away from CTASSERT in favor of _Static_assert. Cleanup the few instances in the loader proactively. Sponsored by: Netflix Reviewed by: manu, tsoome Differential Revision: https://reviews.freebsd.org/D44006 --- stand/common/bootstrap.h | 4 ---- stand/efi/loader/arch/amd64/multiboot2.c | 2 +- stand/i386/libi386/multiboot.c | 2 +- stand/i386/loader/main.c | 9 ++++----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index 7387569ad65a..b7d6e538f9be 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -382,8 +382,4 @@ int gen_setcurrdev(struct env_var *ev, int flags, const void *value); int mount_currdev(struct env_var *, int, const void *); void set_currdev(const char *devname); -#ifndef CTASSERT -#define CTASSERT(x) _Static_assert(x, "compile-time assertion failed") -#endif - #endif /* !_BOOTSTRAP_H_ */ diff --git a/stand/efi/loader/arch/amd64/multiboot2.c b/stand/efi/loader/arch/amd64/multiboot2.c index 4d7b2713685d..6c96d7dc0073 100644 --- a/stand/efi/loader/arch/amd64/multiboot2.c +++ b/stand/efi/loader/arch/amd64/multiboot2.c @@ -334,7 +334,7 @@ exec(struct preloaded_file *fp) struct mb2hdr *hdr; - CTASSERT(sizeof(header) <= PAGE_SIZE); + _Static_assert(sizeof(header) <= PAGE_SIZE, "header too big"); if ((md = file_findmetadata(fp, MODINFOMD_NOCOPY | MODINFOMD_MB2HDR)) == NULL) { diff --git a/stand/i386/libi386/multiboot.c b/stand/i386/libi386/multiboot.c index e11da0444fcd..b69895de9706 100644 --- a/stand/i386/libi386/multiboot.c +++ b/stand/i386/libi386/multiboot.c @@ -165,7 +165,7 @@ multiboot_exec(struct preloaded_file *fp) int error, mod_num; struct xen_header header; - CTASSERT(sizeof(header) <= PAGE_SIZE); + _Static_assert(sizeof(header) <= PAGE_SIZE, "header too large for page"); /* * Don't pass the memory size found by the bootloader, the memory diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c index 97c4448afdc3..8a3c1cbc6a42 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -51,14 +51,13 @@ #include "libzfs.h" #endif -CTASSERT(sizeof(struct bootargs) == BOOTARGS_SIZE); -CTASSERT(offsetof(struct bootargs, bootinfo) == BA_BOOTINFO); -CTASSERT(offsetof(struct bootargs, bootflags) == BA_BOOTFLAGS); -CTASSERT(offsetof(struct bootinfo, bi_size) == BI_SIZE); +_Static_assert(sizeof(struct bootargs) == BOOTARGS_SIZE, "Bootarg size bad"); +_Static_assert(offsetof(struct bootargs, bootinfo) == BA_BOOTINFO, "BA_BOOTINFO"); +_Static_assert(offsetof(struct bootargs, bootflags) == BA_BOOTFLAGS, "BA_BOOTFLAGS"); +_Static_assert(offsetof(struct bootinfo, bi_size) == BI_SIZE, "BI_SIZE"); /* Arguments passed in from the boot1/boot2 loader */ static struct bootargs *kargs; - static uint32_t initial_howto; static uint32_t initial_bootdev; static struct bootinfo *initial_bootinfo;