jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 05:58:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

powerpc/booke: Handle misaligned floating point loads/stores as on AIM

Browse Source 
Misaligned floating point loads and stores are already handled for AIM, but
use the DSISR to obtain the necessary data.  Book-E does not have the DSISR,
so these fixups are not performed, leading to a SIGBUS on misaligned FP
loads or stores.  Obtain the necessary data on the Book-E side, similar to
how is done for SPE.

MFC after:	1 week
This commit is contained in:
Justin Hibbits 2019-06-26 01:14:39 +00:00
parent 65f07d9976
commit 088c26aee8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=349402
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/powerpc/include/trap.h
View File

@ -130,7 +130,7 @@
/* Macros to extract register information */
#define EXC_ALI_RST(dsisr) ((dsisr >> 5) & 0x1f) /* source or target */
#define EXC_ALI_RA(dsisr) (dsisr & 0x1f)
#define EXC_ALI_SPE_REG(instr) ((instr >> 21) & 0x1f)
#define EXC_ALI_INST_RST(instr) ((instr >> 21) & 0x1f)
/*
* SRR1 bits for program exception traps. These identify what caused

14
sys/powerpc/powerpc/trap.c
View File

@ -788,7 +788,7 @@ static int
fix_unaligned(struct thread *td, struct trapframe *frame)
{
struct thread *fputhread;
#ifdef __SPE__
#ifdef BOOKE
uint32_t inst;
#endif
int indicator, reg;
@ -799,7 +799,7 @@ fix_unaligned(struct thread *td, struct trapframe *frame)
if (indicator & ESR_SPE) {
if (copyin((void *)frame->srr0, &inst, sizeof(inst)) != 0)
return (-1);
reg = EXC_ALI_SPE_REG(inst);
reg = EXC_ALI_INST_RST(inst);
fpr = (double *)td->td_pcb->pcb_vec.vr[reg];
fputhread = PCPU_GET(vecthread);
@ -828,13 +828,23 @@ fix_unaligned(struct thread *td, struct trapframe *frame)
}
return (0);
}
#else
#ifdef BOOKE
indicator = (frame->cpu.booke.esr & ESR_ST) ? EXC_ALI_STFD : EXC_ALI_LFD;
#else
indicator = EXC_ALI_OPCODE_INDICATOR(frame->cpu.aim.dsisr);
#endif
switch (indicator) {
case EXC_ALI_LFD:
case EXC_ALI_STFD:
#ifdef BOOKE
if (copyin((void *)frame->srr0, &inst, sizeof(inst)) != 0)
return (-1);
reg = EXC_ALI_INST_RST(inst);
#else
reg = EXC_ALI_RST(frame->cpu.aim.dsisr);
#endif
fpr = &td->td_pcb->pcb_fpu.fpr[reg].fpr;
fputhread = PCPU_GET(fputhread);