From nobody Thu Oct 19 22:45:44 2023 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 4SBN943yHLz4xy3t; Thu, 19 Oct 2023 22:45:44 +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 4SBN943Bvrz4WMq; Thu, 19 Oct 2023 22:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697755544; 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=nuiWdaGui5m2as3dXRRZ1wBZ61FPRihALv5FWmAdzBw=; b=Xob7CfAVjzJc3SU9yF+fWrp0Kvikk5VHKNDmwKQ4S7dm5ixGycwfk+97f01IpHw0/CQKph 9njyGvpbzkFAGSyBim8VS8Rmd9GFE8gJh28BzxziI3s5lBr7u3cuAd2pQwjVc77N4evwyl xg/gPXnWtkqyG18pYbzTbFX8G91PlE41mTkkfGbhd43KrFmazeOL5WExy7quG5K30lEql0 VeChLLzHh7vVMm9zhK46IFlzSRl4M2J90pBDKvnqed5aQsdxRV7zCp/JxDosIKD2nmut4D 7o9tJ8cMry3Qz/gEnW9wsXljBtVbFz8TausJOTKtCYs5wd4WEBArEG8XS4PwJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697755544; a=rsa-sha256; cv=none; b=pHWcwLfeyPbOOdamWcH8wp9siaeO+DaI5mUbXIfeBSjf53sHMJb6CynJe1o8RBAXLJQma7 D0AXCkB0ur3gUn9SWtHUTNxEW3QDBIcQDtCYejaEDJUBGMi2C9artFdHueS5Q6ELDSGwJ9 S/Yv9fLjXu/7Kf/IBDTPLjrrrJchWgdw+PPxf+I+uISu/aezacKDE0CnpJHeKVGiDqM4Lw e8HLQraYGize/bKUzAZ9eSOvmy/URXoo2G97SHyMs3z9zg7E9TgMpTmdOMkD4HXIzbq6Kz aFULNc/tRBiIS9Mhuz9d/HhsVNjVD3nlLu8JIQXAYuUKtXG4KMstv4Mf2HgxJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697755544; 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=nuiWdaGui5m2as3dXRRZ1wBZ61FPRihALv5FWmAdzBw=; b=B4jeZ9ZKXfYluFoRGNoMCUurpurjbAlb6sKML/BXt/Mx6G7vbxTSSCVXeSpvU6U9roBKle H6JWkqtDV5jp4KHjaQ07w3skONs3VERg3bWev2Y3+XZ5oro8m+cXms0REbC+kekyP0qPLt Nhb++nWdrR4qm7mgF1NOTibnm61RG5mjunoOaYlYiosILYs94kdlil1vO356r6k32U2nwI QsoWkdtFat3gk6hIKaicFFCvevS52BzUiNMAhmVZ+ie0F+86WxBLgfVwTUWrVJ5Q35y5OS cwrLROOL69yLAIeGpZzlyVrG5Kjy4E7n0rqJ8IAILPeOdJO0FIMw1jU7UZ5SsA== 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 4SBN942Fzlz170t; Thu, 19 Oct 2023 22:45:44 +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 39JMji5x010292; Thu, 19 Oct 2023 22:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JMjiZ0010289; Thu, 19 Oct 2023 22:45:44 GMT (envelope-from git) Date: Thu, 19 Oct 2023 22:45:44 GMT Message-Id: <202310192245.39JMjiZ0010289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 0e0a03c79254 - stable/14 - arm64/compat32: Fix handling of 32bits FP registers. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0e0a03c792542a2509702378559622efafc86548 Auto-Submitted: auto-generated The branch stable/14 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0a03c792542a2509702378559622efafc86548 commit 0e0a03c792542a2509702378559622efafc86548 Author: Olivier Houchard AuthorDate: 2023-10-16 20:18:24 +0000 Commit: Glen Barber CommitDate: 2023-10-19 22:45:17 +0000 arm64/compat32: Fix handling of 32bits FP registers. We must consider the aarch32 FP registers as 16 128bits registers, and store that as the first 16 aarch64 FP registers. PR: 267788 (cherry picked from commit ccd0f34d8585cba727dd17a381309855af655b82) --- sys/arm64/arm64/freebsd32_machdep.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/freebsd32_machdep.c b/sys/arm64/arm64/freebsd32_machdep.c index e19d845ca66e..1cf8403e0a0e 100644 --- a/sys/arm64/arm64/freebsd32_machdep.c +++ b/sys/arm64/arm64/freebsd32_machdep.c @@ -151,8 +151,12 @@ get_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) ("Called get_fpcontext32 while the kernel is using the VFP")); KASSERT((pcb->pcb_fpflags & ~PCB_FP_USERMASK) == 0, ("Non-userspace FPU flags set in get_fpcontext32")); - for (i = 0; i < 32; i++) - mcp->mcv_reg[i] = (uint64_t)pcb->pcb_fpustate.vfp_regs[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + mcp->mcv_reg[i * 2] = tmpreg[0]; + mcp->mcv_reg[i * 2 + 1] = tmpreg[1]; + } mcp->mcv_fpscr = VFP_FPSCR_FROM_SRCR(pcb->pcb_fpustate.vfp_fpcr, pcb->pcb_fpustate.vfp_fpsr); } @@ -168,8 +172,12 @@ set_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) pcb = td->td_pcb; if (td == curthread) vfp_discard(td); - for (i = 0; i < 32; i++) - pcb->pcb_fpustate.vfp_regs[i] = mcp->mcv_reg[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + tmpreg[0] = mcp->mcv_reg[i * 2]; + tmpreg[1] = mcp->mcv_reg[i * 2 + 1]; + } pcb->pcb_fpustate.vfp_fpsr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); pcb->pcb_fpustate.vfp_fpcr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); critical_exit();