From nobody Fri Feb 14 19:25:30 2025 X-Original-To: dev-commits-src-branches@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 4Yvhpf3kpDz5nXYR; Fri, 14 Feb 2025 19:25:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpf2Gbjz48l0; Fri, 14 Feb 2025 19:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561130; 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=E1bC0tsWBNoasUTms+lEUzQhaWPWGgfaiLoiwz3Mvuk=; b=sqLxlryzUANzuvrTMFQlOcGV8bNC3BguS87Su4NPNfAHsW593sVnYukJu0moLYuWawMdI4 9skzH4XwDV5zg42k/GSTTORcrkxQdVf/ax6sLf1rgM4Ze9kbq1QLsdUBYLMERY9tb3AZmX T8s2fdhHyUPbx98vG34QG+FKYdyBA3Dhol/yFrPYVSA98c+mZafre8kquKNaI9RIpJPL6Z P7K2H/IAARbrb7TMI21cm3D9LjXBR+vCrU1o1nMpEZF4JneBpabGAI3jU8m1U8qrto212U kmYrAMp5RSKvnEco1VlDg8FjST906cSbVV/hQKVVhJKR6XLomTkUPTIqxlmRyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561130; 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=E1bC0tsWBNoasUTms+lEUzQhaWPWGgfaiLoiwz3Mvuk=; b=OU45Pqi7CaAQz9+qWYpzLYGFW0G6Z/JMyxVM35l0TJmuxphzYig7mHY9rsvSy6hQI7C6jD 4wJsCvPZsiafcuywQZ4YhiXqOfgKOtG03TqJR4ZRiJ0D2hAwKVnsW8CiTwj228QvkqhVMC HWYdK6I8oX9nEuvpQJHzdRkNoxOISwDRtVzrrOUImilCQ6PXoLAY5nETq1prFzIfASshVE Wvrg+UgSLIy8VZOmFeg1Rtqd6XkDOl5ExtTT7TAVbx8W9W5KmSGEM/cvYtJCfFhTKZzhx0 G64cTkcic1FC36TmJy8Q9EenJBodi9RVjoKFFiU4VrZN/c1YourpyBEB6HSIZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561130; a=rsa-sha256; cv=none; b=WBfKbIi4h70RfCO4w1M86V0P+5kT44iqSpG3Vpo3m1wtHGI4TKh4Q+ng7fo6/QU3d7bXlk Mbm38mQkATIxaseqMrYqA0IMQv+TNhC7uJsCNqP5cSi8nwGXOAi4QlAHIsGcflagtTtrcj HniGlQtrUXetJYfREa9KtaKebaj1aN7QJ2wYL3vOtha8vjjQU0mdZ3XIC4hCXSWZD8gpuB Wmp5Do9qIi4PsIhXXYn4bFuQEOfqH9FtCUNx5zY6A3AadZVa+YCtAQvgZFKcYu1lP+4JzS +/roW7KvkD5+xfTyrX1xHwxLr5WczZWXXkOA21DbCLL3Ogfm2hNCsmP9bDLrZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yvhpf1TdPzkGK; Fri, 14 Feb 2025 19:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPU5D038852; Fri, 14 Feb 2025 19:25:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPUvB038849; Fri, 14 Feb 2025 19:25:30 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:30 GMT Message-Id: <202502141925.51EJPUvB038849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a267ceaf39a6 - stable/14 - clock: Simplify subr_ticks and rename List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a267ceaf39a6c756e72787c96e61714081bff339 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a267ceaf39a6c756e72787c96e61714081bff339 commit a267ceaf39a6c756e72787c96e61714081bff339 Author: Mark Johnston AuthorDate: 2025-01-10 23:59:47 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:18 +0000 clock: Simplify subr_ticks and rename - We can use builtin constants for the size of int and long to simplify definitions. - The file should have a .S prefix since we want to run it through the preprocessor, though apparently this happens anyway with .s... - Move ticks and ticksl from .data to .bss. Reported by: jrtc27 Reviewed by: jrtc27, kib, emaste Fixes: 6b82130e6c9a ("clock: Add a long ticks variable, ticksl") Differential Revision: https://reviews.freebsd.org/D48420 (cherry picked from commit b2b974f7ef4cddff251d0de69d8da13232b25e4d) --- sys/conf/files | 2 +- sys/kern/{subr_ticks.s => subr_ticks.S} | 22 +++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index a1a919bbb3b3..34f57c32361a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3905,7 +3905,7 @@ kern/subr_stack.c optional ddb | stack | ktr kern/subr_stats.c optional stats kern/subr_taskqueue.c standard kern/subr_terminal.c optional vt -kern/subr_ticks.s standard +kern/subr_ticks.S standard kern/subr_trap.c standard kern/subr_turnstile.c standard kern/subr_uio.c standard diff --git a/sys/kern/subr_ticks.s b/sys/kern/subr_ticks.S similarity index 62% rename from sys/kern/subr_ticks.s rename to sys/kern/subr_ticks.S index 6565ba424137..52435b194c4f 100644 --- a/sys/kern/subr_ticks.s +++ b/sys/kern/subr_ticks.S @@ -16,29 +16,21 @@ GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) #endif -#ifdef _ILP32 -#define SIZEOF_TICKSL 4 -#define TICKSL_INIT .long 0 -#else -#define SIZEOF_TICKSL 8 -#define TICKSL_INIT .quad 0 -#endif - -#if defined(_ILP32) || __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #define TICKS_OFFSET 0 #else -#define TICKS_OFFSET 4 +#define TICKS_OFFSET (__SIZEOF_LONG__ - __SIZEOF_INT__) #endif - .data + .bss .global ticksl .type ticksl, %object - .align SIZEOF_TICKSL -ticksl: TICKSL_INIT - .size ticksl, SIZEOF_TICKSL + .align __SIZEOF_LONG__ +ticksl: .zero __SIZEOF_LONG__ + .size ticksl, __SIZEOF_LONG__ .global ticks .type ticks, %object ticks =ticksl + TICKS_OFFSET - .size ticks, 4 + .size ticks, __SIZEOF_INT__