sh: Provide linux/regset.h interface for SH-5.
Plugs in general and FPU regsets. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
94e2fb3d3e
commit
dd76279b47
arch/sh
@ -108,13 +108,11 @@ typedef struct user_fpu_struct elf_fpregset_t;
|
|||||||
#define elf_check_fdpic(x) ((x)->e_flags & EF_SH_FDPIC)
|
#define elf_check_fdpic(x) ((x)->e_flags & EF_SH_FDPIC)
|
||||||
#define elf_check_const_displacement(x) ((x)->e_flags & EF_SH_PIC)
|
#define elf_check_const_displacement(x) ((x)->e_flags & EF_SH_PIC)
|
||||||
|
|
||||||
#ifdef CONFIG_SUPERH32
|
|
||||||
/*
|
/*
|
||||||
* Enable dump using regset.
|
* Enable dump using regset.
|
||||||
* This covers all of general/DSP/FPU regs.
|
* This covers all of general/DSP/FPU regs.
|
||||||
*/
|
*/
|
||||||
#define CORE_DUMP_USE_REGSET
|
#define CORE_DUMP_USE_REGSET
|
||||||
#endif
|
|
||||||
|
|
||||||
#define USE_ELF_CORE_DUMP
|
#define USE_ELF_CORE_DUMP
|
||||||
#define ELF_FDPIC_CORE_EFLAGS EF_SH_FDPIC
|
#define ELF_FDPIC_CORE_EFLAGS EF_SH_FDPIC
|
||||||
|
@ -86,6 +86,7 @@ struct pt_dspregs {
|
|||||||
unsigned long re;
|
unsigned long re;
|
||||||
unsigned long mod;
|
unsigned long mod;
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
#define PTRACE_GETREGS 12 /* General registers */
|
#define PTRACE_GETREGS 12 /* General registers */
|
||||||
#define PTRACE_SETREGS 13
|
#define PTRACE_SETREGS 13
|
||||||
@ -100,7 +101,6 @@ struct pt_dspregs {
|
|||||||
|
|
||||||
#define PTRACE_GETDSPREGS 55 /* DSP registers */
|
#define PTRACE_GETDSPREGS 55 /* DSP registers */
|
||||||
#define PTRACE_SETDSPREGS 56
|
#define PTRACE_SETDSPREGS 56
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
#include <asm/addrspace.h>
|
#include <asm/addrspace.h>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* arch/sh/kernel/ptrace_64.c
|
* arch/sh/kernel/ptrace_64.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2000, 2001 Paolo Alberelli
|
* Copyright (C) 2000, 2001 Paolo Alberelli
|
||||||
* Copyright (C) 2003 - 2007 Paul Mundt
|
* Copyright (C) 2003 - 2008 Paul Mundt
|
||||||
*
|
*
|
||||||
* Started from SH3/4 version:
|
* Started from SH3/4 version:
|
||||||
* SuperH version: Copyright (C) 1999, 2000 Kaz Kojima & Niibe Yutaka
|
* SuperH version: Copyright (C) 1999, 2000 Kaz Kojima & Niibe Yutaka
|
||||||
@ -29,6 +29,8 @@
|
|||||||
#include <linux/audit.h>
|
#include <linux/audit.h>
|
||||||
#include <linux/seccomp.h>
|
#include <linux/seccomp.h>
|
||||||
#include <linux/tracehook.h>
|
#include <linux/tracehook.h>
|
||||||
|
#include <linux/elf.h>
|
||||||
|
#include <linux/regset.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
#include <asm/pgtable.h>
|
#include <asm/pgtable.h>
|
||||||
@ -137,6 +139,165 @@ void user_disable_single_step(struct task_struct *child)
|
|||||||
regs->sr &= ~SR_SSTEP;
|
regs->sr &= ~SR_SSTEP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int genregs_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);
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
/* PC, SR, SYSCALL */
|
||||||
|
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
|
||||||
|
®s->pc,
|
||||||
|
0, 3 * sizeof(unsigned long long));
|
||||||
|
|
||||||
|
/* R1 -> R63 */
|
||||||
|
if (!ret)
|
||||||
|
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
|
||||||
|
regs->regs,
|
||||||
|
offsetof(struct pt_regs, regs[0]),
|
||||||
|
63 * sizeof(unsigned long long));
|
||||||
|
/* TR0 -> TR7 */
|
||||||
|
if (!ret)
|
||||||
|
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
|
||||||
|
regs->tregs,
|
||||||
|
offsetof(struct pt_regs, tregs[0]),
|
||||||
|
8 * sizeof(unsigned long long));
|
||||||
|
|
||||||
|
if (!ret)
|
||||||
|
ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf,
|
||||||
|
sizeof(struct pt_regs), -1);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int genregs_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;
|
||||||
|
|
||||||
|
/* PC, SR, SYSCALL */
|
||||||
|
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
|
||||||
|
®s->pc,
|
||||||
|
0, 3 * sizeof(unsigned long long));
|
||||||
|
|
||||||
|
/* R1 -> R63 */
|
||||||
|
if (!ret && count > 0)
|
||||||
|
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
|
||||||
|
regs->regs,
|
||||||
|
offsetof(struct pt_regs, regs[0]),
|
||||||
|
63 * sizeof(unsigned long long));
|
||||||
|
|
||||||
|
/* TR0 -> TR7 */
|
||||||
|
if (!ret && count > 0)
|
||||||
|
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
|
||||||
|
regs->tregs,
|
||||||
|
offsetof(struct pt_regs, tregs[0]),
|
||||||
|
8 * sizeof(unsigned long long));
|
||||||
|
|
||||||
|
if (!ret)
|
||||||
|
ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
|
||||||
|
sizeof(struct pt_regs), -1);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_SH_FPU
|
||||||
|
int fpregs_get(struct task_struct *target,
|
||||||
|
const struct user_regset *regset,
|
||||||
|
unsigned int pos, unsigned int count,
|
||||||
|
void *kbuf, void __user *ubuf)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = init_fpu(target);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
|
||||||
|
&target->thread.fpu.hard, 0, -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int fpregs_set(struct task_struct *target,
|
||||||
|
const struct user_regset *regset,
|
||||||
|
unsigned int pos, unsigned int count,
|
||||||
|
const void *kbuf, const void __user *ubuf)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = init_fpu(target);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
set_stopped_child_used_math(target);
|
||||||
|
|
||||||
|
return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
|
||||||
|
&target->thread.fpu.hard, 0, -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int fpregs_active(struct task_struct *target,
|
||||||
|
const struct user_regset *regset)
|
||||||
|
{
|
||||||
|
return tsk_used_math(target) ? regset->n : 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* These are our native regset flavours.
|
||||||
|
*/
|
||||||
|
enum sh_regset {
|
||||||
|
REGSET_GENERAL,
|
||||||
|
#ifdef CONFIG_SH_FPU
|
||||||
|
REGSET_FPU,
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct user_regset sh_regsets[] = {
|
||||||
|
/*
|
||||||
|
* Format is:
|
||||||
|
* PC, SR, SYSCALL,
|
||||||
|
* R1 --> R63,
|
||||||
|
* TR0 --> TR7,
|
||||||
|
*/
|
||||||
|
[REGSET_GENERAL] = {
|
||||||
|
.core_note_type = NT_PRSTATUS,
|
||||||
|
.n = ELF_NGREG,
|
||||||
|
.size = sizeof(long long),
|
||||||
|
.align = sizeof(long long),
|
||||||
|
.get = genregs_get,
|
||||||
|
.set = genregs_set,
|
||||||
|
},
|
||||||
|
|
||||||
|
#ifdef CONFIG_SH_FPU
|
||||||
|
[REGSET_FPU] = {
|
||||||
|
.core_note_type = NT_PRFPREG,
|
||||||
|
.n = sizeof(struct user_fpu_struct) /
|
||||||
|
sizeof(long long),
|
||||||
|
.size = sizeof(long long),
|
||||||
|
.align = sizeof(long long),
|
||||||
|
.get = fpregs_get,
|
||||||
|
.set = fpregs_set,
|
||||||
|
.active = fpregs_active,
|
||||||
|
},
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct user_regset_view user_sh64_native_view = {
|
||||||
|
.name = "sh64",
|
||||||
|
.e_machine = EM_SH,
|
||||||
|
.regsets = sh_regsets,
|
||||||
|
.n = ARRAY_SIZE(sh_regsets),
|
||||||
|
};
|
||||||
|
|
||||||
|
const struct user_regset_view *task_user_regset_view(struct task_struct *task)
|
||||||
|
{
|
||||||
|
return &user_sh64_native_view;
|
||||||
|
}
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
@ -195,10 +356,33 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case PTRACE_GETREGS:
|
||||||
|
return copy_regset_to_user(child, &user_sh64_native_view,
|
||||||
|
REGSET_GENERAL,
|
||||||
|
0, sizeof(struct pt_regs),
|
||||||
|
(void __user *)data);
|
||||||
|
case PTRACE_SETREGS:
|
||||||
|
return copy_regset_from_user(child, &user_sh64_native_view,
|
||||||
|
REGSET_GENERAL,
|
||||||
|
0, sizeof(struct pt_regs),
|
||||||
|
(const void __user *)data);
|
||||||
|
#ifdef CONFIG_SH_FPU
|
||||||
|
case PTRACE_GETFPREGS:
|
||||||
|
return copy_regset_to_user(child, &user_sh64_native_view,
|
||||||
|
REGSET_FPU,
|
||||||
|
0, sizeof(struct user_fpu_struct),
|
||||||
|
(void __user *)data);
|
||||||
|
case PTRACE_SETFPREGS:
|
||||||
|
return copy_regset_from_user(child, &user_sh64_native_view,
|
||||||
|
REGSET_FPU,
|
||||||
|
0, sizeof(struct user_fpu_struct),
|
||||||
|
(const void __user *)data);
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
ret = ptrace_request(child, request, addr, data);
|
ret = ptrace_request(child, request, addr, data);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user