Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c75a31c authored by Michael Neuling's avatar Michael Neuling Committed by Paul Mackerras
Browse files

powerpc: Add macros to access floating point registers in thread_struct. 



We are going to change where the floating point registers are stored
in the thread_struct, so in preparation add some macros to access the
floating point registers.  Update all code to use these new macros.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 9e751186

arch/powerpc/kernel/align.c

+3 −3
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr, 
static int emulate_fp_pair(struct pt_regs *regs, unsigned char __user *addr,

			   unsigned int reg, unsigned int flags)

{

	char *ptr = (char *) &current->thread.fpr[reg];

	char *ptr = (char *) &current->thread.TS_FPR(reg);

	int i, ret;



	if (!(flags & F))
@@ -784,7 +784,7 @@ int fix_alignment(struct pt_regs *regs) 
				return -EFAULT;

		}

	} else if (flags & F) {

		data.dd = current->thread.fpr[reg];

		data.dd = current->thread.TS_FPR(reg);

		if (flags & S) {

			/* Single-precision FP store requires conversion... */

#ifdef CONFIG_PPC_FPU
@@ -862,7 +862,7 @@ int fix_alignment(struct pt_regs *regs) 
		if (unlikely(ret))

			return -EFAULT;

	} else if (flags & F)

		current->thread.fpr[reg] = data.dd;

		current->thread.TS_FPR(reg) = data.dd;

	else

		regs->gpr[reg] = data.ll;

arch/powerpc/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs) 
		return 0;

	flush_fp_to_thread(current);



	memcpy(fpregs, &tsk->thread.fpr[0], sizeof(*fpregs));

	memcpy(fpregs, &tsk->thread.TS_FPR(0), sizeof(*fpregs));



	return 1;

}

arch/powerpc/kernel/ptrace.c

+6 −4
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int fpr_get(struct task_struct *target, const struct user_regset *regset, 
	flush_fp_to_thread(target);



	BUILD_BUG_ON(offsetof(struct thread_struct, fpscr) !=

		     offsetof(struct thread_struct, fpr[32]));

		     offsetof(struct thread_struct, TS_FPR(32)));



	return user_regset_copyout(&pos, &count, &kbuf, &ubuf,

				   &target->thread.fpr, 0, -1);
@@ -231,7 +231,7 @@ static int fpr_set(struct task_struct *target, const struct user_regset *regset, 
	flush_fp_to_thread(target);



	BUILD_BUG_ON(offsetof(struct thread_struct, fpscr) !=

		     offsetof(struct thread_struct, fpr[32]));

		     offsetof(struct thread_struct, TS_FPR(32)));



	return user_regset_copyin(&pos, &count, &kbuf, &ubuf,

				  &target->thread.fpr, 0, -1);
@@ -728,7 +728,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
			tmp = ptrace_get_reg(child, (int) index);

		} else {

			flush_fp_to_thread(child);

			tmp = ((unsigned long *)child->thread.fpr)[index - PT_FPR0];

			tmp = ((unsigned long *)child->thread.fpr)

				[TS_FPRWIDTH * (index - PT_FPR0)];

		}

		ret = put_user(tmp,(unsigned long __user *) data);

		break;
@@ -755,7 +756,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
			ret = ptrace_put_reg(child, index, data);

		} else {

			flush_fp_to_thread(child);

			((unsigned long *)child->thread.fpr)[index - PT_FPR0] = data;

			((unsigned long *)child->thread.fpr)

				[TS_FPRWIDTH * (index - PT_FPR0)] = data;

			ret = 0;

		}

		break;

arch/powerpc/kernel/ptrace32.c

+11 −3
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ static long compat_ptrace_old(struct task_struct *child, long request, 
	return -EPERM;

}



/* Macros to workout the correct index for the FPR in the thread struct */

#define FPRNUMBER(i) (((i) - PT_FPR0) >> 1)

#define FPRHALF(i) (((i) - PT_FPR0) & 1)

#define FPRINDEX(i) TS_FPRWIDTH * FPRNUMBER(i) + FPRHALF(i)



long compat_arch_ptrace(struct task_struct *child, compat_long_t request,

			compat_ulong_t caddr, compat_ulong_t cdata)

{
@@ -122,7 +127,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
			 * to be an array of unsigned int (32 bits) - the

			 * index passed in is based on this assumption.

			 */

			tmp = ((unsigned int *)child->thread.fpr)[index - PT_FPR0];

			tmp = ((unsigned int *)child->thread.fpr)

				[FPRINDEX(index)];

		}

		ret = put_user((unsigned int)tmp, (u32 __user *)data);

		break;
@@ -162,7 +168,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
		CHECK_FULL_REGS(child->thread.regs);

		if (numReg >= PT_FPR0) {

			flush_fp_to_thread(child);

			tmp = ((unsigned long int *)child->thread.fpr)[numReg - PT_FPR0];

			tmp = ((unsigned long int *)child->thread.fpr)

				[FPRINDEX(numReg)];

		} else { /* register within PT_REGS struct */

			tmp = ptrace_get_reg(child, numReg);

		}
@@ -217,7 +224,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
			 * to be an array of unsigned int (32 bits) - the

			 * index passed in is based on this assumption.

			 */

			((unsigned int *)child->thread.fpr)[index - PT_FPR0] = data;

			((unsigned int *)child->thread.fpr)

				[FPRINDEX(index)] = data;

			ret = 0;

		}

		break;

arch/powerpc/kernel/softemu8xx.c

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ int Soft_emulate_8xx(struct pt_regs *regs) 
	disp = instword & 0xffff;



	ea = (u32 *)(regs->gpr[idxreg] + disp);

	ip = (u32 *)&current->thread.fpr[flreg];

	ip = (u32 *)&current->thread.TS_FPR(flreg);



	switch ( inst )

	{
@@ -168,7 +168,7 @@ int Soft_emulate_8xx(struct pt_regs *regs) 
		break;

	case FMR:

		/* assume this is a fp move -- Cort */

		memcpy(ip, &current->thread.fpr[(instword>>11)&0x1f],

		memcpy(ip, &current->thread.TS_FPR((instword>>11)&0x1f),

		       sizeof(double));

		break;

	default: