Commit 05fabdac authored by Namhyung Kim's avatar Namhyung Kim Committed by Linus Torvalds

ptrace: cleanup arch_ptrace() on h8300

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: default avatarNamhyung Kim <namhyung@gmail.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 81d3285c
...@@ -54,24 +54,25 @@ long arch_ptrace(struct task_struct *child, long request, ...@@ -54,24 +54,25 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data) unsigned long addr, unsigned long data)
{ {
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: {
unsigned long tmp = 0; unsigned long tmp = 0;
if ((addr & 3) || addr < 0 || addr >= sizeof(struct user)) { if ((addr & 3) || addr >= sizeof(struct user)) {
ret = -EIO; ret = -EIO;
break ; break ;
} }
ret = 0; /* Default return condition */ ret = 0; /* Default return condition */
addr = addr >> 2; /* temporary hack. */
if (addr < H8300_REGS_NO) if (regno < H8300_REGS_NO)
tmp = h8300_get_reg(child, addr); tmp = h8300_get_reg(child, regno);
else { else {
switch(addr) { switch (regno) {
case 49: case 49:
tmp = child->mm->start_code; tmp = child->mm->start_code;
break ; break ;
...@@ -89,24 +90,23 @@ long arch_ptrace(struct task_struct *child, long request, ...@@ -89,24 +90,23 @@ long arch_ptrace(struct task_struct *child, long request,
} }
} }
if (!ret) if (!ret)
ret = put_user(tmp,(unsigned long *) data); ret = put_user(tmp, datap);
break ; break ;
} }
/* when I and D space are separate, this will have to be fixed. */ /* when I and D space are separate, this will have to be fixed. */
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 */
if ((addr & 3) || addr < 0 || addr >= sizeof(struct user)) { if ((addr & 3) || addr >= sizeof(struct user)) {
ret = -EIO; ret = -EIO;
break ; break ;
} }
addr = addr >> 2; /* temporary hack. */
if (addr == PT_ORIG_ER0) { if (regno == PT_ORIG_ER0) {
ret = -EIO; ret = -EIO;
break ; break ;
} }
if (addr < H8300_REGS_NO) { if (regno < H8300_REGS_NO) {
ret = h8300_put_reg(child, addr, data); ret = h8300_put_reg(child, regno, data);
break ; break ;
} }
ret = -EIO; ret = -EIO;
...@@ -117,11 +117,11 @@ long arch_ptrace(struct task_struct *child, long request, ...@@ -117,11 +117,11 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long tmp; unsigned long tmp;
for (i = 0; i < H8300_REGS_NO; i++) { for (i = 0; i < H8300_REGS_NO; i++) {
tmp = h8300_get_reg(child, i); tmp = h8300_get_reg(child, i);
if (put_user(tmp, (unsigned long *) data)) { if (put_user(tmp, datap)) {
ret = -EFAULT; ret = -EFAULT;
break; break;
} }
data += sizeof(unsigned long); datap++;
} }
ret = 0; ret = 0;
break; break;
...@@ -131,12 +131,12 @@ long arch_ptrace(struct task_struct *child, long request, ...@@ -131,12 +131,12 @@ long arch_ptrace(struct task_struct *child, long request,
int i; int i;
unsigned long tmp; unsigned long tmp;
for (i = 0; i < H8300_REGS_NO; i++) { for (i = 0; i < H8300_REGS_NO; i++) {
if (get_user(tmp, (unsigned long *) data)) { if (get_user(tmp, datap)) {
ret = -EFAULT; ret = -EFAULT;
break; break;
} }
h8300_put_reg(child, i, tmp); h8300_put_reg(child, i, tmp);
data += sizeof(unsigned long); datap++;
} }
ret = 0; ret = 0;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment