Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git] / arch / sparc64 / kernel / ptrace.c
index 81111a12f0a83bffe186c418048734f9a3493683..9a1ba1fe859d96a4e41bccd51342d214a0bea6a4 100644 (file)
@@ -1,6 +1,6 @@
 /* ptrace.c: Sparc process tracing support.
  *
- * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu)
+ * Copyright (C) 1996, 2008 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  *
  * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson,
@@ -22,6 +22,9 @@
 #include <linux/seccomp.h>
 #include <linux/audit.h>
 #include <linux/signal.h>
+#include <linux/regset.h>
+#include <linux/compat.h>
+#include <linux/elf.h>
 
 #include <asm/asi.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/cpudata.h>
 
-/* Returning from ptrace is a bit tricky because the syscall return
- * low level code assumes any value returned which is negative and
- * is a valid errno will mean setting the condition codes to indicate
- * an error return.  This doesn't work, so we have this hook.
- */
-static inline void pt_error_return(struct pt_regs *regs, unsigned long error)
-{
-       regs->u_regs[UREG_I0] = error;
-       regs->tstate |= (TSTATE_ICARRY | TSTATE_XCARRY);
-       regs->tpc = regs->tnpc;
-       regs->tnpc += 4;
-}
-
-static inline void pt_succ_return(struct pt_regs *regs, unsigned long value)
-{
-       regs->u_regs[UREG_I0] = value;
-       regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
-       regs->tpc = regs->tnpc;
-       regs->tnpc += 4;
-}
-
-static inline void
-pt_succ_return_linux(struct pt_regs *regs, unsigned long value, void __user *addr)
-{
-       if (test_thread_flag(TIF_32BIT)) {
-               if (put_user(value, (unsigned int __user *) addr)) {
-                       pt_error_return(regs, EFAULT);
-                       return;
-               }
-       } else {
-               if (put_user(value, (long __user *) addr)) {
-                       pt_error_return(regs, EFAULT);
-                       return;
-               }
-       }
-       regs->u_regs[UREG_I0] = 0;
-       regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
-       regs->tpc = regs->tnpc;
-       regs->tnpc += 4;
-}
-
-static void
-pt_os_succ_return (struct pt_regs *regs, unsigned long val, void __user *addr)
-{
-       if (current->personality == PER_SUNOS)
-               pt_succ_return (regs, val);
-       else
-               pt_succ_return_linux (regs, val, addr);
-}
-
 /* #define ALLOW_INIT_TRACING */
-/* #define DEBUG_PTRACE */
-
-#ifdef DEBUG_PTRACE
-char *pt_rq [] = {
-       /* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
-       /* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
-       /* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
-       /* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
-       /* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
-       /* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
-       /* 24 */ "SYSCALL", ""
-};
-#endif
 
 /*
  * Called by kernel/ptrace.c when detaching..
@@ -167,481 +107,784 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
        }
 }
 
-asmlinkage void do_ptrace(struct pt_regs *regs)
+enum sparc_regset {
+       REGSET_GENERAL,
+       REGSET_FP,
+};
+
+static int genregs64_get(struct task_struct *target,
+                        const struct user_regset *regset,
+                        unsigned int pos, unsigned int count,
+                        void *kbuf, void __user *ubuf)
 {
-       int request = regs->u_regs[UREG_I0];
-       pid_t pid = regs->u_regs[UREG_I1];
-       unsigned long addr = regs->u_regs[UREG_I2];
-       unsigned long data = regs->u_regs[UREG_I3];
-       unsigned long addr2 = regs->u_regs[UREG_I4];
-       struct task_struct *child;
+       const struct pt_regs *regs = task_pt_regs(target);
        int ret;
 
-       if (test_thread_flag(TIF_32BIT)) {
-               addr &= 0xffffffffUL;
-               data &= 0xffffffffUL;
-               addr2 &= 0xffffffffUL;
+       if (target == current)
+               flushw_user();
+
+       ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                 regs->u_regs,
+                                 0, 16 * sizeof(u64));
+       if (!ret) {
+               unsigned long __user *reg_window = (unsigned long __user *)
+                       (regs->u_regs[UREG_I6] + STACK_BIAS);
+               unsigned long window[16];
+
+               if (copy_from_user(window, reg_window, sizeof(window)))
+                       return -EFAULT;
+
+               ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                         window,
+                                         16 * sizeof(u64),
+                                         32 * sizeof(u64));
        }
-       lock_kernel();
-#ifdef DEBUG_PTRACE
-       {
-               char *s;
 
-               if ((request >= 0) && (request <= 24))
-                       s = pt_rq [request];
-               else
-                       s = "unknown";
-
-               if (request == PTRACE_POKEDATA && data == 0x91d02001){
-                       printk ("do_ptrace: breakpoint pid=%d, addr=%016lx addr2=%016lx\n",
-                               pid, addr, addr2);
-               } else 
-                       printk("do_ptrace: rq=%s(%d) pid=%d addr=%016lx data=%016lx addr2=%016lx\n",
-                              s, request, pid, addr, data, addr2);
+       if (!ret) {
+               /* TSTATE, TPC, TNPC */
+               ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                         &regs->tstate,
+                                         32 * sizeof(u64),
+                                         35 * sizeof(u64));
        }
-#endif
-       if (request == PTRACE_TRACEME) {
-               ret = ptrace_traceme();
-               if (ret < 0)
-                       pt_error_return(regs, -ret);
-               else
-                       pt_succ_return(regs, 0);
-               goto out;
+
+       if (!ret) {
+               unsigned long y = regs->y;
+
+               ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                         &y,
+                                         35 * sizeof(u64),
+                                         36 * sizeof(u64));
        }
 
-       child = ptrace_get_task_struct(pid);
-       if (IS_ERR(child)) {
-               ret = PTR_ERR(child);
-               pt_error_return(regs, -ret);
-               goto out;
+       if (!ret)
+               ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf,
+                                              36 * sizeof(u64), -1);
+
+       return ret;
+}
+
+static int genregs64_set(struct task_struct *target,
+                        const struct user_regset *regset,
+                        unsigned int pos, unsigned int count,
+                        const void *kbuf, const void __user *ubuf)
+{
+       struct pt_regs *regs = task_pt_regs(target);
+       int ret;
+
+       if (target == current)
+               flushw_user();
+
+       ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                regs->u_regs,
+                                0, 16 * sizeof(u64));
+       if (!ret && count > 0) {
+               unsigned long __user *reg_window = (unsigned long __user *)
+                       (regs->u_regs[UREG_I6] + STACK_BIAS);
+               unsigned long window[16];
+
+               if (copy_from_user(window, reg_window, sizeof(window)))
+                       return -EFAULT;
+
+               ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                        window,
+                                        16 * sizeof(u64),
+                                        32 * sizeof(u64));
+               if (!ret &&
+                   copy_to_user(reg_window, window, sizeof(window)))
+                       return -EFAULT;
        }
 
-       if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
-           || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-               if (ptrace_attach(child)) {
-                       pt_error_return(regs, EPERM);
-                       goto out_tsk;
+       if (!ret && count > 0) {
+               unsigned long tstate;
+
+               /* TSTATE */
+               ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                        &tstate,
+                                        32 * sizeof(u64),
+                                        33 * sizeof(u64));
+               if (!ret) {
+                       /* Only the condition codes can be modified
+                        * in the %tstate register.
+                        */
+                       tstate &= (TSTATE_ICC | TSTATE_XCC);
+                       regs->tstate &= ~(TSTATE_ICC | TSTATE_XCC);
+                       regs->tstate |= tstate;
                }
-               pt_succ_return(regs, 0);
-               goto out_tsk;
        }
 
-       ret = ptrace_check_attach(child, request == PTRACE_KILL);
-       if (ret < 0) {
-               pt_error_return(regs, -ret);
-               goto out_tsk;
+       if (!ret) {
+               /* TPC, TNPC */
+               ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                        &regs->tpc,
+                                        33 * sizeof(u64),
+                                        35 * sizeof(u64));
        }
 
-       if (!(test_thread_flag(TIF_32BIT))      &&
-           ((request == PTRACE_READDATA64)             ||
-            (request == PTRACE_WRITEDATA64)            ||
-            (request == PTRACE_READTEXT64)             ||
-            (request == PTRACE_WRITETEXT64)            ||
-            (request == PTRACE_PEEKTEXT64)             ||
-            (request == PTRACE_POKETEXT64)             ||
-            (request == PTRACE_PEEKDATA64)             ||
-            (request == PTRACE_POKEDATA64))) {
-               addr = regs->u_regs[UREG_G2];
-               addr2 = regs->u_regs[UREG_G3];
-               request -= 30; /* wheee... */
-       }
+       if (!ret) {
+               unsigned long y;
 
-       switch(request) {
-       case PTRACE_PEEKUSR:
-               if (addr != 0)
-                       pt_error_return(regs, EIO);
-               else
-                       pt_succ_return(regs, 0);
-               goto out_tsk;
-
-       case PTRACE_PEEKTEXT: /* read word at location addr. */ 
-       case PTRACE_PEEKDATA: {
-               unsigned long tmp64;
-               unsigned int tmp32;
-               int res, copied;
-
-               res = -EIO;
-               if (test_thread_flag(TIF_32BIT)) {
-                       copied = access_process_vm(child, addr,
-                                                  &tmp32, sizeof(tmp32), 0);
-                       tmp64 = (unsigned long) tmp32;
-                       if (copied == sizeof(tmp32))
-                               res = 0;
-               } else {
-                       copied = access_process_vm(child, addr,
-                                                  &tmp64, sizeof(tmp64), 0);
-                       if (copied == sizeof(tmp64))
-                               res = 0;
-               }
-               if (res < 0)
-                       pt_error_return(regs, -res);
-               else
-                       pt_os_succ_return(regs, tmp64, (void __user *) data);
-               goto out_tsk;
+               ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                        &y,
+                                        35 * sizeof(u64),
+                                        36 * sizeof(u64));
+               if (!ret)
+                       regs->y = y;
        }
 
-       case PTRACE_POKETEXT: /* write the word at location addr. */
-       case PTRACE_POKEDATA: {
-               unsigned long tmp64;
-               unsigned int tmp32;
-               int copied, res = -EIO;
-
-               if (test_thread_flag(TIF_32BIT)) {
-                       tmp32 = data;
-                       copied = access_process_vm(child, addr,
-                                                  &tmp32, sizeof(tmp32), 1);
-                       if (copied == sizeof(tmp32))
-                               res = 0;
-               } else {
-                       tmp64 = data;
-                       copied = access_process_vm(child, addr,
-                                                  &tmp64, sizeof(tmp64), 1);
-                       if (copied == sizeof(tmp64))
-                               res = 0;
-               }
-               if (res < 0)
-                       pt_error_return(regs, -res);
+       if (!ret)
+               ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                               36 * sizeof(u64), -1);
+
+       return ret;
+}
+
+static int fpregs64_get(struct task_struct *target,
+                       const struct user_regset *regset,
+                       unsigned int pos, unsigned int count,
+                       void *kbuf, void __user *ubuf)
+{
+       const unsigned long *fpregs = task_thread_info(target)->fpregs;
+       unsigned long fprs, fsr, gsr;
+       int ret;
+
+       if (target == current)
+               save_and_clear_fpu();
+
+       fprs = task_thread_info(target)->fpsaved[0];
+
+       if (fprs & FPRS_DL)
+               ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                         fpregs,
+                                         0, 16 * sizeof(u64));
+       else
+               ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf,
+                                              0,
+                                              16 * sizeof(u64));
+
+       if (!ret) {
+               if (fprs & FPRS_DU)
+                       ret = user_regset_copyout(&pos, &count,
+                                                 &kbuf, &ubuf,
+                                                 fpregs + 16,
+                                                 16 * sizeof(u64),
+                                                 32 * sizeof(u64));
                else
-                       pt_succ_return(regs, res);
-               goto out_tsk;
+                       ret = user_regset_copyout_zero(&pos, &count,
+                                                      &kbuf, &ubuf,
+                                                      16 * sizeof(u64),
+                                                      32 * sizeof(u64));
        }
 
-       case PTRACE_GETREGS: {
-               struct pt_regs32 __user *pregs =
-                       (struct pt_regs32 __user *) addr;
-               struct pt_regs *cregs = task_pt_regs(child);
-               int rval;
-
-               if (__put_user(tstate_to_psr(cregs->tstate), (&pregs->psr)) ||
-                   __put_user(cregs->tpc, (&pregs->pc)) ||
-                   __put_user(cregs->tnpc, (&pregs->npc)) ||
-                   __put_user(cregs->y, (&pregs->y))) {
-                       pt_error_return(regs, EFAULT);
-                       goto out_tsk;
-               }
-               for (rval = 1; rval < 16; rval++)
-                       if (__put_user(cregs->u_regs[rval], (&pregs->u_regs[rval - 1]))) {
-                               pt_error_return(regs, EFAULT);
-                               goto out_tsk;
-                       }
-               pt_succ_return(regs, 0);
-#ifdef DEBUG_PTRACE
-               printk ("PC=%lx nPC=%lx o7=%lx\n", cregs->tpc, cregs->tnpc, cregs->u_regs [15]);
-#endif
-               goto out_tsk;
+       if (fprs & FPRS_FEF) {
+               fsr = task_thread_info(target)->xfsr[0];
+               gsr = task_thread_info(target)->gsr[0];
+       } else {
+               fsr = gsr = 0;
        }
 
-       case PTRACE_GETREGS64: {
-               struct pt_regs __user *pregs = (struct pt_regs __user *) addr;
-               struct pt_regs *cregs = task_pt_regs(child);
-               unsigned long tpc = cregs->tpc;
-               int rval;
-
-               if ((task_thread_info(child)->flags & _TIF_32BIT) != 0)
-                       tpc &= 0xffffffff;
-               if (__put_user(cregs->tstate, (&pregs->tstate)) ||
-                   __put_user(tpc, (&pregs->tpc)) ||
-                   __put_user(cregs->tnpc, (&pregs->tnpc)) ||
-                   __put_user(cregs->y, (&pregs->y))) {
-                       pt_error_return(regs, EFAULT);
-                       goto out_tsk;
-               }
-               for (rval = 1; rval < 16; rval++)
-                       if (__put_user(cregs->u_regs[rval], (&pregs->u_regs[rval - 1]))) {
-                               pt_error_return(regs, EFAULT);
-                               goto out_tsk;
-                       }
-               pt_succ_return(regs, 0);
-#ifdef DEBUG_PTRACE
-               printk ("PC=%lx nPC=%lx o7=%lx\n", cregs->tpc, cregs->tnpc, cregs->u_regs [15]);
-#endif
-               goto out_tsk;
+       if (!ret)
+               ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                         &fsr,
+                                         32 * sizeof(u64),
+                                         33 * sizeof(u64));
+       if (!ret)
+               ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                         &gsr,
+                                         33 * sizeof(u64),
+                                         34 * sizeof(u64));
+       if (!ret)
+               ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                         &fprs,
+                                         34 * sizeof(u64),
+                                         35 * sizeof(u64));
+
+       if (!ret)
+               ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf,
+                                              35 * sizeof(u64), -1);
+
+       return ret;
+}
+
+static int fpregs64_set(struct task_struct *target,
+                       const struct user_regset *regset,
+                       unsigned int pos, unsigned int count,
+                       const void *kbuf, const void __user *ubuf)
+{
+       unsigned long *fpregs = task_thread_info(target)->fpregs;
+       unsigned long fprs;
+       int ret;
+
+       if (target == current)
+               save_and_clear_fpu();
+
+       ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                fpregs,
+                                0, 32 * sizeof(u64));
+       if (!ret)
+               ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                        task_thread_info(target)->xfsr,
+                                        32 * sizeof(u64),
+                                        33 * sizeof(u64));
+       if (!ret)
+               ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                        task_thread_info(target)->gsr,
+                                        33 * sizeof(u64),
+                                        34 * sizeof(u64));
+
+       fprs = task_thread_info(target)->fpsaved[0];
+       if (!ret && count > 0) {
+               ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                        &fprs,
+                                        34 * sizeof(u64),
+                                        35 * sizeof(u64));
        }
 
