MIPS: Support for 64-bit FP with O32 binaries
CPUs implementing MIPS32 R2 may include a 64-bit FPU, just as MIPS64 CPUs do. In order to preserve backwards compatibility a 64-bit FPU will act like a 32-bit FPU (by accessing doubles from the least significant 32 bits of an even-odd pair of FP registers) when the Status.FR bit is zero, again just like a mips64 CPU. The standard O32 ABI is defined expecting a 32-bit FPU, however recent toolchains support use of a 64-bit FPU from an O32 MIPS32 executable. When an ELF executable is built to use a 64-bit FPU a new flag (EF_MIPS_FP64) is set in the ELF header. With this patch the kernel will check the EF_MIPS_FP64 flag when executing an O32 binary, and set Status.FR accordingly. The addition of O32 64-bit FP support lessens the opportunity for optimisation in the FPU emulator, so a CONFIG_MIPS_O32_FP64_SUPPORT Kconfig option is introduced to allow this support to be disabled for those that don't require it. Inspired by an earlier patch by Leonid Yegoshin, but implemented more cleanly & correctly. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Cc: Paul Burton <paul.burton@imgtec.com> Patchwork: https://patchwork.linux-mips.org/patch/6154/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:

committed by
Ralf Baechle

parent
56a22d21bf
commit
597ce1723e
@@ -80,6 +80,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
|
||||
/* Read the word at location addr in the USER area. */
|
||||
case PTRACE_PEEKUSR: {
|
||||
struct pt_regs *regs;
|
||||
fpureg_t *fregs;
|
||||
unsigned int tmp;
|
||||
|
||||
regs = task_pt_regs(child);
|
||||
@@ -90,21 +91,25 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
|
||||
tmp = regs->regs[addr];
|
||||
break;
|
||||
case FPR_BASE ... FPR_BASE + 31:
|
||||
if (tsk_used_math(child)) {
|
||||
fpureg_t *fregs = get_fpu_regs(child);
|
||||
|
||||
if (!tsk_used_math(child)) {
|
||||
/* FP not yet used */
|
||||
tmp = -1;
|
||||
break;
|
||||
}
|
||||
fregs = get_fpu_regs(child);
|
||||
if (test_thread_flag(TIF_32BIT_FPREGS)) {
|
||||
/*
|
||||
* The odd registers are actually the high
|
||||
* order bits of the values stored in the even
|
||||
* registers - unless we're using r2k_switch.S.
|
||||
*/
|
||||
if (addr & 1)
|
||||
tmp = (unsigned long) (fregs[((addr & ~1) - 32)] >> 32);
|
||||
tmp = fregs[(addr & ~1) - 32] >> 32;
|
||||
else
|
||||
tmp = (unsigned long) (fregs[(addr - 32)] & 0xffffffff);
|
||||
} else {
|
||||
tmp = -1; /* FP not yet used */
|
||||
tmp = fregs[addr - 32];
|
||||
break;
|
||||
}
|
||||
tmp = fregs[addr - FPR_BASE];
|
||||
break;
|
||||
case PC:
|
||||
tmp = regs->cp0_epc;
|
||||
@@ -147,13 +152,13 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
|
||||
if (cpu_has_mipsmt) {
|
||||
unsigned int vpflags = dvpe();
|
||||
flags = read_c0_status();
|
||||
__enable_fpu();
|
||||
__enable_fpu(FPU_AS_IS);
|
||||
__asm__ __volatile__("cfc1\t%0,$0": "=r" (tmp));
|
||||
write_c0_status(flags);
|
||||
evpe(vpflags);
|
||||
} else {
|
||||
flags = read_c0_status();
|
||||
__enable_fpu();
|
||||
__enable_fpu(FPU_AS_IS);
|
||||
__asm__ __volatile__("cfc1\t%0,$0": "=r" (tmp));
|
||||
write_c0_status(flags);
|
||||
}
|
||||
@@ -236,20 +241,24 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
|
||||
sizeof(child->thread.fpu));
|
||||
child->thread.fpu.fcr31 = 0;
|
||||
}
|
||||
/*
|
||||
* The odd registers are actually the high order bits
|
||||
* of the values stored in the even registers - unless
|
||||
* we're using r2k_switch.S.
|
||||
*/
|
||||
if (addr & 1) {
|
||||
fregs[(addr & ~1) - FPR_BASE] &= 0xffffffff;
|
||||
fregs[(addr & ~1) - FPR_BASE] |= ((unsigned long long) data) << 32;
|
||||
} else {
|
||||
fregs[addr - FPR_BASE] &= ~0xffffffffLL;
|
||||
/* Must cast, lest sign extension fill upper
|
||||
bits! */
|
||||
fregs[addr - FPR_BASE] |= (unsigned int)data;
|
||||
if (test_thread_flag(TIF_32BIT_FPREGS)) {
|
||||
/*
|
||||
* The odd registers are actually the high
|
||||
* order bits of the values stored in the even
|
||||
* registers - unless we're using r2k_switch.S.
|
||||
*/
|
||||
if (addr & 1) {
|
||||
fregs[(addr & ~1) - FPR_BASE] &=
|
||||
0xffffffff;
|
||||
fregs[(addr & ~1) - FPR_BASE] |=
|
||||
((u64)data) << 32;
|
||||
} else {
|
||||
fregs[addr - FPR_BASE] &= ~0xffffffffLL;
|
||||
fregs[addr - FPR_BASE] |= data;
|
||||
}
|
||||
break;
|
||||
}
|
||||
fregs[addr - FPR_BASE] = data;
|
||||
break;
|
||||
}
|
||||
case PC:
|
||||
|
Reference in New Issue
Block a user