system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm64/compat32: Fix handling of 32bits FP registers.

Browse source 
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
This commit is contained in:
Olivier Houchard 2023-10-16 22:18:24 +02:00
parent 8c630381b4
commit ccd0f34d85
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sys/arm64/arm64/freebsd32_machdep.c
View file

@ -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();