From nobody Mon Nov 21 00:48:58 2022 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 4NFpfz0mDPz4hwxC; Mon, 21 Nov 2022 00:48:59 +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 4NFpfz0Bbbz3qt1; Mon, 21 Nov 2022 00:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668991739; 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=ONlboU1wLR5czawiVWqW6cBzG140Z0LsBmYE/zqKcIU=; b=Z7Q1cEGr1/uwxXo/neU9XwXaWMi+3TonTi3d/A8Y8migZc0Xh9zbbilz7yRIwt0jWBGtvJ SuqH8FKBfg+9a/DKX828T/fxlsQLfwPjCRyhDOnzaB5X7iqiJQZgasDkRqUn9jsFu3RbyE uUKGR7rhGqMK4TLzub/279Rumkz+OBDyBWLyepdws/8NU42odQjihXrC8SH+4eAycVNGJO GQnOJuMAfLK8/OjQHnmmqucOIAE4UNd+gTUCDs9bDLRiWwVVzwVK13Ka3KGwM1QxQsksJS BEzxhPVQZkO5pdjT8/zAB+Idvgu4/XbAHhQwTuGgYaOZZh7rY7LHsowLOQ395w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668991739; 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=ONlboU1wLR5czawiVWqW6cBzG140Z0LsBmYE/zqKcIU=; b=ZASz3H7lDNIic/TzSLQhdR0H8w5Zzq1jmeUZc44h3SdlVpB3MyCSmYop6bGaimkcmqzePf eD+ewM6vQbIyJahagH2OUnVNVnFNtJ7ELYNQLkjC6TX0r8GQvmz+AXl5LP2tbB5OX4xdiR NpeUSFbHNwEQGaTq8dmoLOqQaXhd9Twdg6Xv+XvtwE6GZwDg+0Rm049UVIA1fdU8WskyC6 JTKk2WSqJlvKjmdDbgOww7h3oeNa5vYF4A7nDLeXYEMXRpepGfTrxAS1SyMr9NUcNrp6Xw FZyhlnBswZKpgODLldd+B8i7ABikvivWSJYvgf1x45UsTRQPBHip6sM+ZppPaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668991739; a=rsa-sha256; cv=none; b=XE2zGVngtYAj/7murgwIGYhRJm6LltPaUoRYsm8NcfXDSR5y9YRfP4v2HAnpULpduO+mZv eS5hxpcaeOrc1AbhO46l+8LKWIE2XoAJlvwQttxXOvkyzP2W/LxuQpXJGLgtliEVZNzjgW ssIVc38BkP5o7SD1V43+aySxF3uEDUtRl2yOQrapDpa+cIAftvbQakZE3Ulr8QsmLicJbO GCy59UvSr/AOyKTXxacsXaBXhwku3XccdAEFy7URFsLY3kCCFf0qP1leCqX0Gkgr0+Tz/W 4gvHAVs282QOiBZMSGk5Fyt6Zwg76ev0sE+4eFfvgRsuwgQtMIXKAODPFHRIbw== 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 4NFpfy6Llqzkdk; Mon, 21 Nov 2022 00:48:58 +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 2AL0mwXO063077; Mon, 21 Nov 2022 00:48:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AL0mwox063076; Mon, 21 Nov 2022 00:48:58 GMT (envelope-from git) Date: Mon, 21 Nov 2022 00:48:58 GMT Message-Id: <202211210048.2AL0mwox063076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 088cf0c5db2e - main - powerpc/dtrace: Guard fuword64 usage for powerpc64 only 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 088cf0c5db2ef59642460d142af8af34e48eb414 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=088cf0c5db2ef59642460d142af8af34e48eb414 commit 088cf0c5db2ef59642460d142af8af34e48eb414 Author: Justin Hibbits AuthorDate: 2022-11-21 00:47:19 +0000 Commit: Justin Hibbits CommitDate: 2022-11-21 00:50:45 +0000 powerpc/dtrace: Guard fuword64 usage for powerpc64 only 32-bit powerpc doesn't have a fuword64, so only use it on powerpc64. This could also be done elsewhere that splits 32-bit and 64-bit accesses, but adding ifdefs everywhere would just clutter up the source for little benefit. This is the only usage of fuword64 directly; other archs have a dtrace_fuword64_nocheck(), but powerpc does not, and I don't see a need to add it currently. MFC after: 1 week --- sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c b/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c index 8f4db66f817d..8f370ba6a186 100644 --- a/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c +++ b/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c @@ -246,12 +246,16 @@ fasttrap_usdt_args(fasttrap_probe_t *probe, struct reg *rp, int argc, if (x < 8) argv[i] = rp->fixreg[x]; else +#ifdef __powerpc64__ if (SV_PROC_FLAG(curproc, SV_ILP32)) +#endif argv[i] = fuword32((void *)(rp->fixreg[1] + 8 + (x * sizeof(uint32_t)))); +#ifdef __powerpc64__ else argv[i] = fuword64((void *)(rp->fixreg[1] + 48 + (x * sizeof(uint64_t)))); +#endif } for (; i < argc; i++) {