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 13/17] arm: user_regset: Crunch regs
Date
This converts the ptrace Crunch support into user_regset form.
There should be no change in the ptrace behavior on CONFIG_CRUNCH.

I am not set up to test any hardware with CONFIG_CRUNCH or to try
any software that uses Crunch so as to verify it. I've tested that
it compiles. This regset's code is as simple as any can be.

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

diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index d59e074..78b457c 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -671,25 +671,33 @@ static int iwmmxt_set(struct task_struct *target,
/*
* Get the child Crunch state.
*/
-static int ptrace_getcrunchregs(struct task_struct *tsk, void __user *ufp)
+static int crunch_get(struct task_struct *target,
+ const struct user_regset *regset,
+ unsigned int pos, unsigned int count,
+ void *kbuf, void __user *ubuf)
{
- struct thread_info *thread = task_thread_info(tsk);
+ struct thread_info *thread = task_thread_info(target);

crunch_task_disable(thread); /* force it to ram */
- return copy_to_user(ufp, &thread->crunchstate, CRUNCH_SIZE)
- ? -EFAULT : 0;
+
+ return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+ &thread->crunchstate, 0, CRUNCH_SIZE);
}

/*
* Set the child Crunch state.
*/
-static int ptrace_setcrunchregs(struct task_struct *tsk, void __user *ufp)
+static int crunch_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);

crunch_task_release(thread); /* force a reload */
- return copy_from_user(&thread->crunchstate, ufp, CRUNCH_SIZE)
- ? -EFAULT : 0;
+
+ return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+ &thread->crunchstate, 0, CRUNCH_SIZE);
}
#endif

@@ -804,6 +812,9 @@ enum {
#ifdef CONFIG_IWMMXT
REGSET_IWMMXT,
#endif
+#ifdef CONFIG_CRUNCH
+ REGSET_CRUNCH,
+#endif
};

static const struct user_regset arm_regsets[] = {
@@ -834,6 +845,13 @@ static const struct user_regset arm_regsets[] = {
.active = iwmmxt_active, .get = iwmmxt_get, .set = iwmmxt_set
},
#endif
+#ifdef CONFIG_CRUNCH
+ [REGSET_CRUNCH] = {
+ .n = sizeof(struct crunch_state) / sizeof(int),
+ .size = sizeof(int), .align = sizeof(int),
+ .get = crunch_get, .set = crunch_set
+ },
+#endif
};

static const struct user_regset_view user_arm_view = {
@@ -931,12 +949,14 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)

#ifdef CONFIG_CRUNCH
case PTRACE_GETCRUNCHREGS:
- ret = ptrace_getcrunchregs(child, (void __user *)data);
- break;
+ return copy_regset_from_user(child, &user_arm_view,
+ REGSET_CRUNCH, 0, CRUNCH_SIZE,
+ (const void __user *) data);

case PTRACE_SETCRUNCHREGS:
- ret = ptrace_setcrunchregs(child, (void __user *)data);
- break;
+ return copy_regset_from_user(child, &user_arm_view,
+ REGSET_CRUNCH, 0, CRUNCH_SIZE,
+ (const void __user *) data);
#endif

#ifdef CONFIG_VFP

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