Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf60ef96 authored by Namhyung Kim's avatar Namhyung Kim Committed by Linus Torvalds
Browse files

ptrace: cleanup arch_ptrace() on m68knommu 



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>
Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent add3d6e8

arch/m68knommu/kernel/ptrace.c

+25 −29
Original line number Original line Diff line number Diff line
@@ -116,6 +116,8 @@ 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. */
@@ -123,53 +125,48 @@ long arch_ptrace(struct task_struct *child, long request, 
			unsigned long tmp;

			unsigned long tmp;

			

			

			ret = -EIO;

			ret = -EIO;

			if ((addr & 3) || addr < 0 ||

			if ((addr & 3) || addr > sizeof(struct user) - 3)

			    addr > sizeof(struct user) - 3)

				break;

				break;

			

			

			tmp = 0;  /* Default return condition */

			tmp = 0;  /* Default return condition */

			addr = addr >> 2; /* temporary hack. */

			ret = -EIO;

			ret = -EIO;

			if (addr < 19) {

			if (regno < 19) {

				tmp = get_reg(child, addr);

				tmp = get_reg(child, regno);

				if (addr == PT_SR)

				if (regno == PT_SR)

					tmp >>= 16;

					tmp >>= 16;

			} else if (addr >= 21 && addr < 49) {

			} else if (regno >= 21 && regno < 49) {

				tmp = child->thread.fp[addr - 21];

				tmp = child->thread.fp[regno - 21];

			} else if (addr == 49) {

			} else if (regno == 49) {

				tmp = child->mm->start_code;

				tmp = child->mm->start_code;

			} else if (addr == 50) {

			} else if (regno == 50) {

				tmp = child->mm->start_data;

				tmp = child->mm->start_data;

			} else if (addr == 51) {

			} else if (regno == 51) {

				tmp = child->mm->end_code;

				tmp = child->mm->end_code;

			} else

			} else

				break;

				break;

			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) || addr > sizeof(struct user) - 3)

			    addr > sizeof(struct user) - 3)

				break;

				break;





			addr = addr >> 2; /* temporary hack. */

			if (regno == PT_SR) {

			    

			if (addr == PT_SR) {

				data &= SR_MASK;

				data &= SR_MASK;

				data <<= 16;

				data <<= 16;

				data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);

				data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);

			}

			}

			if (addr < 19) {

			if (regno < 19) {

				if (put_reg(child, addr, data))

				if (put_reg(child, regno, data))

					break;

					break;

				ret = 0;

				ret = 0;

				break;

				break;

			}

			}

			if (addr >= 21 && addr < 48)

			if (regno >= 21 && regno < 48)

			{

			{

				child->thread.fp[addr - 21] = data;

				child->thread.fp[regno - 21] = data;

				ret = 0;

				ret = 0;

			}

			}

			break;

			break;
@@ -181,11 +178,11 @@ long arch_ptrace(struct task_struct *child, long request, 
			    tmp = get_reg(child, i);

			    tmp = get_reg(child, i);

			    if (i == PT_SR)

			    if (i == PT_SR)

				tmp >>= 16;

				tmp >>= 16;

			    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;
@@ -195,7 +192,7 @@ long arch_ptrace(struct task_struct *child, long request, 
			int i;

			int i;

			unsigned long tmp;

			unsigned long tmp;

			for (i = 0; i < 19; i++) {

			for (i = 0; i < 19; i++) {

			    if (get_user(tmp, (unsigned long *) data)) {

			    if (get_user(tmp, datap)) {

				ret = -EFAULT;

				ret = -EFAULT;

				break;

				break;

			    }

			    }
@@ -205,7 +202,7 @@ long arch_ptrace(struct task_struct *child, long request, 
				tmp |= get_reg(child, PT_SR) & ~(SR_MASK << 16);

				tmp |= get_reg(child, PT_SR) & ~(SR_MASK << 16);

			    }

			    }

			    put_reg(child, i, tmp);

			    put_reg(child, i, tmp);

			    data += sizeof(unsigned long);

			    datap++;

			}

			}

			ret = 0;

			ret = 0;

			break;

			break;
@@ -214,7 +211,7 @@ long arch_ptrace(struct task_struct *child, long request, 
#ifdef PTRACE_GETFPREGS

#ifdef PTRACE_GETFPREGS

		case PTRACE_GETFPREGS: { /* Get the child FPU state. */

		case PTRACE_GETFPREGS: { /* Get the child FPU state. */

			ret = 0;

			ret = 0;

			if (copy_to_user((void *)data, &child->thread.fp,

			if (copy_to_user(datap, &child->thread.fp,

					 sizeof(struct user_m68kfp_struct)))

					 sizeof(struct user_m68kfp_struct)))

				ret = -EFAULT;

				ret = -EFAULT;

			break;

			break;
@@ -224,7 +221,7 @@ long arch_ptrace(struct task_struct *child, long request, 
#ifdef PTRACE_SETFPREGS

#ifdef PTRACE_SETFPREGS

		case PTRACE_SETFPREGS: { /* Set the child FPU state. */

		case PTRACE_SETFPREGS: { /* Set the child FPU state. */

			ret = 0;

			ret = 0;

			if (copy_from_user(&child->thread.fp, (void *)data,

			if (copy_from_user(&child->thread.fp, datap,

					   sizeof(struct user_m68kfp_struct)))

					   sizeof(struct user_m68kfp_struct)))

				ret = -EFAULT;

				ret = -EFAULT;

			break;

			break;
@@ -232,8 +229,7 @@ long arch_ptrace(struct task_struct *child, long request, 
#endif

#endif





	case PTRACE_GET_THREAD_AREA:

	case PTRACE_GET_THREAD_AREA:

		ret = put_user(task_thread_info(child)->tp_value,

		ret = put_user(task_thread_info(child)->tp_value, datap);

			       (unsigned long __user *)data);

		break;

		break;





		default:

		default: