sh: Add DSP registers to regset interface.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index f995d134ab3a4adfb2505c15bf050afe26b1e971..acaba1bdd8a64daa95204f65b65a29b843330c6f 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -23,7 +23,7 @@ config SUPERH32
        def_bool !SUPERH64
        select HAVE_KPROBES
        select HAVE_KRETPROBES
-       select HAVE_ARCH_TRACEHOOK if (!SH_FPU && !SH_DSP)
+       select HAVE_ARCH_TRACEHOOK if !SH_FPU
 
 config SUPERH64
        def_bool y if CPU_SH5

diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h
index 455d9e1e14380f042f47e740608f7a2813d6e6e0..7c2363f8250ecd5c5ecd717d433da5abd83452f0 100644 (file)
--- a/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@ -108,11 +108,10 @@ typedef struct user_fpu_struct elf_fpregset_t;
 #define elf_check_fdpic(x)             ((x)->e_flags & EF_SH_FDPIC)
 #define elf_check_const_displacement(x)        ((x)->e_flags & EF_SH_PIC)
 
-#if defined(CONFIG_SUPERH32) && \
-       (!defined(CONFIG_SH_FPU) && !defined(CONFIG_SH_DSP))
+#if defined(CONFIG_SUPERH32) && !defined(CONFIG_SH_FPU)
 /*
  * Enable dump using regset for general purpose registers, use this as
- * the default once the FPU and DSP registers are moved over also.
+ * the default once the FPU registers are moved over also.
  */
 #define CORE_DUMP_USE_REGSET
 #endif

diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h
index bf73646e2d2b4cb6222bbcb4d21e2594d59735a1..3ad18e91bca61cfab3ac9451c0bbfa394ddc5891 100644 (file)
--- a/arch/sh/include/asm/ptrace.h
+++ b/arch/sh/include/asm/ptrace.h
@@ -123,6 +123,9 @@ extern void user_disable_single_step(struct task_struct *);
 #define task_pt_regs(task) \
        ((struct pt_regs *) (task_stack_page(task) + THREAD_SIZE \
                 - sizeof(struct pt_dspregs) - sizeof(unsigned long)) - 1)
+#define task_pt_dspregs(task) \
+       ((struct pt_dspregs *) (task_stack_page(task) + THREAD_SIZE \
+                - sizeof(unsigned long)) - 1)
 #else
 #define task_pt_regs(task) \
        ((struct pt_regs *) (task_stack_page(task) + THREAD_SIZE \

diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index 5e3ba10255cd4981d1152ceed5ecbae861fd7008..20b103f6c33ba73e885c18e7794d89be2f276c7f 100644 (file)
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -145,11 +145,50 @@ static int genregs_set(struct task_struct *target,
        return ret;
 }
 
+#ifdef CONFIG_SH_DSP
+static int dspregs_get(struct task_struct *target,
+                      const struct user_regset *regset,
+                      unsigned int pos, unsigned int count,
+                      void *kbuf, void __user *ubuf)
+{
+       const struct pt_dspregs *regs = task_pt_dspregs(target);
+       int ret;
+
+       ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, regs,
+                                 0, sizeof(struct pt_dspregs));
+       if (!ret)
+               ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf,
+                                              sizeof(struct pt_dspregs), -1);
+
+       return ret;
+}
+
+static int dspregs_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_dspregs *regs = task_pt_dspregs(target);
+       int ret;
+
+       ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, regs,
+                                0, sizeof(struct pt_dspregs));
+       if (!ret)
+               ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                               sizeof(struct pt_dspregs), -1);
+
+       return ret;
+}
+#endif
+
 /*
  * These are our native regset flavours.
  */
 enum sh_regset {
        REGSET_GENERAL,
+#ifdef CONFIG_SH_DSP
+       REGSET_DSP,
+#endif
 };
 
 static const struct user_regset sh_regsets[] = {
@@ -166,6 +205,16 @@ static const struct user_regset sh_regsets[] = {
                .get            = genregs_get,
                .set            = genregs_set,
        },
+
+#ifdef CONFIG_SH_DSP
+       [REGSET_DSP] = {
+               .n              = sizeof(struct pt_dspregs) / sizeof(long),
+               .size           = sizeof(long),
+               .align          = sizeof(long),
+               .get            = dspregs_get,
+               .set            = dspregs_set,
+       },
+#endif
 };
 
 static const struct user_regset_view user_sh_native_view = {
@@ -242,33 +291,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                             0, sizeof(struct pt_regs),
                                             (const void __user *)data);
 #ifdef CONFIG_SH_DSP
-       case PTRACE_GETDSPREGS: {
-               unsigned long dp;
-
-               ret = -EIO;
-               dp = ((unsigned long) child) + THREAD_SIZE -
-                        sizeof(struct pt_dspregs);
-               if (*((int *) (dp - 4)) == SR_FD) {
-                       copy_to_user((void *)addr, (void *) dp,
-                               sizeof(struct pt_dspregs));
-                       ret = 0;
-               }
-               break;
-       }
-
-       case PTRACE_SETDSPREGS: {
-               unsigned long dp;
-
-               ret = -EIO;
-               dp = ((unsigned long) child) + THREAD_SIZE -
-                        sizeof(struct pt_dspregs);
-               if (*((int *) (dp - 4)) == SR_FD) {
-                       copy_from_user((void *) dp, (void *)addr,
-                               sizeof(struct pt_dspregs));
-                       ret = 0;
-               }
-               break;
-       }
+       case PTRACE_GETDSPREGS:
+               return copy_regset_to_user(child, &user_sh_native_view,
+                                          REGSET_DSP,
+                                          0, sizeof(struct pt_dspregs),
+                                          (void __user *)data);
+       case PTRACE_SETDSPREGS:
+               return copy_regset_from_user(child, &user_sh_native_view,
+                                            REGSET_DSP,
+                                            0, sizeof(struct pt_dspregs),
+                                            (const void __user *)data);
 #endif
 #ifdef CONFIG_BINFMT_ELF_FDPIC
        case PTRACE_GETFDPIC: {