-       case PTRACE_SETREGS: {
-               struct pt_regs32 __user *pregs =
-                       (struct pt_regs32 __user *) addr;
-               struct pt_regs *cregs = task_pt_regs(child);
-               unsigned int psr, pc, npc, y;
-               int i;
-
-               /* Must be careful, tracing process can only set certain
-                * bits in the psr.
-                */
-               if (__get_user(psr, (&pregs->psr)) ||
-                   __get_user(pc, (&pregs->pc)) ||
-                   __get_user(npc, (&pregs->npc)) ||
-                   __get_user(y, (&pregs->y))) {
-                       pt_error_return(regs, EFAULT);
-                       goto out_tsk;
+       fprs |= (FPRS_FEF | FPRS_DL | FPRS_DU);
+       task_thread_info(target)->fpsaved[0] = fprs;
+
+       if (!ret)
+               ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                               35 * sizeof(u64), -1);
+       return ret;
+}
+
+static const struct user_regset sparc64_regsets[] = {
+       /* Format is:
+        *      G0 --> G7
+        *      O0 --> O7
+        *      L0 --> L7
+        *      I0 --> I7
+        *      TSTATE, TPC, TNPC, Y
+        */
+       [REGSET_GENERAL] = {
+               .core_note_type = NT_PRSTATUS,
+               .n = 36 * sizeof(u64),
+               .size = sizeof(u64), .align = sizeof(u64),
+               .get = genregs64_get, .set = genregs64_set
+       },
+       /* Format is:
+        *      F0 --> F63
+        *      FSR
+        *      GSR
+        *      FPRS
+        */
+       [REGSET_FP] = {
+               .core_note_type = NT_PRFPREG,
+               .n = 35 * sizeof(u64),
+               .size = sizeof(u64), .align = sizeof(u64),
+               .get = fpregs64_get, .set = fpregs64_set
+       },
+};
+
+static const struct user_regset_view user_sparc64_view = {
+       .name = "sparc64", .e_machine = EM_SPARCV9,
+       .regsets = sparc64_regsets, .n = ARRAY_SIZE(sparc64_regsets)
+};
+
+static int genregs32_get(struct task_struct *target,
+                        const struct user_regset *regset,
+                        unsigned int pos, unsigned int count,
+                        void *kbuf, void __user *ubuf)
+{
+       const struct pt_regs *regs = task_pt_regs(target);
+       compat_ulong_t __user *reg_window;
+       compat_ulong_t *k = kbuf;
+       compat_ulong_t __user *u = ubuf;
+       compat_ulong_t reg;
+
+       if (target == current)
+               flushw_user();
+
+       pos /= sizeof(reg);
+       count /= sizeof(reg);
+
+       if (kbuf) {
+               for (; count > 0 && pos < 16; count--)
+                       *k++ = regs->u_regs[pos++];
+
+               reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6];
+               for (; count > 0 && pos < 32; count--) {
+                       if (get_user(*k++, &reg_window[pos++]))
+                               return -EFAULT;
                }
-               cregs->tstate &= ~(TSTATE_ICC);
-               cregs->tstate |= psr_to_tstate_icc(psr);
-                       if (!((pc | npc) & 3)) {
-                       cregs->tpc = pc;
-                       cregs->tnpc = npc;
+       } else {
+               for (; count > 0 && pos < 16; count--) {
+                       if (put_user((compat_ulong_t) regs->u_regs[pos++], u++))
+                               return -EFAULT;
                }
-               cregs->y = y;
-               for (i = 1; i < 16; i++) {
-                       if (__get_user(cregs->u_regs[i], (&pregs->u_regs[i-1]))) {
-                               pt_error_return(regs, EFAULT);
-                               goto out_tsk;
-                       }
+
+               reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6];
+               for (; count > 0 && pos < 32; count--) {
+                       if (get_user(reg, &reg_window[pos++]) ||
+                           put_user(reg, u++))
+                               return -EFAULT;
+               }
+       }
+       while (count > 0) {
+               switch (pos) {
+               case 32: /* PSR */
+                       reg = tstate_to_psr(regs->tstate);
+                       break;
+               case 33: /* PC */
+                       reg = regs->tpc;
+                       break;
+               case 34: /* NPC */
+                       reg = regs->tnpc;
+                       break;
+               case 35: /* Y */
+                       reg = regs->y;
+                       break;
+               case 36: /* WIM */
+               case 37: /* TBR */
+                       reg = 0;
+                       break;
+               default:
+                       goto finish;
                }
-               pt_succ_return(regs, 0);
-               goto out_tsk;
+
+               if (kbuf)
+                       *k++ = reg;
+               else if (put_user(reg, u++))
+                       return -EFAULT;
+               pos++;
+               count--;
        }
+finish:
+       pos *= sizeof(reg);
+       count *= sizeof(reg);
+
+       return user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf,
+                                       38 * sizeof(reg), -1);
+}
 
-       case PTRACE_SETREGS64: {
-               struct pt_regs __user *pregs = (struct pt_regs __user *) addr;
-               struct pt_regs *cregs = task_pt_regs(child);
-               unsigned long tstate, tpc, tnpc, y;
-               int i;
-
-               /* Must be careful, tracing process can only set certain
-                * bits in the psr.
-                */
-               if (__get_user(tstate, (&pregs->tstate)) ||
-                   __get_user(tpc, (&pregs->tpc)) ||
-                   __get_user(tnpc, (&pregs->tnpc)) ||
-                   __get_user(y, (&pregs->y))) {
-                       pt_error_return(regs, EFAULT);
-                       goto out_tsk;
+static int genregs32_set(struct task_struct *target,
+                        const struct user_regset *regset,
+                        unsigned int pos, unsigned int count,
+                        const void *kbuf, const void __user *ubuf)
+{
+       struct pt_regs *regs = task_pt_regs(target);
+       compat_ulong_t __user *reg_window;
+       const compat_ulong_t *k = kbuf;
+       const compat_ulong_t __user *u = ubuf;
+       compat_ulong_t reg;
+
+       if (target == current)
+               flushw_user();
+
+       pos /= sizeof(reg);
+       count /= sizeof(reg);
+
+       if (kbuf) {
+               for (; count > 0 && pos < 16; count--)
+                       regs->u_regs[pos++] = *k++;
+
+               reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6];
+               for (; count > 0 && pos < 32; count--) {
+                       if (put_user(*k++, &reg_window[pos++]))
+                               return -EFAULT;
                }
-               if ((task_thread_info(child)->flags & _TIF_32BIT) != 0) {
-                       tpc &= 0xffffffff;
-                       tnpc &= 0xffffffff;
+       } else {
+               for (; count > 0 && pos < 16; count--) {
+                       if (get_user(reg, u++))
+                               return -EFAULT;
+                       regs->u_regs[pos++] = reg;
                }
-               tstate &= (TSTATE_ICC | TSTATE_XCC);
-               cregs->tstate &= ~(TSTATE_ICC | TSTATE_XCC);
-               cregs->tstate |= tstate;
-               if (!((tpc | tnpc) & 3)) {
-                       cregs->tpc = tpc;
-                       cregs->tnpc = tnpc;
+
+               reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6];
+               for (; count > 0 && pos < 32; count--) {
+                       if (get_user(reg, u++) ||
+                           put_user(reg, &reg_window[pos++]))
+                               return -EFAULT;
                }
-               cregs->y = y;
-               for (i = 1; i < 16; i++) {
-                       if (__get_user(cregs->u_regs[i], (&pregs->u_regs[i-1]))) {
-                               pt_error_return(regs, EFAULT);
-                               goto out_tsk;
-                       }
+       }
+       while (count > 0) {
+               unsigned long tstate;
+
+               if (kbuf)
+                       reg = *k++;
+               else if (get_user(reg, u++))
+                       return -EFAULT;
+
+               switch (pos) {
+               case 32: /* PSR */
+                       tstate = regs->tstate;
+                       tstate &= ~(TSTATE_ICC | TSTATE_XCC);
+                       tstate |= psr_to_tstate_icc(reg);
+                       regs->tstate = tstate;
+                       break;
+               case 33: /* PC */
+                       regs->tpc = reg;
+                       break;
+               case 34: /* NPC */
+                       regs->tnpc = reg;
+                       break;
+               case 35: /* Y */
+                       regs->y = reg;
+                       break;
+               case 36: /* WIM */
+               case 37: /* TBR */
+                       break;
+               default:
+                       goto finish;
                }
-               pt_succ_return(regs, 0);
-               goto out_tsk;
+
+               pos++;
+               count--;
        }
+finish:
+       pos *= sizeof(reg);
+       count *= sizeof(reg);
 
-       case PTRACE_GETFPREGS: {
-               struct fps {
-                       unsigned int regs[32];
-                       unsigned int fsr;
-                       unsigned int flags;
-                       unsigned int extra;
-                       unsigned int fpqd;
-                       struct fq {
-                               unsigned int insnaddr;
-                               unsigned int insn;
-                       } fpq[16];
-               };
-               struct fps __user *fps = (struct fps __user *) addr;
-               unsigned long *fpregs = task_thread_info(child)->fpregs;
-
-               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))) {
-                       pt_error_return(regs, EFAULT);
-                       goto out_tsk;
-               }
-               pt_succ_return(regs, 0);
-               goto out_tsk;
+       return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                        38 * sizeof(reg), -1);
+}
+
+static int fpregs32_get(struct task_struct *target,
+                       const struct user_regset *regset,
+                       unsigned int pos, unsigned int count,
+                       void *kbuf, void __user *ubuf)
+{
+       const unsigned long *fpregs = task_thread_info(target)->fpregs;
+       compat_ulong_t enabled;
+       unsigned long fprs;
+       compat_ulong_t fsr;
+       int ret = 0;
+
+       if (target == current)
+               save_and_clear_fpu();
+
+       fprs = task_thread_info(target)->fpsaved[0];
+       if (fprs & FPRS_FEF) {
+               fsr = task_thread_info(target)->xfsr[0];
+               enabled = 1;
+       } else {
+               fsr = 0;
+               enabled = 0;
        }
 
-       case PTRACE_GETFPREGS64: {
-               struct fps {
-                       unsigned int regs[64];
-                       unsigned long fsr;
-               };
-               struct fps __user *fps = (struct fps __user *) addr;
-               unsigned long *fpregs = task_thread_info(child)->fpregs;
-
-               if (copy_to_user(&fps->regs[0], fpregs,
-                                (64 * sizeof(unsigned int))) ||
-                   __put_user(task_thread_info(child)->xfsr[0], (&fps->fsr))) {
-                       pt_error_return(regs, EFAULT);
-                       goto out_tsk;
-               }
-               pt_succ_return(regs, 0);
-               goto out_tsk;
+       ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                 fpregs,
+                                 0, 32 * sizeof(u32));
+
+       if (!ret)
+               ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf,
+                                              32 * sizeof(u32),
+                                              33 * sizeof(u32));
+       if (!ret)
+               ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                         &fsr,
+                                         33 * sizeof(u32),
+                                         34 * sizeof(u32));
+
+       if (!ret) {
+               compat_ulong_t val;
+
+               val = (enabled << 8) | (8 << 16);
+               ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                         &val,
+                                         34 * sizeof(u32),
+                                         35 * sizeof(u32));
        }
 
-       case PTRACE_SETFPREGS: {
-               struct fps {
-                       unsigned int regs[32];
-                       unsigned int fsr;
-                       unsigned int flags;
-                       unsigned int extra;
-                       unsigned int fpqd;
-                       struct fq {
-                               unsigned int insnaddr;
-                               unsigned int insn;
-                       } fpq[16];
-               };
-               struct fps __user *fps = (struct fps __user *) addr;
-               unsigned long *fpregs = task_thread_info(child)->fpregs;
-               unsigned fsr;
-
-               if (copy_from_user(fpregs, &fps->regs[0],
-                                  (32 * sizeof(unsigned int))) ||
-                   __get_user(fsr, (&fps->fsr))) {
-                       pt_error_return(regs, EFAULT);
-                       goto out_tsk;
+       if (!ret)
+               ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf,
+                                              35 * sizeof(u32), -1);
+
+       return ret;
+}
+
+static int fpregs32_set(struct task_struct *target,
+                       const struct user_regset *regset,
+                       unsigned int pos, unsigned int count,
+                       const void *kbuf, const void __user *ubuf)
+{
+       unsigned long *fpregs = task_thread_info(target)->fpregs;
+       unsigned long fprs;
+       int ret;
+
+       if (target == current)
+               save_and_clear_fpu();
+
+       fprs = task_thread_info(target)->fpsaved[0];
+
+       ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                fpregs,
+                                0, 32 * sizeof(u32));
+       if (!ret)
+               user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                         32 * sizeof(u32),
+                                         33 * sizeof(u32));
+       if (!ret && count > 0) {
+               compat_ulong_t fsr;
+               unsigned long val;
+
+               ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                        &fsr,
+                                        33 * sizeof(u32),
+                                        34 * sizeof(u32));
+               if (!ret) {
+                       val = task_thread_info(target)->xfsr[0];
+                       val &= 0xffffffff00000000UL;
+                       val |= fsr;
+                       task_thread_info(target)->xfsr[0] = val;
                }
-               task_thread_info(child)->xfsr[0] &= 0xffffffff00000000UL;
-               task_thread_info(child)->xfsr[0] |= fsr;
-               if (!(task_thread_info(child)->fpsaved[0] & FPRS_FEF))
-                       task_thread_info(child)->gsr[0] = 0;
-               task_thread_info(child)->fpsaved[0] |= (FPRS_FEF | FPRS_DL);
-               pt_succ_return(regs, 0);
-               goto out_tsk;
        }
 
-       case PTRACE_SETFPREGS64: {
-               struct fps {
-                       unsigned int regs[64];
-                       unsigned long fsr;
-               };
-               struct fps __user *fps = (struct fps __user *) addr;
-               unsigned long *fpregs = task_thread_info(child)->fpregs;
-
-               if (copy_from_user(fpregs, &fps->regs[0],
-                                  (64 * sizeof(unsigned int))) ||
-                   __get_user(task_thread_info(child)->xfsr[0], (&fps->fsr))) {
-                       pt_error_return(regs, EFAULT);
-                       goto out_tsk;
+       fprs |= (FPRS_FEF | FPRS_DL);
+       task_thread_info(target)->fpsaved[0] = fprs;
+
+       if (!ret)
+               ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                               34 * sizeof(u32), -1);
+       return ret;
+}
+
+static const struct user_regset sparc32_regsets[] = {
+       /* Format is:
+        *      G0 --> G7
+        *      O0 --> O7
+        *      L0 --> L7
+        *      I0 --> I7
+        *      PSR, PC, nPC, Y, WIM, TBR
+        */
+       [REGSET_GENERAL] = {
+               .core_note_type = NT_PRSTATUS,
+               .n = 38 * sizeof(u32),
+               .size = sizeof(u32), .align = sizeof(u32),
+               .get = genregs32_get, .set = genregs32_set
+       },
+       /* Format is:
+        *      F0 --> F31
+        *      empty 32-bit word
+        *      FSR (32--bit word)
+        *      FPU QUEUE COUNT (8-bit char)
+        *      FPU QUEUE ENTRYSIZE (8-bit char)
+        *      FPU ENABLED (8-bit char)
+        *      empty 8-bit char
+        *      FPU QUEUE (64 32-bit ints)
+        */
+       [REGSET_FP] = {
+               .core_note_type = NT_PRFPREG,
+               .n = 99 * sizeof(u32),
+               .size = sizeof(u32), .align = sizeof(u32),
+               .get = fpregs32_get, .set = fpregs32_set
+       },
+};
+
+static const struct user_regset_view user_sparc32_view = {
+       .name = "sparc", .e_machine = EM_SPARC,
+       .regsets = sparc32_regsets, .n = ARRAY_SIZE(sparc32_regsets)
+};
+
+const struct user_regset_view *task_user_regset_view(struct task_struct *task)
+{
+       if (test_tsk_thread_flag(task, TIF_32BIT))
+               return &user_sparc32_view;
+       return &user_sparc64_view;
+}
+
+struct compat_fps {
+       unsigned int regs[32];
+       unsigned int fsr;
+       unsigned int flags;
+       unsigned int extra;
+       unsigned int fpqd;
+       struct compat_fq {
+               unsigned int insnaddr;
+               unsigned int insn;
+       } fpq[16];
+};
+
+long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
+                       compat_ulong_t caddr, compat_ulong_t cdata)
+{
+       const struct user_regset_view *view = task_user_regset_view(child);
+       compat_ulong_t caddr2 = task_pt_regs(current)->u_regs[UREG_I4];
+       struct pt_regs32 __user *pregs;
+       struct compat_fps __user *fps;
+       unsigned long addr2 = caddr2;
+       unsigned long addr = caddr;
+       unsigned long data = cdata;
+       int ret;
+
+       pregs = (struct pt_regs32 __user *) addr;
+       fps = (struct compat_fps __user *) addr;
+
+       switch (request) {
+       case PTRACE_PEEKUSR:
+               ret = (addr != 0) ? -EIO : 0;
+               break;
+
+       case PTRACE_GETREGS:
+               ret = copy_regset_to_user(child, view, REGSET_GENERAL,
+                                         32 * sizeof(u32),
+                                         4 * sizeof(u32),
+                                         &pregs->psr);
+               if (!ret)
+                       ret = copy_regset_to_user(child, view, REGSET_GENERAL,
+                                                 1 * sizeof(u32),
+                                                 15 * sizeof(u32),
+                                                 &pregs->u_regs[0]);
+               break;
+
+       case PTRACE_SETREGS:
+               ret = copy_regset_from_user(child, view, REGSET_GENERAL,
+                                           32 * sizeof(u32),
+                                           4 * sizeof(u32),
+                                           &pregs->psr);
+               if (!ret)
+                       ret = copy_regset_from_user(child, view, REGSET_GENERAL,
+                                                   1 * sizeof(u32),
+                                                   15 * sizeof(u32),
+                                                   &pregs->u_regs[0]);
+               break;
+
+       case PTRACE_GETFPREGS:
+               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;
                }
-               if (!(task_thread_info(child)->fpsaved[0] & FPRS_FEF))
-                       task_thread_info(child)->gsr[0] = 0;
-               task_thread_info(child)->fpsaved[0] |= (FPRS_FEF | FPRS_DL | FPRS_DU);
-               pt_succ_return(regs, 0);
-               goto out_tsk;
-       }
+               break;
+
+       case PTRACE_SETFPREGS:
+               ret = copy_regset_from_user(child, view, REGSET_FP,
+                                           0 * sizeof(u32),
+                                           32 * sizeof(u32),
+                                           &fps->regs[0]);
+               if (!ret)
+                       ret = copy_regset_from_user(child, view, REGSET_FP,
+                                                   33 * sizeof(u32),
+                                                   1 * sizeof(u32),
+                                                   &fps->fsr);
+               break;
 
        case PTRACE_READTEXT:
-       case PTRACE_READDATA: {
-               int res = ptrace_readdata(child, addr,
-                                         (char __user *)addr2, data);
-               if (res == data) {
-                       pt_succ_return(regs, 0);
-                       goto out_tsk;
-               }
-               if (res >= 0)
-                       res = -EIO;
-               pt_error_return(regs, -res);
-               goto out_tsk;
-       }
+       case PTRACE_READDATA:
+               ret = ptrace_readdata(child, addr,
+                                     (char __user *)addr2, data);
+               if (ret == data)
+                       ret = 0;
+               else if (ret >= 0)
+                       ret = -EIO;
+               break;
 
        case PTRACE_WRITETEXT:
-       case PTRACE_WRITEDATA: {
-               int res = ptrace_writedata(child, (char __user *) addr2,
-                                          addr, data);
-               if (res == data) {
-                       pt_succ_return(regs, 0);
-                       goto out_tsk;
-               }
-               if (res >= 0)
-                       res = -EIO;
-               pt_error_return(regs, -res);
-               goto out_tsk;
+       case PTRACE_WRITEDATA:
+               ret = ptrace_writedata(child, (char __user *) addr2,
+                                      addr, data);
+               if (ret == data)
+                       ret = 0;
+               else if (ret >= 0)
+                       ret = -EIO;
+               break;
+
+       default:
+               ret = compat_ptrace_request(child, request, addr, data);
+               break;
        }
-       case PTRACE_SYSCALL: /* continue and stop at (return from) syscall */
-               addr = 1;
 
-       case PTRACE_CONT: { /* restart after signal. */
-               if (!valid_signal(data)) {
-                       pt_error_return(regs, EIO);
-                       goto out_tsk;
-               }
+       return ret;
+}
 
-               if (request == PTRACE_SYSCALL) {
-                       set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-               } else {
-                       clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-               }
+struct fps {
+       unsigned int regs[64];
+       unsigned long fsr;
+};
 
-               child->exit_code = data;
-#ifdef DEBUG_PTRACE
-               printk("CONT: %s [%d]: set exit_code = %x %lx %lx\n", child->comm,
-                       child->pid, child->exit_code,
-                       task_pt_regs(child)->tpc,
-                       task_pt_regs(child)->tnpc);
-                      
-#endif
-               wake_up_process(child);
-               pt_succ_return(regs, 0);
-               goto out_tsk;
-       }
+long arch_ptrace(struct task_struct *child, long request, long addr, long data)
+{
+       const struct user_regset_view *view = task_user_regset_view(child);
+       struct pt_regs __user *pregs = (struct pt_regs __user *) addr;
+       unsigned long addr2 = task_pt_regs(current)->u_regs[UREG_I4];
+       struct fps __user *fps = (struct fps __user *) addr;
+       int ret;
 
-/*
- * make the child exit.  Best I can do is send it a sigkill. 
- * perhaps it should be put in the status that it wants to 
- * exit.
- */
-       case PTRACE_KILL: {
-               if (child->exit_state == EXIT_ZOMBIE) { /* already dead */
-                       pt_succ_return(regs, 0);
-                       goto out_tsk;
+       switch (request) {
+       case PTRACE_PEEKUSR:
+               ret = (addr != 0) ? -EIO : 0;
+               break;
+
+       case PTRACE_GETREGS64:
+               ret = copy_regset_to_user(child, view, REGSET_GENERAL,
+                                         1 * sizeof(u64),
+                                         15 * sizeof(u64),
+                                         &pregs->u_regs[0]);
+               if (!ret) {
+                       /* XXX doesn't handle 'y' register correctly XXX */
+                       ret = copy_regset_to_user(child, view, REGSET_GENERAL,
+                                                 32 * sizeof(u64),
+                                                 4 * sizeof(u64),
+                                                 &pregs->tstate);
                }
-               child->exit_code = SIGKILL;
-               wake_up_process(child);
-               pt_succ_return(regs, 0);
-               goto out_tsk;
-       }
+               break;
 
-       case PTRACE_SUNDETACH: { /* detach a process that was attached. */
-               int error = ptrace_detach(child, data);
-               if (error) {
-                       pt_error_return(regs, EIO);
-                       goto out_tsk;
+       case PTRACE_SETREGS64:
+               ret = copy_regset_from_user(child, view, REGSET_GENERAL,
+                                           1 * sizeof(u64),
+                                           15 * sizeof(u64),
+                                           &pregs->u_regs[0]);
+               if (!ret) {
+                       /* XXX doesn't handle 'y' register correctly XXX */
+                       ret = copy_regset_from_user(child, view, REGSET_GENERAL,
+                                                   32 * sizeof(u64),
+                                                   4 * sizeof(u64),
+                                                   &pregs->tstate);
                }
-               pt_succ_return(regs, 0);
-               goto out_tsk;
-       }
+               break;
 
-       /* PTRACE_DUMPCORE unsupported... */
+       case PTRACE_GETFPREGS64:
+               ret = copy_regset_to_user(child, view, REGSET_FP,
+                                         0 * sizeof(u64),
+                                         33 * sizeof(u64),
+                                         fps);
+               break;
 
-       case PTRACE_GETEVENTMSG: {
-               int err;
+       case PTRACE_SETFPREGS64:
+               ret = copy_regset_to_user(child, view, REGSET_FP,
+                                         0 * sizeof(u64),
+                                         33 * sizeof(u64),
+                                         fps);
+               break;
 
-               if (test_thread_flag(TIF_32BIT))
-                       err = put_user(child->ptrace_message,
-                                      (unsigned int __user *) data);
-               else
-                       err = put_user(child->ptrace_message,
-                                      (unsigned long __user *) data);
-               if (err)
-                       pt_error_return(regs, -err);
-               else
-                       pt_succ_return(regs, 0);
+       case PTRACE_READTEXT:
+       case PTRACE_READDATA:
+               ret = ptrace_readdata(child, addr,
+                                     (char __user *)addr2, data);
+               if (ret == data)
+                       ret = 0;
+               else if (ret >= 0)
+                       ret = -EIO;
                break;
-       }
 
-       default: {
-               int err = ptrace_request(child, request, addr, data);
-               if (err)
-                       pt_error_return(regs, -err);
-               else
-                       pt_succ_return(regs, 0);
-               goto out_tsk;
-       }
+       case PTRACE_WRITETEXT:
+       case PTRACE_WRITEDATA:
+               ret = ptrace_writedata(child, (char __user *) addr2,
+                                      addr, data);
+               if (ret == data)
+                       ret = 0;
+               else if (ret >= 0)
+                       ret = -EIO;
+               break;
+
+       default:
+               ret = ptrace_request(child, request, addr, data);
+               break;
        }
-out_tsk:
-       if (child)
-               put_task_struct(child);
-out:
-       unlock_kernel();
+
+       return ret;
 }
 
 asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p)