powerpc: merge ptrace.h
Move struct ptregs32 into asm-ppc64/ppc32.h Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
This commit is contained in:
Stephen Rothwell
parent
c5a1ebd245
commit
da80d460bf
3 changed files with 121 additions and 222 deletions
|
|
@ -1,5 +1,5 @@
|
|||
#ifndef _PPC64_PTRACE_H
|
||||
#define _PPC64_PTRACE_H
|
||||
#ifndef _ASM_POWERPC_PTRACE_H
|
||||
#define _ASM_POWERPC_PTRACE_H
|
||||
|
||||
/*
|
||||
* Copyright (C) 2001 PPC64 Team, IBM Corp
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
* that the overall structure is a multiple of 16 bytes in length.
|
||||
*
|
||||
* Note that the offsets of the fields in this struct correspond with
|
||||
* the PT_* values below. This simplifies arch/ppc64/kernel/ptrace.c.
|
||||
* the PT_* values below. This simplifies arch/powerpc/kernel/ptrace.c.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
@ -30,61 +30,30 @@ struct pt_regs {
|
|||
unsigned long gpr[32];
|
||||
unsigned long nip;
|
||||
unsigned long msr;
|
||||
unsigned long orig_gpr3; /* Used for restarting system calls */
|
||||
unsigned long orig_gpr3; /* Used for restarting system calls */
|
||||
unsigned long ctr;
|
||||
unsigned long link;
|
||||
unsigned long xer;
|
||||
unsigned long ccr;
|
||||
unsigned long softe; /* Soft enabled/disabled */
|
||||
unsigned long trap; /* Reason for being here */
|
||||
unsigned long dar; /* Fault registers */
|
||||
unsigned long dsisr;
|
||||
unsigned long result; /* Result of a system call */
|
||||
#ifdef __powerpc64__
|
||||
unsigned long softe; /* Soft enabled/disabled */
|
||||
#else
|
||||
unsigned long mq; /* 601 only (not used at present) */
|
||||
/* Used on APUS to hold IPL value. */
|
||||
#endif
|
||||
unsigned long trap; /* Reason for being here */
|
||||
/* N.B. for critical exceptions on 4xx, the dar and dsisr
|
||||
fields are overloaded to hold srr0 and srr1. */
|
||||
unsigned long dar; /* Fault registers */
|
||||
unsigned long dsisr; /* on 4xx/Book-E used for ESR */
|
||||
unsigned long result; /* Result of a system call */
|
||||
};
|
||||
|
||||
struct pt_regs32 {
|
||||
unsigned int gpr[32];
|
||||
unsigned int nip;
|
||||
unsigned int msr;
|
||||
unsigned int orig_gpr3; /* Used for restarting system calls */
|
||||
unsigned int ctr;
|
||||
unsigned int link;
|
||||
unsigned int xer;
|
||||
unsigned int ccr;
|
||||
unsigned int mq; /* 601 only (not used at present) */
|
||||
unsigned int trap; /* Reason for being here */
|
||||
unsigned int dar; /* Fault registers */
|
||||
unsigned int dsisr;
|
||||
unsigned int result; /* Result of a system call */
|
||||
};
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#define instruction_pointer(regs) ((regs)->nip)
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
extern unsigned long profile_pc(struct pt_regs *regs);
|
||||
#else
|
||||
#define profile_pc(regs) instruction_pointer(regs)
|
||||
#endif
|
||||
|
||||
#define user_mode(regs) ((((regs)->msr) >> MSR_PR_LG) & 0x1)
|
||||
|
||||
#define force_successful_syscall_return() \
|
||||
(current_thread_info()->syscall_noerror = 1)
|
||||
|
||||
/*
|
||||
* We use the least-significant bit of the trap field to indicate
|
||||
* whether we have saved the full set of registers, or only a
|
||||
* partial set. A 1 there means the partial set.
|
||||
*/
|
||||
#define FULL_REGS(regs) (((regs)->trap & 1) == 0)
|
||||
#define TRAP(regs) ((regs)->trap & ~0xF)
|
||||
#define CHECK_FULL_REGS(regs) BUG_ON(regs->trap & 1)
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
#ifdef __powerpc64__
|
||||
|
||||
#define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */
|
||||
|
||||
|
|
@ -92,8 +61,65 @@ extern unsigned long profile_pc(struct pt_regs *regs);
|
|||
#define __SIGNAL_FRAMESIZE 128
|
||||
#define __SIGNAL_FRAMESIZE32 64
|
||||
|
||||
#else /* __powerpc64__ */
|
||||
|
||||
#define STACK_FRAME_OVERHEAD 16 /* size of minimum stack frame */
|
||||
|
||||
/* Size of stack frame allocated when calling signal handler. */
|
||||
#define __SIGNAL_FRAMESIZE 64
|
||||
|
||||
#endif /* __powerpc64__ */
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#define instruction_pointer(regs) ((regs)->nip)
|
||||
#ifdef CONFIG_SMP
|
||||
extern unsigned long profile_pc(struct pt_regs *regs);
|
||||
#else
|
||||
#define profile_pc(regs) instruction_pointer(regs)
|
||||
#endif
|
||||
|
||||
#ifdef __powerpc64__
|
||||
#define user_mode(regs) ((((regs)->msr) >> MSR_PR_LG) & 0x1)
|
||||
#else
|
||||
#define user_mode(regs) (((regs)->msr & MSR_PR) != 0)
|
||||
#endif
|
||||
|
||||
#define force_successful_syscall_return() \
|
||||
do { \
|
||||
current_thread_info()->syscall_noerror = 1; \
|
||||
} while(0)
|
||||
|
||||
/*
|
||||
* We use the least-significant bit of the trap field to indicate
|
||||
* whether we have saved the full set of registers, or only a
|
||||
* partial set. A 1 there means the partial set.
|
||||
* On 4xx we use the next bit to indicate whether the exception
|
||||
* is a critical exception (1 means it is).
|
||||
*/
|
||||
#define FULL_REGS(regs) (((regs)->trap & 1) == 0)
|
||||
#ifndef __powerpc64__
|
||||
#define IS_CRITICAL_EXC(regs) (((regs)->trap & 2) == 0)
|
||||
#endif /* ! __powerpc64__ */
|
||||
#define TRAP(regs) ((regs)->trap & ~0xF)
|
||||
#ifdef __powerpc64__
|
||||
#define CHECK_FULL_REGS(regs) BUG_ON(regs->trap & 1)
|
||||
#else
|
||||
#define CHECK_FULL_REGS(regs) \
|
||||
do { \
|
||||
if ((regs)->trap & 1) \
|
||||
printk(KERN_CRIT "%s: partial register set\n", __FUNCTION__); \
|
||||
} while (0)
|
||||
#endif /* __powerpc64__ */
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
/*
|
||||
* Offsets used by 'ptrace' system call interface.
|
||||
* These can't be changed without breaking binary compatibility
|
||||
* with MkLinux, etc.
|
||||
*/
|
||||
#define PT_R0 0
|
||||
#define PT_R1 1
|
||||
|
|
@ -137,18 +163,25 @@ extern unsigned long profile_pc(struct pt_regs *regs);
|
|||
#define PT_LNK 36
|
||||
#define PT_XER 37
|
||||
#define PT_CCR 38
|
||||
#ifndef __powerpc64__
|
||||
#define PT_MQ 39
|
||||
#else
|
||||
#define PT_SOFTE 39
|
||||
#define PT_TRAP 40
|
||||
#define PT_DAR 41
|
||||
#define PT_DSISR 42
|
||||
#define PT_RESULT 43
|
||||
#endif
|
||||
|
||||
#define PT_FPR0 48
|
||||
#define PT_FPR0 48 /* each FP reg occupies 2 slots in this space */
|
||||
|
||||
#ifndef __powerpc64__
|
||||
|
||||
#define PT_FPR31 (PT_FPR0 + 2*31)
|
||||
#define PT_FPSCR (PT_FPR0 + 2*32 + 1)
|
||||
|
||||
#else /* __powerpc64__ */
|
||||
|
||||
/*
|
||||
* Kernel and userspace will both use this PT_FPSCR value. 32-bit apps will
|
||||
* have visibility to the asm-ppc/ptrace.h header instead of this one.
|
||||
*/
|
||||
#define PT_FPSCR (PT_FPR0 + 32) /* each FP reg occupies 1 slot in 64-bit space */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
|
@ -165,29 +198,29 @@ extern unsigned long profile_pc(struct pt_regs *regs);
|
|||
#define PT_VRSAVE_32 (PT_VR0 + 33*4)
|
||||
#endif
|
||||
|
||||
#endif /* __powerpc64__ */
|
||||
|
||||
/*
|
||||
* Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go.
|
||||
* The transfer totals 34 quadword. Quadwords 0-31 contain the
|
||||
* corresponding vector registers. Quadword 32 contains the vscr as the
|
||||
* last word (offset 12) within that quadword. Quadword 33 contains the
|
||||
* Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go.
|
||||
* The transfer totals 34 quadword. Quadwords 0-31 contain the
|
||||
* corresponding vector registers. Quadword 32 contains the vscr as the
|
||||
* last word (offset 12) within that quadword. Quadword 33 contains the
|
||||
* vrsave as the first word (offset 0) within the quadword.
|
||||
*
|
||||
* This definition of the VMX state is compatible with the current PPC32
|
||||
* ptrace interface. This allows signal handling and ptrace to use the same
|
||||
* structures. This also simplifies the implementation of a bi-arch
|
||||
* This definition of the VMX state is compatible with the current PPC32
|
||||
* ptrace interface. This allows signal handling and ptrace to use the same
|
||||
* structures. This also simplifies the implementation of a bi-arch
|
||||
* (combined (32- and 64-bit) gdb.
|
||||
*/
|
||||
#define PTRACE_GETVRREGS 18
|
||||
#define PTRACE_SETVRREGS 19
|
||||
|
||||
/*
|
||||
* While we dont have 64bit book E processors, we need to reserve the
|
||||
* relevant ptrace calls for 32bit compatibility.
|
||||
*/
|
||||
#if 0
|
||||
#define PTRACE_GETEVRREGS 20
|
||||
#define PTRACE_SETEVRREGS 21
|
||||
#endif
|
||||
#ifndef __powerpc64__
|
||||
/* Get/set all the upper 32-bits of the SPE registers, accumulator, and
|
||||
* spefscr, in one go */
|
||||
#define PTRACE_GETEVRREGS 20
|
||||
#define PTRACE_SETEVRREGS 21
|
||||
#endif /* __powerpc64__ */
|
||||
|
||||
/*
|
||||
* Get or set a debug register. The first 16 are DABR registers and the
|
||||
|
|
@ -196,6 +229,7 @@ extern unsigned long profile_pc(struct pt_regs *regs);
|
|||
#define PTRACE_GET_DEBUGREG 25
|
||||
#define PTRACE_SET_DEBUGREG 26
|
||||
|
||||
#ifdef __powerpc64__
|
||||
/* Additional PTRACE requests implemented on PowerPC. */
|
||||
#define PPC_PTRACE_GETREGS 0x99 /* Get GPRs 0 - 31 */
|
||||
#define PPC_PTRACE_SETREGS 0x98 /* Set GPRs 0 - 31 */
|
||||
|
|
@ -209,5 +243,6 @@ extern unsigned long profile_pc(struct pt_regs *regs);
|
|||
#define PPC_PTRACE_POKEDATA_3264 0x92
|
||||
#define PPC_PTRACE_PEEKUSR_3264 0x91
|
||||
#define PPC_PTRACE_POKEUSR_3264 0x90
|
||||
#endif /* __powerpc64__ */
|
||||
|
||||
#endif /* _PPC64_PTRACE_H */
|
||||
#endif /* _ASM_POWERPC_PTRACE_H */
|
||||
|
|
@ -1,152 +0,0 @@
|
|||
#ifndef _PPC_PTRACE_H
|
||||
#define _PPC_PTRACE_H
|
||||
|
||||
/*
|
||||
* This struct defines the way the registers are stored on the
|
||||
* kernel stack during a system call or other kernel entry.
|
||||
*
|
||||
* this should only contain volatile regs
|
||||
* since we can keep non-volatile in the thread_struct
|
||||
* should set this up when only volatiles are saved
|
||||
* by intr code.
|
||||
*
|
||||
* Since this is going on the stack, *CARE MUST BE TAKEN* to insure
|
||||
* that the overall structure is a multiple of 16 bytes in length.
|
||||
*
|
||||
* Note that the offsets of the fields in this struct correspond with
|
||||
* the PT_* values below. This simplifies arch/ppc/kernel/ptrace.c.
|
||||
*/
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
struct pt_regs {
|
||||
unsigned long gpr[32];
|
||||
unsigned long nip;
|
||||
unsigned long msr;
|
||||
unsigned long orig_gpr3; /* Used for restarting system calls */
|
||||
unsigned long ctr;
|
||||
unsigned long link;
|
||||
unsigned long xer;
|
||||
unsigned long ccr;
|
||||
unsigned long mq; /* 601 only (not used at present) */
|
||||
/* Used on APUS to hold IPL value. */
|
||||
unsigned long trap; /* Reason for being here */
|
||||
/* N.B. for critical exceptions on 4xx, the dar and dsisr
|
||||
fields are overloaded to hold srr0 and srr1. */
|
||||
unsigned long dar; /* Fault registers */
|
||||
unsigned long dsisr; /* on 4xx/Book-E used for ESR */
|
||||
unsigned long result; /* Result of a system call */
|
||||
};
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#define STACK_FRAME_OVERHEAD 16 /* size of minimum stack frame */
|
||||
|
||||
/* Size of stack frame allocated when calling signal handler. */
|
||||
#define __SIGNAL_FRAMESIZE 64
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
#define instruction_pointer(regs) ((regs)->nip)
|
||||
#ifdef CONFIG_SMP
|
||||
extern unsigned long profile_pc(struct pt_regs *regs);
|
||||
#else
|
||||
#define profile_pc(regs) instruction_pointer(regs)
|
||||
#endif
|
||||
|
||||
#define user_mode(regs) (((regs)->msr & MSR_PR) != 0)
|
||||
|
||||
#define force_successful_syscall_return() \
|
||||
do { \
|
||||
current_thread_info()->syscall_noerror = 1; \
|
||||
} while(0)
|
||||
|
||||
/*
|
||||
* We use the least-significant bit of the trap field to indicate
|
||||
* whether we have saved the full set of registers, or only a
|
||||
* partial set. A 1 there means the partial set.
|
||||
* On 4xx we use the next bit to indicate whether the exception
|
||||
* is a critical exception (1 means it is).
|
||||
*/
|
||||
#define FULL_REGS(regs) (((regs)->trap & 1) == 0)
|
||||
#define IS_CRITICAL_EXC(regs) (((regs)->trap & 2) == 0)
|
||||
#define TRAP(regs) ((regs)->trap & ~0xF)
|
||||
|
||||
#define CHECK_FULL_REGS(regs) \
|
||||
do { \
|
||||
if ((regs)->trap & 1) \
|
||||
printk(KERN_CRIT "%s: partial register set\n", __FUNCTION__); \
|
||||
} while (0)
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
/*
|
||||
* Offsets used by 'ptrace' system call interface.
|
||||
* These can't be changed without breaking binary compatibility
|
||||
* with MkLinux, etc.
|
||||
*/
|
||||
#define PT_R0 0
|
||||
#define PT_R1 1
|
||||
#define PT_R2 2
|
||||
#define PT_R3 3
|
||||
#define PT_R4 4
|
||||
#define PT_R5 5
|
||||
#define PT_R6 6
|
||||
#define PT_R7 7
|
||||
#define PT_R8 8
|
||||
#define PT_R9 9
|
||||
#define PT_R10 10
|
||||
#define PT_R11 11
|
||||
#define PT_R12 12
|
||||
#define PT_R13 13
|
||||
#define PT_R14 14
|
||||
#define PT_R15 15
|
||||
#define PT_R16 16
|
||||
#define PT_R17 17
|
||||
#define PT_R18 18
|
||||
#define PT_R19 19
|
||||
#define PT_R20 20
|
||||
#define PT_R21 21
|
||||
#define PT_R22 22
|
||||
#define PT_R23 23
|
||||
#define PT_R24 24
|
||||
#define PT_R25 25
|
||||
#define PT_R26 26
|
||||
#define PT_R27 27
|
||||
#define PT_R28 28
|
||||
#define PT_R29 29
|
||||
#define PT_R30 30
|
||||
#define PT_R31 31
|
||||
|
||||
#define PT_NIP 32
|
||||
#define PT_MSR 33
|
||||
#ifdef __KERNEL__
|
||||
#define PT_ORIG_R3 34
|
||||
#endif
|
||||
#define PT_CTR 35
|
||||
#define PT_LNK 36
|
||||
#define PT_XER 37
|
||||
#define PT_CCR 38
|
||||
#define PT_MQ 39
|
||||
|
||||
#define PT_FPR0 48 /* each FP reg occupies 2 slots in this space */
|
||||
#define PT_FPR31 (PT_FPR0 + 2*31)
|
||||
#define PT_FPSCR (PT_FPR0 + 2*32 + 1)
|
||||
|
||||
/* Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go */
|
||||
#define PTRACE_GETVRREGS 18
|
||||
#define PTRACE_SETVRREGS 19
|
||||
|
||||
/* Get/set all the upper 32-bits of the SPE registers, accumulator, and
|
||||
* spefscr, in one go */
|
||||
#define PTRACE_GETEVRREGS 20
|
||||
#define PTRACE_SETEVRREGS 21
|
||||
|
||||
/*
|
||||
* Get or set a debug register. The first 16 are DABR registers and the
|
||||
* second 16 are IABR registers.
|
||||
*/
|
||||
#define PTRACE_GET_DEBUGREG 25
|
||||
#define PTRACE_SET_DEBUGREG 26
|
||||
|
||||
#endif
|
||||
|
|
@ -91,6 +91,22 @@ typedef struct sigaltstack_32 {
|
|||
compat_size_t ss_size;
|
||||
} stack_32_t;
|
||||
|
||||
struct pt_regs32 {
|
||||
unsigned int gpr[32];
|
||||
unsigned int nip;
|
||||
unsigned int msr;
|
||||
unsigned int orig_gpr3; /* Used for restarting system calls */
|
||||
unsigned int ctr;
|
||||
unsigned int link;
|
||||
unsigned int xer;
|
||||
unsigned int ccr;
|
||||
unsigned int mq; /* 601 only (not used at present) */
|
||||
unsigned int trap; /* Reason for being here */
|
||||
unsigned int dar; /* Fault registers */
|
||||
unsigned int dsisr;
|
||||
unsigned int result; /* Result of a system call */
|
||||
};
|
||||
|
||||
struct sigcontext32 {
|
||||
unsigned int _unused[4];
|
||||
int signal;
|
||||
|
|
|
|||
Loading…
Reference in a new issue