lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Use user_regset accessors for SPE regs

Browse Source 
This implements user_regset-style accessors for the powerpc SPE data,
and rewrites the existing ptrace code in terms of those calls.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Roland McGrath
2007-12-20 03:57:48 -08:00
committed by Paul Mackerras
parent 3caf06c6e0
commit a4e4b175b6
1 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
arch/powerpc/kernel/ptrace.c
View File

@@ -272,30 +272,68 @@ static int set_vrregs(struct task_struct *task, unsigned long __user *data)
* } * }
*/ */
static int evr_active(struct task_struct *target,
const struct user_regset *regset)
{
flush_spe_to_thread(target);
return target->thread.used_spe ? regset->n : 0;
}
static int evr_get(struct task_struct *target, const struct user_regset *regset,
unsigned int pos, unsigned int count,
void *kbuf, void __user *ubuf)
{
int ret;
flush_spe_to_thread(target);
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.evr,
0, sizeof(target->thread.evr));
BUILD_BUG_ON(offsetof(struct thread_struct, acc) + sizeof(u64) !=
offsetof(struct thread_struct, spefscr));
if (!ret)
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.acc,
sizeof(target->thread.evr), -1);
return ret;
}
static int evr_set(struct task_struct *target, const struct user_regset *regset,
unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf)
{
int ret;
flush_spe_to_thread(target);
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.evr,
0, sizeof(target->thread.evr));
BUILD_BUG_ON(offsetof(struct thread_struct, acc) + sizeof(u64) !=
offsetof(struct thread_struct, spefscr));
if (!ret)
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.acc,
sizeof(target->thread.evr), -1);
return ret;
}
/* /*
* Get contents of SPE register state in task TASK. * Get contents of SPE register state in task TASK.
*/ */
static int get_evrregs(unsigned long *data, struct task_struct *task) static int get_evrregs(unsigned long __user *data, struct task_struct *task)
{ {
int i; if (!access_ok(VERIFY_WRITE, data, 35 * sizeof(u32)))
if (!access_ok(VERIFY_WRITE, data, 35 * sizeof(unsigned long)))
return -EFAULT; return -EFAULT;
/* copy SPEFSCR */ return evr_get(task, NULL, 0, 35 * sizeof(u32), NULL, data);
if (__put_user(task->thread.spefscr, &data[34]))
return -EFAULT;
/* copy SPE registers EVR[0] .. EVR[31] */
for (i = 0; i < 32; i++, data++)
if (__put_user(task->thread.evr[i], data))
return -EFAULT;
/* copy ACC */
if (__put_user64(task->thread.acc, (unsigned long long *)data))
return -EFAULT;
return 0;
} }
/* /*
@@ -303,24 +341,10 @@ static int get_evrregs(unsigned long *data, struct task_struct *task)
*/ */
static int set_evrregs(struct task_struct *task, unsigned long *data) static int set_evrregs(struct task_struct *task, unsigned long *data)
{ {
int i; if (!access_ok(VERIFY_READ, data, 35 * sizeof(u32)))
if (!access_ok(VERIFY_READ, data, 35 * sizeof(unsigned long)))
return -EFAULT; return -EFAULT;
/* copy SPEFSCR */ return evr_set(task, NULL, 0, 35 * sizeof(u32), NULL, data);
if (__get_user(task->thread.spefscr, &data[34]))
return -EFAULT;
/* copy SPE registers EVR[0] .. EVR[31] */
for (i = 0; i < 32; i++, data++)
if (__get_user(task->thread.evr[i], data))
return -EFAULT;
/* copy ACC */
if (__get_user64(task->thread.acc, (unsigned long long*)data))
return -EFAULT;
return 0;
} }
#endif /* CONFIG_SPE */ #endif /* CONFIG_SPE */