openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ptrace: cleanup arch_ptrace() on frv 

Use new 'regno', 'datap' variables in order to remove duplicated
expressions and unnecessary castings. Alse remove checking @addr
less than 0 because addr is now unsigned.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Cc: "Daniel K." <dk@uw.no>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Namhyung Kim 2010-10-27 15:33:52 -07:00 committed by Linus Torvalds
parent 475a4b8138
commit 81d3285c96
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/frv/kernel/ptrace.c
View File

@ -259,19 +259,21 @@ long arch_ptrace(struct task_struct *child, long request,
{ {
unsigned long tmp; unsigned long tmp;
int ret; int ret;
int regno = addr >> 2;
unsigned long __user *datap = (unsigned long __user *) data;
switch (request) { switch (request) {
/* read the word at location addr in the USER area. */ /* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: { case PTRACE_PEEKUSR: {
tmp = 0; tmp = 0;
ret = -EIO; ret = -EIO;
if ((addr & 3) || addr < 0) if (addr & 3)
break; break;
ret = 0; ret = 0;
switch (addr >> 2) { switch (regno) {
case 0 ... PT__END - 1: case 0 ... PT__END - 1:
tmp = get_reg(child, addr >> 2); tmp = get_reg(child, regno);
break; break;
case PT__END + 0: case PT__END + 0:
@ -300,23 +302,18 @@ long arch_ptrace(struct task_struct *child, long request,
} }
if (ret == 0) if (ret == 0)
ret = put_user(tmp, (unsigned long *) data); ret = put_user(tmp, datap);
break; break;
} }
case PTRACE_POKEUSR: /* write the word at location addr in the USER area */ case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
ret = -EIO; ret = -EIO;
if ((addr & 3) || addr < 0) if (addr & 3)
break; break;
ret = 0; switch (regno) {
switch (addr >> 2) {
case 0 ... PT__END - 1: case 0 ... PT__END - 1:
ret = put_reg(child, addr >> 2, data); ret = put_reg(child, regno, data);
break;
default:
ret = -EIO;
break; break;
} }
break; break;
@ -325,25 +322,25 @@ long arch_ptrace(struct task_struct *child, long request,
return copy_regset_to_user(child, &user_frv_native_view, return copy_regset_to_user(child, &user_frv_native_view,
REGSET_GENERAL, REGSET_GENERAL,
0, sizeof(child->thread.user->i), 0, sizeof(child->thread.user->i),
(void __user *)data); datap);
case PTRACE_SETREGS: /* Set all integer regs in the child. */ case PTRACE_SETREGS: /* Set all integer regs in the child. */
return copy_regset_from_user(child, &user_frv_native_view, return copy_regset_from_user(child, &user_frv_native_view,
REGSET_GENERAL, REGSET_GENERAL,
0, sizeof(child->thread.user->i), 0, sizeof(child->thread.user->i),
(const void __user *)data); datap);
case PTRACE_GETFPREGS: /* Get the child FP/Media state. */ case PTRACE_GETFPREGS: /* Get the child FP/Media state. */
return copy_regset_to_user(child, &user_frv_native_view, return copy_regset_to_user(child, &user_frv_native_view,
REGSET_FPMEDIA, REGSET_FPMEDIA,
0, sizeof(child->thread.user->f), 0, sizeof(child->thread.user->f),
(void __user *)data); datap);
case PTRACE_SETFPREGS: /* Set the child FP/Media state. */ case PTRACE_SETFPREGS: /* Set the child FP/Media state. */
return copy_regset_from_user(child, &user_frv_native_view, return copy_regset_from_user(child, &user_frv_native_view,
REGSET_FPMEDIA, REGSET_FPMEDIA,
0, sizeof(child->thread.user->f), 0, sizeof(child->thread.user->f),
(const void __user *)data); datap);
default: default:
ret = ptrace_request(child, request, addr, data); ret = ptrace_request(child, request, addr, data);