lkml.org 
[lkml]   [2010]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 17/43] ptrace, h8300: cleanup arch_ptrace()
    Date
    use new regno, datap variables in order to remove duplicated expressions and
    unnecessary castings.

    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    ---
    arch/h8300/kernel/ptrace.c | 26 +++++++++++++-------------
    1 files changed, 13 insertions(+), 13 deletions(-)

    diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c
    index 23a95f84..00ddc9c 100644
    --- a/arch/h8300/kernel/ptrace.c
    +++ b/arch/h8300/kernel/ptrace.c
    @@ -54,6 +54,8 @@ long arch_ptrace(struct task_struct *child, long request,
    unsigned long addr, unsigned long data)
    {
    int ret;
    + int regno = addr >> 2; /* temporary hack. */
    + unsigned long __user *datap = (unsigned long __user *) data;

    switch (request) {
    /* read the word at location addr in the USER area. */
    @@ -66,12 +68,11 @@ long arch_ptrace(struct task_struct *child, long request,
    }

    ret = 0; /* Default return condition */
    - addr = addr >> 2; /* temporary hack. */

    - if (addr < H8300_REGS_NO)
    - tmp = h8300_get_reg(child, addr);
    + if (regno < H8300_REGS_NO)
    + tmp = h8300_get_reg(child, regno);
    else {
    - switch(addr) {
    + switch(regno) {
    case 49:
    tmp = child->mm->start_code;
    break ;
    @@ -89,7 +90,7 @@ long arch_ptrace(struct task_struct *child, long request,
    }
    }
    if (!ret)
    - ret = put_user(tmp,(unsigned long *) data);
    + ret = put_user(tmp, datap);
    break ;
    }

    @@ -99,14 +100,13 @@ long arch_ptrace(struct task_struct *child, long request,
    ret = -EIO;
    break ;
    }
    - addr = addr >> 2; /* temporary hack. */

    - if (addr == PT_ORIG_ER0) {
    + if (regno == PT_ORIG_ER0) {
    ret = -EIO;
    break ;
    }
    - if (addr < H8300_REGS_NO) {
    - ret = h8300_put_reg(child, addr, data);
    + if (regno < H8300_REGS_NO) {
    + ret = h8300_put_reg(child, regno, data);
    break ;
    }
    ret = -EIO;
    @@ -117,11 +117,11 @@ long arch_ptrace(struct task_struct *child, long request,
    unsigned long tmp;
    for (i = 0; i < H8300_REGS_NO; i++) {
    tmp = h8300_get_reg(child, i);
    - if (put_user(tmp, (unsigned long *) data)) {
    + if (put_user(tmp, datap)) {
    ret = -EFAULT;
    break;
    }
    - data += sizeof(unsigned long);
    + datap++;
    }
    ret = 0;
    break;
    @@ -131,12 +131,12 @@ long arch_ptrace(struct task_struct *child, long request,
    int i;
    unsigned long tmp;
    for (i = 0; i < H8300_REGS_NO; i++) {
    - if (get_user(tmp, (unsigned long *) data)) {
    + if (get_user(tmp, datap)) {
    ret = -EFAULT;
    break;
    }
    h8300_put_reg(child, i, tmp);
    - data += sizeof(unsigned long);
    + datap++;
    }
    ret = 0;
    break;
    --
    1.7.2.2


    \
     
     \ /
      Last update: 2010-08-27 11:51    [W:3.361 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site