lkml.org 
[lkml]   [2009]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 07/17] arm: user_regset: FPU regs
Date
This converts PTRACE_GETFPREGS/PTRACE_SETFPREGS into user_regset form.
There should be no change in the ptrace behavior.

Signed-off-by: Roland McGrath <roland@redhat.com>
---
arch/arm/kernel/ptrace.c | 48 +++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index fbb18e4..9e7aa04 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -589,21 +589,38 @@ static int gpr_set(struct task_struct *target,
/*
* Get the child FPU state.
*/
-static int ptrace_getfpregs(struct task_struct *tsk, void __user *ufp)
+static int user_fp_get(struct task_struct *target,
+ const struct user_regset *regset,
+ unsigned int pos, unsigned int count,
+ void *kbuf, void __user *ubuf)
{
- return copy_to_user(ufp, &task_thread_info(tsk)->fpstate,
- sizeof(struct user_fp)) ? -EFAULT : 0;
+ return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+ &task_thread_info(target)->fpstate,
+ 0, sizeof(struct user_fp));
+}
+
+/*
+ * Decide if the FPU state is interesting enough to look at or dump.
+ */
+static int user_fp_active(struct task_struct *target,
+ const struct user_regset *regset)
+{
+ struct thread_info *thread = task_thread_info(target);
+ return (thread->used_cp[1] || thread->used_cp[2]) ? regset->n : 0;
}

/*
* Set the child FPU state.
*/
-static int ptrace_setfpregs(struct task_struct *tsk, void __user *ufp)
+static int user_fp_set(struct task_struct *target,
+ const struct user_regset *regset,
+ unsigned int pos, unsigned int count,
+ const void *kbuf, const void __user *ubuf)
{
- struct thread_info *thread = task_thread_info(tsk);
+ struct thread_info *thread = task_thread_info(target);
thread->used_cp[1] = thread->used_cp[2] = 1;
- return copy_from_user(&thread->fpstate, ufp,
- sizeof(struct user_fp)) ? -EFAULT : 0;
+ return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+ &thread->fpstate, 0, sizeof(struct user_fp));
}

#ifdef CONFIG_IWMMXT
@@ -720,6 +737,7 @@ static int ptrace_setvfpregs(struct task_struct *tsk, void __user *data)
*/
enum {
REGSET_GPR,
+ REGSET_FP,
};

static const struct user_regset arm_regsets[] = {
@@ -728,6 +746,12 @@ static const struct user_regset arm_regsets[] = {
.size = sizeof(long), .align = sizeof(long),
.get = gpr_get, .set = gpr_set
},
+ [REGSET_FP] = {
+ .core_note_type = NT_PRFPREG,
+ .n = sizeof(struct user_fp) / sizeof(long),
+ .size = sizeof(long), .align = sizeof(long),
+ .active = user_fp_active, .get = user_fp_get, .set = user_fp_set
+ },
};

static const struct user_regset_view user_arm_view = {
@@ -790,12 +814,14 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
(const void __user *) data);

case PTRACE_GETFPREGS:
- ret = ptrace_getfpregs(child, (void __user *)data);
- break;
+ return copy_regset_to_user(child, &user_arm_view, REGSET_FP,
+ 0, sizeof(struct user_fp),
+ (void __user *) data);

case PTRACE_SETFPREGS:
- ret = ptrace_setfpregs(child, (void __user *)data);
- break;
+ return copy_regset_from_user(child, &user_arm_view, REGSET_FP,
+ 0, sizeof(struct user_fp),
+ (const void __user *) data);

#ifdef CONFIG_IWMMXT
case PTRACE_GETWMMXREGS:

\
 
 \ /
  Last update: 2009-04-25 02:15    [W:0.188 / U:3.672 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site