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

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

ptrace: cleanup arch_ptrace() on m68k 



Use new 'regno', 'datap' variables in order to remove duplicated
expressions and unnecessary castings.

Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a68caa03

arch/m68k/kernel/ptrace.c

+23 −23
Original line number Original line Diff line number Diff line
@@ -161,51 +161,52 @@ long arch_ptrace(struct task_struct *child, long request, 
{

{

	unsigned long tmp;

	unsigned long tmp;

	int i, ret = 0;

	int i, ret = 0;

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

	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:

		if (addr & 3)

		if (addr & 3)

			goto out_eio;

			goto out_eio;

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





		if (addr >= 0 && addr < 19) {

		if (regno >= 0 && regno < 19) {

			tmp = get_reg(child, addr);

			tmp = get_reg(child, regno);

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

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

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

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

			/* Convert internal fpu reg representation

			/* Convert internal fpu reg representation

			 * into long double format

			 * into long double format

			 */

			 */

			if (FPU_IS_EMU && (addr < 45) && !(addr % 3))

			if (FPU_IS_EMU && (regno < 45) && !(regno % 3))

				tmp = ((tmp & 0xffff0000) << 15) |

				tmp = ((tmp & 0xffff0000) << 15) |

				      ((tmp & 0x0000ffff) << 16);

				      ((tmp & 0x0000ffff) << 16);

		} else

		} else

			goto out_eio;

			goto out_eio;

		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 */

		if (addr & 3)

		if (addr & 3)

			goto out_eio;

			goto out_eio;

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





		if (addr == PT_SR) {

		if (regno == PT_SR) {

			data &= SR_MASK;

			data &= SR_MASK;

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

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

		}

		}

		if (addr >= 0 && addr < 19) {

		if (regno >= 0 && regno < 19) {

			if (put_reg(child, addr, data))

			if (put_reg(child, regno, data))

				goto out_eio;

				goto out_eio;

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

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

			/* Convert long double format

			/* Convert long double format

			 * into internal fpu reg representation

			 * into internal fpu reg representation

			 */

			 */

			if (FPU_IS_EMU && (addr < 45) && !(addr % 3)) {

			if (FPU_IS_EMU && (regno < 45) && !(regno % 3)) {

				data <<= 15;

				data <<= 15;

				data = (data & 0xffff0000) |

				data = (data & 0xffff0000) |

				       ((data & 0x0000ffff) >> 1);

				       ((data & 0x0000ffff) >> 1);

			}

			}

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

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

		} else

		} else

			goto out_eio;

			goto out_eio;

		break;

		break;
@@ -213,16 +214,16 @@ long arch_ptrace(struct task_struct *child, long request, 
	case PTRACE_GETREGS:	/* Get all gp regs from the child. */

	case PTRACE_GETREGS:	/* Get all gp regs from the child. */

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

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

			tmp = get_reg(child, i);

			tmp = get_reg(child, i);

			ret = put_user(tmp, (unsigned long *)data);

			ret = put_user(tmp, datap);

			if (ret)

			if (ret)

				break;

				break;

			data += sizeof(unsigned long);

			datap++;

		}

		}

		break;

		break;





	case PTRACE_SETREGS:	/* Set all gp regs in the child. */

	case PTRACE_SETREGS:	/* Set all gp regs in the child. */

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

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

			ret = get_user(tmp, (unsigned long *)data);

			ret = get_user(tmp, datap);

			if (ret)

			if (ret)

				break;

				break;

			if (i == PT_SR) {

			if (i == PT_SR) {
@@ -230,25 +231,24 @@ long arch_ptrace(struct task_struct *child, long request, 
				tmp |= get_reg(child, PT_SR) & ~SR_MASK;

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

			}

			}

			put_reg(child, i, tmp);

			put_reg(child, i, tmp);

			data += sizeof(unsigned long);

			datap++;

		}

		}

		break;

		break;





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

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

		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;





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

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

		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;





	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: