diff --git a/sys/alpha/include/ptrace.h b/sys/alpha/include/ptrace.h index 87a03af515a6..93684b271d11 100644 --- a/sys/alpha/include/ptrace.h +++ b/sys/alpha/include/ptrace.h @@ -37,17 +37,8 @@ #ifndef _MACHINE_PTRACE_H_ #define _MACHINE_PTRACE_H_ -/* - * Machine dependent trace commands. - */ -#define PT_GETREGS (PT_FIRSTMACH + 1) -#define PT_SETREGS (PT_FIRSTMACH + 2) -#define PT_GETFPREGS (PT_FIRSTMACH + 3) -#define PT_SETFPREGS (PT_FIRSTMACH + 4) - -#define FIX_SSTEP(p) ptrace_clear_single_step(p) - #ifdef _KERNEL +#define FIX_SSTEP(p) ptrace_clear_single_step(p) int ptrace_clear_single_step(struct thread *_p); #endif diff --git a/sys/amd64/include/ptrace.h b/sys/amd64/include/ptrace.h index ea3477e11d81..7f4e7db7cc21 100644 --- a/sys/amd64/include/ptrace.h +++ b/sys/amd64/include/ptrace.h @@ -37,14 +37,4 @@ #ifndef _MACHINE_PTRACE_H_ #define _MACHINE_PTRACE_H_ -/* - * Machine dependent trace commands. - */ -#define PT_GETREGS (PT_FIRSTMACH + 1) -#define PT_SETREGS (PT_FIRSTMACH + 2) -#define PT_GETFPREGS (PT_FIRSTMACH + 3) -#define PT_SETFPREGS (PT_FIRSTMACH + 4) -#define PT_GETDBREGS (PT_FIRSTMACH + 5) -#define PT_SETDBREGS (PT_FIRSTMACH + 6) - #endif diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h index ea3477e11d81..7f4e7db7cc21 100644 --- a/sys/i386/include/ptrace.h +++ b/sys/i386/include/ptrace.h @@ -37,14 +37,4 @@ #ifndef _MACHINE_PTRACE_H_ #define _MACHINE_PTRACE_H_ -/* - * Machine dependent trace commands. - */ -#define PT_GETREGS (PT_FIRSTMACH + 1) -#define PT_SETREGS (PT_FIRSTMACH + 2) -#define PT_GETFPREGS (PT_FIRSTMACH + 3) -#define PT_SETFPREGS (PT_FIRSTMACH + 4) -#define PT_GETDBREGS (PT_FIRSTMACH + 5) -#define PT_SETDBREGS (PT_FIRSTMACH + 6) - #endif diff --git a/sys/ia64/include/ptrace.h b/sys/ia64/include/ptrace.h index 2cf8f264b660..7f4e7db7cc21 100644 --- a/sys/ia64/include/ptrace.h +++ b/sys/ia64/include/ptrace.h @@ -37,12 +37,4 @@ #ifndef _MACHINE_PTRACE_H_ #define _MACHINE_PTRACE_H_ -/* - * Machine dependent trace commands. - */ -#define PT_GETREGS (PT_FIRSTMACH + 1) -#define PT_SETREGS (PT_FIRSTMACH + 2) -#define PT_GETFPREGS (PT_FIRSTMACH + 3) -#define PT_SETFPREGS (PT_FIRSTMACH + 4) - #endif diff --git a/sys/powerpc/include/ptrace.h b/sys/powerpc/include/ptrace.h index ea3477e11d81..7f4e7db7cc21 100644 --- a/sys/powerpc/include/ptrace.h +++ b/sys/powerpc/include/ptrace.h @@ -37,14 +37,4 @@ #ifndef _MACHINE_PTRACE_H_ #define _MACHINE_PTRACE_H_ -/* - * Machine dependent trace commands. - */ -#define PT_GETREGS (PT_FIRSTMACH + 1) -#define PT_SETREGS (PT_FIRSTMACH + 2) -#define PT_GETFPREGS (PT_FIRSTMACH + 3) -#define PT_SETFPREGS (PT_FIRSTMACH + 4) -#define PT_GETDBREGS (PT_FIRSTMACH + 5) -#define PT_SETDBREGS (PT_FIRSTMACH + 6) - #endif diff --git a/sys/sparc64/include/ptrace.h b/sys/sparc64/include/ptrace.h index eb78807968b3..607d60267f0f 100644 --- a/sys/sparc64/include/ptrace.h +++ b/sys/sparc64/include/ptrace.h @@ -37,12 +37,4 @@ #ifndef _MACHINE_PTRACE_H_ #define _MACHINE_PTRACE_H_ -/* - * Machine dependent trace commands. - */ -#define PT_GETREGS (PT_FIRSTMACH + 1) -#define PT_SETREGS (PT_FIRSTMACH + 2) -#define PT_GETFPREGS (PT_FIRSTMACH + 3) -#define PT_SETFPREGS (PT_FIRSTMACH + 4) - -#endif /* !_MACHINE_PTRACE_H_ */ +#endif diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index 5c95ec1e5ea1..250f2e2a8777 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -51,7 +51,14 @@ #define PT_ATTACH 10 /* trace some running process */ #define PT_DETACH 11 /* stop tracing a process */ -#define PT_FIRSTMACH 32 /* for machine-specific requests */ +#define PT_GETREGS 33 /* get general-purpose registers */ +#define PT_SETREGS 34 /* set general-purpose registers */ +#define PT_GETFPREGS 35 /* get floating-point registers */ +#define PT_SETFPREGS 36 /* set floating-point registers */ +#define PT_GETDBREGS 37 /* get debugging registers */ +#define PT_SETDBREGS 38 /* set debugging registers */ + +#define PT_FIRSTMACH 64 /* for machine-specific requests */ #include <machine/ptrace.h> /* machine-specific requests, if any */ #ifdef _KERNEL