From nobody Mon Oct 16 20:29:13 2023 X-Original-To: dev-commits-src-all@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 4S8TGy1GWGz4xmCp; Mon, 16 Oct 2023 20:29:14 +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 4S8TGy0nzJz4Lrs; Mon, 16 Oct 2023 20:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697488154; 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=EG2nvCiqbD/J9HmeeuVBB6z6uBFMsvB5Tga2wijmEzM=; b=tHz1M6XmbW/yw3j3TltMWGSGbg3gPyjsM8YkrwcuWDh02/g5WGAtCQsRk2GCZ9C3/XnC0F apdFrsWln0SinQLFzQbjrUtsS9zPXIhLn3AO33jQ5xUueZdmgZCvZ2V2w14IadymtzvSAC 22L2LCQd3nKLAn0Pe8fTGpbxIA/A6kJHH2ebqzu93S2PzV5iG4ioP0jNYDDIqZ8lYTu3WD BaujOmarjeIaym3P8IqAM8lKl/VKUt+PFpixrzy3M1mBlV+EVUUCh3f+d3dzrmP9G0McGs AcCrWYTeWuQVenPzZjXftfphZ2bW8cG1vGLp420l9b3XsUrv+UbtcQH3v1WNGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697488154; a=rsa-sha256; cv=none; b=rbdD2U/wdwDOfp5+OJP4qudILwaP+8I5VCHx9IFHXbH+I7Ug7SU69/eATrFVUeINGxjEbD wHlTMh9L/x1evlgT5wb76zXBW75XOr6P1isPMGyfaRekrxLHHVBZrquN0CBPoZvN6G914H HPikNaqi4Ei/p3Bj8j93qo4zsgbHr1zHOT+eVyLuzde8IgxYZ361I8ioDDRqoLkviO/FG2 fJmxsvi0QD/irEIZwCTNonhJSj7JpZhtmONyohs6O1r7AVHX+ZqopGpUIJH1elNVeRJoBB sSQglZ7LPYwQ08W1LSTH5rtJZAX0YHG5lBEi5ledGuluKEQvxrPsI4YbQONzCg== 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=1697488154; 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=EG2nvCiqbD/J9HmeeuVBB6z6uBFMsvB5Tga2wijmEzM=; b=OBqrhUzx7290q5nfwwil+Y/j+k/WRAnai1sr8xND49k2d9osPjlII+wx7u7oyxPffqOHTI tzVANJsgUkAZiHzVMMiK/FMkIt8BXmluqne/MA3ll3B1+Y9R29+EDO5BZMktsjiCHvd2lG hogIyj74JTfUV92mI+UtgbK1xE/m464nOKDL01iNOf8K3rCgALW9W264NXh+y0L8JTRpUB VAun3n/HKCSc5Odc3wDNTF6EyQNiyCBBg8i+fzjLoXGHf2cSWf1+6q6EVDcsgygYX3U3Dj V/s7lEL8CxZ67vWwn3CC84p1p8Z08utDKjm5vCrFvLh19y6RIy+2xeqNt15Twg== 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 4S8TGx6yR6zvLb; Mon, 16 Oct 2023 20:29:13 +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 39GKTDAI079456; Mon, 16 Oct 2023 20:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GKTDRa079453; Mon, 16 Oct 2023 20:29:13 GMT (envelope-from git) Date: Mon, 16 Oct 2023 20:29:13 GMT Message-Id: <202310162029.39GKTDRa079453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Houchard Subject: git: ccd0f34d8585 - main - arm64/compat32: Fix handling of 32bits FP registers. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ccd0f34d8585cba727dd17a381309855af655b82 Auto-Submitted: auto-generated The branch main has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=ccd0f34d8585cba727dd17a381309855af655b82 commit ccd0f34d8585cba727dd17a381309855af655b82 Author: Olivier Houchard AuthorDate: 2023-10-16 20:18:24 +0000 Commit: Olivier Houchard CommitDate: 2023-10-16 20:29:06 +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 MFC After: 1 week --- 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();