Skip to content

L
linux-davinci
Commit 9473272a authored by David S. Miller's avatar David S. Miller
Browse files
Options

[SPARC64]: Use regsets in arch_ptrace(). 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5a4924d7
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 132 deletions
arch/sparc64/kernel/ptrace.c
View file @ 9473272a
...@@ -687,11 +687,14 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task) ...@@ -687,11 +687,14 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task)
long arch_ptrace(struct task_struct *child, long request, long addr, long data) long arch_ptrace(struct task_struct *child, long request, long addr, long data)
{ {
long addr2 = task_pt_regs(current)->u_regs[UREG_I4]; long addr2 = task_pt_regs(current)->u_regs[UREG_I4];
int i, ret; const struct user_regset_view *view;
int ret;
if (test_thread_flag(TIF_32BIT)) if (test_thread_flag(TIF_32BIT))
addr2 &= 0xffffffffUL; addr2 &= 0xffffffffUL;
view = task_user_regset_view(child);
switch(request) { switch(request) {
case PTRACE_PEEKUSR: case PTRACE_PEEKUSR:
ret = (addr != 0) ? -EIO : 0; ret = (addr != 0) ? -EIO : 0;
...@@ -746,111 +749,66 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ...@@ -746,111 +749,66 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
case PTRACE_GETREGS: { case PTRACE_GETREGS: {
struct pt_regs32 __user *pregs = struct pt_regs32 __user *pregs =
(struct pt_regs32 __user *) addr; (struct pt_regs32 __user *) addr;
struct pt_regs *cregs = task_pt_regs(child);
ret = -EFAULT; ret = copy_regset_to_user(child, view, REGSET_GENERAL,
if (__put_user(tstate_to_psr(cregs->tstate), (&pregs->psr)) || 32 * sizeof(u32),
__put_user(cregs->tpc, (&pregs->pc)) || 4 * sizeof(u32),
__put_user(cregs->tnpc, (&pregs->npc)) || &pregs->psr);
__put_user(cregs->y, (&pregs->y))) if (!ret)
break; ret = copy_regset_to_user(child, view, REGSET_GENERAL,
for (i = 1; i < 16; i++) { 1 * sizeof(u32),
if (__put_user(cregs->u_regs[i], 15 * sizeof(u32),
(&pregs->u_regs[i - 1]))) &pregs->u_regs[0]);
break;
}
if (i == 16)
ret = 0;
break; break;
} }
case PTRACE_GETREGS64: { case PTRACE_GETREGS64: {
struct pt_regs __user *pregs = (struct pt_regs __user *) addr; struct pt_regs __user *pregs = (struct pt_regs __user *) addr;
struct pt_regs *cregs = task_pt_regs(child);
unsigned long tpc = cregs->tpc;
if ((task_thread_info(child)->flags & _TIF_32BIT) != 0)
tpc &= 0xffffffff;
ret = -EFAULT; ret = copy_regset_to_user(child, view, REGSET_GENERAL,
if (__put_user(cregs->tstate, (&pregs->tstate)) || 1 * sizeof(u64),
__put_user(tpc, (&pregs->tpc)) || 15 * sizeof(u64),
__put_user(cregs->tnpc, (&pregs->tnpc)) || &pregs->u_regs[0]);
__put_user(cregs->y, (&pregs->y))) if (!ret) {
break; /* XXX doesn't handle 'y' register correctly XXX */
for (i = 1; i < 16; i++) { ret = copy_regset_to_user(child, view, REGSET_GENERAL,
if (__put_user(cregs->u_regs[i], 32 * sizeof(u64),
(&pregs->u_regs[i - 1]))) 4 * sizeof(u64),
break; &pregs->tstate);
} }
if (i == 16)
ret = 0;
break; break;
} }
case PTRACE_SETREGS: { case PTRACE_SETREGS: {
struct pt_regs32 __user *pregs = struct pt_regs32 __user *pregs =
(struct pt_regs32 __user *) addr; (struct pt_regs32 __user *) addr;
struct pt_regs *cregs = task_pt_regs(child);
unsigned int psr, pc, npc, y; ret = copy_regset_from_user(child, view, REGSET_GENERAL,
32 * sizeof(u32),
/* Must be careful, tracing process can only set certain 4 * sizeof(u32),
* bits in the psr. &pregs->psr);
*/ if (!ret)
ret = -EFAULT; ret = copy_regset_from_user(child, view, REGSET_GENERAL,
if (__get_user(psr, (&pregs->psr)) || 1 * sizeof(u32),
__get_user(pc, (&pregs->pc)) || 15 * sizeof(u32),
__get_user(npc, (&pregs->npc)) || &pregs->u_regs[0]);
__get_user(y, (&pregs->y)))
break;
cregs->tstate &= ~(TSTATE_ICC);
cregs->tstate |= psr_to_tstate_icc(psr);
if (!((pc | npc) & 3)) {
cregs->tpc = pc;
cregs->tnpc = npc;
}
cregs->y = y;
for (i = 1; i < 16; i++) {
if (__get_user(cregs->u_regs[i], (&pregs->u_regs[i-1])))
break;
}
if (i == 16)
ret = 0;
break; break;
} }
case PTRACE_SETREGS64: { case PTRACE_SETREGS64: {
struct pt_regs __user *pregs = (struct pt_regs __user *) addr; struct pt_regs __user *pregs = (struct pt_regs __user *) addr;
struct pt_regs *cregs = task_pt_regs(child);
unsigned long tstate, tpc, tnpc, y; ret = copy_regset_from_user(child, view, REGSET_GENERAL,
1 * sizeof(u64),
/* Must be careful, tracing process can only set certain 15 * sizeof(u64),
* bits in the psr. &pregs->u_regs[0]);
*/ if (!ret) {
ret = -EFAULT; /* XXX doesn't handle 'y' register correctly XXX */
if (__get_user(tstate, (&pregs->tstate)) || ret = copy_regset_from_user(child, view, REGSET_GENERAL,
__get_user(tpc, (&pregs->tpc)) || 32 * sizeof(u64),
__get_user(tnpc, (&pregs->tnpc)) || 4 * sizeof(u64),
__get_user(y, (&pregs->y))) &pregs->tstate);
break;
if ((task_thread_info(child)->flags & _TIF_32BIT) != 0) {
tpc &= 0xffffffff;
tnpc &= 0xffffffff;
}
tstate &= (TSTATE_ICC | TSTATE_XCC);
cregs->tstate &= ~(TSTATE_ICC | TSTATE_XCC);
cregs->tstate |= tstate;
if (!((tpc | tnpc) & 3)) {
cregs->tpc = tpc;
cregs->tnpc = tnpc;
}
cregs->y = y;
for (i = 1; i < 16; i++) {
if (__get_user(cregs->u_regs[i], (&pregs->u_regs[i-1])))
break;
} }
if (i == 16)
ret = 0;
break; break;
} }
...@@ -867,19 +825,23 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ...@@ -867,19 +825,23 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
} fpq[16]; } fpq[16];
}; };
struct fps __user *fps = (struct fps __user *) addr; struct fps __user *fps = (struct fps __user *) addr;
unsigned long *fpregs = task_thread_info(child)->fpregs;
ret = -EFAULT;
if (copy_to_user(&fps->regs[0], fpregs,
(32 * sizeof(unsigned int))) ||
__put_user(task_thread_info(child)->xfsr[0], (&fps->fsr)) ||
__put_user(0, (&fps->fpqd)) ||
__put_user(0, (&fps->flags)) ||
__put_user(0, (&fps->extra)) ||
clear_user(&fps->fpq[0], 32 * sizeof(unsigned int)))
break;
ret = 0; ret = copy_regset_to_user(child, view, REGSET_FP,
0 * sizeof(u32),
32 * sizeof(u32),
&fps->regs[0]);
if (!ret)
ret = copy_regset_to_user(child, view, REGSET_FP,
33 * sizeof(u32),
1 * sizeof(u32),
&fps->fsr);
if (!ret) {
if (__put_user(0, &fps->flags) ||
__put_user(0, &fps->extra) ||
__put_user(0, &fps->fpqd) ||
clear_user(&fps->fpq[0], 32 * sizeof(unsigned int)))
ret = -EFAULT;
}
break; break;
} }
...@@ -889,15 +851,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ...@@ -889,15 +851,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
unsigned long fsr; unsigned long fsr;
}; };
struct fps __user *fps = (struct fps __user *) addr; struct fps __user *fps = (struct fps __user *) addr;
unsigned long *fpregs = task_thread_info(child)->fpregs;
ret = -EFAULT; ret = copy_regset_to_user(child, view, REGSET_FP,
if (copy_to_user(&fps->regs[0], fpregs, 0 * sizeof(u64),
(64 * sizeof(unsigned int))) || 33 * sizeof(u64),
__put_user(task_thread_info(child)->xfsr[0], (&fps->fsr))) fps);
break;
ret = 0;
break; break;
} }
...@@ -914,21 +872,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ...@@ -914,21 +872,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
} fpq[16]; } fpq[16];
}; };
struct fps __user *fps = (struct fps __user *) addr; struct fps __user *fps = (struct fps __user *) addr;
unsigned long *fpregs = task_thread_info(child)->fpregs;
unsigned fsr;
ret = -EFAULT;
if (copy_from_user(fpregs, &fps->regs[0],
(32 * sizeof(unsigned int))) ||
__get_user(fsr, (&fps->fsr)))
break;
task_thread_info(child)->xfsr[0] &= 0xffffffff00000000UL; ret = copy_regset_from_user(child, view, REGSET_FP,
task_thread_info(child)->xfsr[0] |= fsr; 0 * sizeof(u32),
if (!(task_thread_info(child)->fpsaved[0] & FPRS_FEF)) 32 * sizeof(u32),
task_thread_info(child)->gsr[0] = 0; &fps->regs[0]);
task_thread_info(child)->fpsaved[0] |= (FPRS_FEF | FPRS_DL); if (!ret)
ret = 0; ret = copy_regset_from_user(child, view, REGSET_FP,
33 * sizeof(u32),
1 * sizeof(u32),
&fps->fsr);
break; break;
} }
...@@ -938,19 +891,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ...@@ -938,19 +891,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
unsigned long fsr; unsigned long fsr;
}; };
struct fps __user *fps = (struct fps __user *) addr; struct fps __user *fps = (struct fps __user *) addr;
unsigned long *fpregs = task_thread_info(child)->fpregs;
ret = -EFAULT;
if (copy_from_user(fpregs, &fps->regs[0],
(64 * sizeof(unsigned int))) ||
__get_user(task_thread_info(child)->xfsr[0], (&fps->fsr)))
break;
if (!(task_thread_info(child)->fpsaved[0] & FPRS_FEF)) ret = copy_regset_to_user(child, view, REGSET_FP,
task_thread_info(child)->gsr[0] = 0; 0 * sizeof(u64),
task_thread_info(child)->fpsaved[0] |= 33 * sizeof(u64),
(FPRS_FEF | FPRS_DL | FPRS_DU); fps);
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