From nobody Thu Oct 19 23:05:12 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 4SBNbX4kHFz4y0Mn; Thu, 19 Oct 2023 23:05:12 +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 4SBNbX42wDz4YQJ; Thu, 19 Oct 2023 23:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697756712; 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=mpnEs8PMwEirL5+xtRpMmYzJoG4v2heAbFEpbMcZ3n8=; b=wAGVYU0IxlJ1hm333Y0bO1pTGy2ZADS2w3PWbBblA2yuf0dceI36Vrfs1O8RsaJTnywM3s yWM8mWYbLMSlImyUY+X31GndyXrGRwruKKQwQvSIiX+MXDIrm1TxVzQcOKVHSYJpf6tNMR 8pGJyrUBLTSR7yPJSQGKyDwfSg8vOnVQMK/uMu8iSJRMm8fg3HkUPLZhLa8OLT2Y1Fqca0 IzrfUCL9r/W2J8s+pXgAEHCSMTA+LIFuZftI+5l3zQR0gJh794VMN9P+uOwe/6ELw0B+JU 1/Ff38ZKRdMwJ4XXqxmPOYYsD3BEEHq2pLgkg1JSLJmc3jeXcLDv7wj0Fq/TEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697756712; a=rsa-sha256; cv=none; b=JUjs5pTOPdzDhWvt3A0aA0FrFQixcHyenzDoqO4nZl3Uz+f7whuQqVxzcZodNvXk4Y6YQH gMSlScT0tBcBrfwfG57UeSYCwmRaI2cWbLxexvpC0xmVvTSbcxK3+ly+X17Vq1+PSRtT7F ac0qWXD/KbOJDqO6lelZMXwjE2XQWF5Si5MihRpALKDWJWrmdvT8u0xBs8G9+kuHA40KsZ PUpyZpr3injJiU50AXjOo5dziKC1VL5i2r9vYnqOUZEMmLAUsMPNepjtUHhHComHvX8DN1 GbV83JcTAIP7x4psDS9Gg1wa2IfEkAGdyp5MbaTXnFBWED7Kb9ZxI4JbP5XCzw== 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=1697756712; 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=mpnEs8PMwEirL5+xtRpMmYzJoG4v2heAbFEpbMcZ3n8=; b=Tk19zfFFMMTvyzi2VXke1PeOTNfQnr8IYF62frdpT33kn9fq0af0W8LO/1sCug36tuhYfH gzw3yKwkHQkUonr0z0pip1pzvaOMdYV1GHaU/OZRgAPzEW65DAMJM4zGAFUT/JloIubqNM cvsXuoxdvdFS2iMhwhLVyJplC35Sv3pRpG8VXQ948Cv/Q+ESZrXPU3GHqeuETkqwpOb3Dm RHczuyiVV5luD6ZLqIPF45p4g7WLNTr+izxWb1vYC61ldgnmtUw8US7GQEC5ApipOx9B3t 5d6+qiDbxGLyYwCeUvTLk0BcQudTCqC4YvDKnDikZKNQSgVMtFresHW1jq9DTg== 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 4SBNbX2wZyz17xg; Thu, 19 Oct 2023 23:05:12 +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 39JN5CpJ044634; Thu, 19 Oct 2023 23:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JN5Cbv044631; Thu, 19 Oct 2023 23:05:12 GMT (envelope-from git) Date: Thu, 19 Oct 2023 23:05:12 GMT Message-Id: <202310192305.39JN5Cbv044631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Houchard Subject: git: 665838d939f3 - releng/14.0 - 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: cognet X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 665838d939f3d32ca851e815506989d80a207f52 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=665838d939f3d32ca851e815506989d80a207f52 commit 665838d939f3d32ca851e815506989d80a207f52 Author: Olivier Houchard AuthorDate: 2023-10-16 20:18:24 +0000 Commit: Olivier Houchard CommitDate: 2023-10-19 23:04:16 +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) (cherry picked from commit 0e0a03c792542a2509702378559622efafc86548) Approved by: re (cperciva) --- 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();