Skip to content

L
linux-davinci-2.6.23
Commit b3319f50 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files
Options

[PATCH] m68k: indent sys_ptrace 

This reformats and properly indents sys_ptrace (only whitespace changes).
Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c3c433e4
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 167 deletions
arch/m68k/kernel/ptrace.c
View file @ b3319f50
...@@ -95,7 +95,7 @@ static inline int put_reg(struct task_struct *task, int regno, ...@@ -95,7 +95,7 @@ static inline int put_reg(struct task_struct *task, int regno,
if (regno == PT_USP) if (regno == PT_USP)
addr = &task->thread.usp; addr = &task->thread.usp;
else if (regno < sizeof(regoff)/sizeof(regoff[0])) else if (regno < sizeof(regoff)/sizeof(regoff[0]))
addr = (unsigned long *) (task->thread.esp0 + regoff[regno]); addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);
else else
return -1; return -1;
*addr = data; *addr = data;
...@@ -157,216 +157,215 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) ...@@ -157,216 +157,215 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
switch (request) { switch (request) {
/* when I and D space are separate, these will need to be fixed. */ /* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */ case PTRACE_PEEKTEXT: /* read word at location addr. */
case PTRACE_PEEKDATA: { case PTRACE_PEEKDATA: {
unsigned long tmp; unsigned long tmp;
int copied; int copied;
copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0); copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO; ret = -EIO;
if (copied != sizeof(tmp)) if (copied != sizeof(tmp))
break;
ret = put_user(tmp,(unsigned long *) data);
break; break;
} ret = put_user(tmp, (unsigned long *)data);
break;
}
/* 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; unsigned long tmp;
ret = -EIO; ret = -EIO;
if ((addr & 3) || addr < 0 || if ((addr & 3) || addr < 0 ||
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. */ addr = addr >> 2; /* temporary hack. */
ret = -EIO; ret = -EIO;
if (addr < 19) { if (addr < 19) {
tmp = get_reg(child, addr); tmp = get_reg(child, addr);
if (addr == PT_SR) if (addr == PT_SR)
tmp >>= 16; tmp >>= 16;
} else if (addr >= 21 && addr < 49) { } else if (addr >= 21 && addr < 49) {
tmp = child->thread.fp[addr - 21]; tmp = child->thread.fp[addr - 21];
#ifdef CONFIG_M68KFPU_EMU #ifdef CONFIG_M68KFPU_EMU
/* 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 && (addr < 45) && !(addr % 3))
tmp = ((tmp & 0xffff0000) << 15) | tmp = ((tmp & 0xffff0000) << 15) |
((tmp & 0x0000ffff) << 16); ((tmp & 0x0000ffff) << 16);
#endif #endif
} else } else
break;
ret = put_user(tmp,(unsigned long *) data);
break; break;
} ret = put_user(tmp, (unsigned long *)data);
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_POKETEXT: /* write the word at location addr. */ case PTRACE_POKETEXT: /* write the word at location addr. */
case PTRACE_POKEDATA: case PTRACE_POKEDATA:
ret = 0; ret = 0;
if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data)) if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
break;
ret = -EIO;
break; break;
ret = -EIO;
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 < 0 ||
addr > sizeof(struct user) - 3) addr > sizeof(struct user) - 3)
break;
addr = addr >> 2; /* temporary hack. */
if (addr == PT_SR) {
data &= SR_MASK;
data <<= 16;
data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
}
if (addr < 19) {
if (put_reg(child, addr, data))
break;
ret = 0;
break;
}
if (addr >= 21 && addr < 48)
{
#ifdef CONFIG_M68KFPU_EMU
/* Convert long double format
* into internal fpu reg representation
*/
if (FPU_IS_EMU && (addr < 45) && !(addr % 3)) {
data = (unsigned long)data << 15;
data = (data & 0xffff0000) |
((data & 0x0000ffff) >> 1);
}
#endif
child->thread.fp[addr - 21] = data;
ret = 0;
}
break; break;
case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */ addr = addr >> 2; /* temporary hack. */
case PTRACE_CONT: { /* restart after signal. */
long tmp;
ret = -EIO; if (addr == PT_SR) {
if (!valid_signal(data)) data &= SR_MASK;
data <<= 16;
data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
}
if (addr < 19) {
if (put_reg(child, addr, data))
break; break;
if (request == PTRACE_SYSCALL) {
child->thread.work.syscall_trace = ~0;
} else {
child->thread.work.syscall_trace = 0;
}
child->exit_code = data;
/* make sure the single step bit is not set. */
tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
put_reg(child, PT_SR, tmp);
child->thread.work.delayed_trace = 0;
wake_up_process(child);
ret = 0; ret = 0;
break; break;
} }
if (addr >= 21 && addr < 48) {
/* #ifdef CONFIG_M68KFPU_EMU
* make the child exit. Best I can do is send it a sigkill. /* Convert long double format
* perhaps it should be put in the status that it wants to * into internal fpu reg representation
* exit. */
*/ if (FPU_IS_EMU && (addr < 45) && !(addr % 3)) {
case PTRACE_KILL: { data = (unsigned long)data << 15;
long tmp; data = (data & 0xffff0000) |
((data & 0x0000ffff) >> 1);
}
#endif
child->thread.fp[addr - 21] = data;
ret = 0; ret = 0;
if (child->exit_state == EXIT_ZOMBIE) /* already dead */
break;
child->exit_code = SIGKILL;
/* make sure the single step bit is not set. */
tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
put_reg(child, PT_SR, tmp);
child->thread.work.delayed_trace = 0;
wake_up_process(child);
break;
} }
break;
case PTRACE_SINGLESTEP: { /* set the trap flag. */ case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
long tmp; case PTRACE_CONT: { /* restart after signal. */
long tmp;
ret = -EIO; ret = -EIO;
if (!valid_signal(data)) if (!valid_signal(data))
break; break;
if (request == PTRACE_SYSCALL) {
child->thread.work.syscall_trace = ~0;
} else {
child->thread.work.syscall_trace = 0; child->thread.work.syscall_trace = 0;
tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16); }
put_reg(child, PT_SR, tmp); child->exit_code = data;
child->thread.work.delayed_trace = 1; /* make sure the single step bit is not set. */
tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
put_reg(child, PT_SR, tmp);
child->thread.work.delayed_trace = 0;
wake_up_process(child);
ret = 0;
break;
}
child->exit_code = data; /*
/* give it a chance to run. */ * make the child exit. Best I can do is send it a sigkill.
wake_up_process(child); * perhaps it should be put in the status that it wants to
ret = 0; * exit.
*/
case PTRACE_KILL: {
long tmp;
ret = 0;
if (child->exit_state == EXIT_ZOMBIE) /* already dead */
break; break;
} child->exit_code = SIGKILL;
/* make sure the single step bit is not set. */
tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
put_reg(child, PT_SR, tmp);
child->thread.work.delayed_trace = 0;
wake_up_process(child);
break;
}
case PTRACE_SINGLESTEP: { /* set the trap flag. */
long tmp;
case PTRACE_DETACH: /* detach a process that was attached. */ ret = -EIO;
ret = ptrace_detach(child, data); if (!valid_signal(data))
break; break;
child->thread.work.syscall_trace = 0;
tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16);
put_reg(child, PT_SR, tmp);
child->thread.work.delayed_trace = 1;
child->exit_code = data;
/* give it a chance to run. */
wake_up_process(child);
ret = 0;
break;
}
case PTRACE_DETACH: /* detach a process that was attached. */
ret = ptrace_detach(child, data);
break;
case PTRACE_GETREGS: { /* Get all gp regs from the child. */ case PTRACE_GETREGS: { /* Get all gp regs from the child. */
int i; int i;
unsigned long tmp; unsigned long tmp;
for (i = 0; i < 19; i++) { for (i = 0; i < 19; i++) {
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, (unsigned long *)data)) {
ret = -EFAULT; ret = -EFAULT;
break; break;
}
data += sizeof(long);
} }
ret = 0; data += sizeof(long);
break;
} }
ret = 0;
break;
}
case PTRACE_SETREGS: { /* Set all gp regs in the child. */ case PTRACE_SETREGS: { /* Set all gp regs in the child. */
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, (unsigned long *)data)) {
ret = -EFAULT; ret = -EFAULT;
break; break;
} }
if (i == PT_SR) { if (i == PT_SR) {
tmp &= SR_MASK; tmp &= SR_MASK;
tmp <<= 16; tmp <<= 16;
tmp |= get_reg(child, PT_SR) & ~(SR_MASK << 16); tmp |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
}
put_reg(child, i, tmp);
data += sizeof(long);
} }
ret = 0; put_reg(child, i, tmp);
break; data += sizeof(long);
} }
ret = 0;
break;
}
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((void *)data, &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. */
ret = 0; ret = 0;
if (copy_from_user(&child->thread.fp, (void *)data, if (copy_from_user(&child->thread.fp, (void *)data,
sizeof(struct user_m68kfp_struct))) sizeof(struct user_m68kfp_struct)))
ret = -EFAULT; ret = -EFAULT;
break; break;
} }
default: default:
ret = ptrace_request(child, request, addr, data); ret = ptrace_request(child, request, addr, data);
break; break;
} }
out_tsk: out_tsk:
put_task_struct(child); put_task_struct(child);
......
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