Index: aarch64/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/aarch64/include/ptrace.h,v
retrieving revision 1.8
diff -u -r1.8 ptrace.h
--- aarch64/include/ptrace.h	13 Dec 2018 10:44:25 -0000	1.8
+++ aarch64/include/ptrace.h	17 Jun 2019 19:21:08 -0000
@@ -57,6 +57,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	(r)->r_pc
+#define PTRACE_REG_FP(r)	(r)->r_reg[29]
 #define PTRACE_REG_SET_PC(r, v)	(r)->r_pc = (v)
 #define PTRACE_REG_SP(r)	(r)->r_sp
 #define PTRACE_REG_INTRV(r)	(r)->r_reg[0]
Index: alpha/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/include/ptrace.h,v
retrieving revision 1.9
diff -u -r1.9 ptrace.h
--- alpha/include/ptrace.h	12 Apr 2017 18:17:59 -0000	1.9
+++ alpha/include/ptrace.h	17 Jun 2019 19:21:08 -0000
@@ -48,6 +48,7 @@
 #include <machine/reg.h>
 
 #define PTRACE_REG_PC(r)	(r)->r_regs[R_ZERO]
+#define PTRACE_REG_FP(r)	(r)->r_regs[R_S6]
 #define PTRACE_REG_SET_PC(r, v)	(r)->r_regs[R_ZERO] = (v)
 #define PTRACE_REG_SP(r)	(r)->r_regs[R_SP]
 #define PTRACE_REG_INTRV(r)	(r)->r_regs[R_V0]
Index: amd64/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/include/ptrace.h,v
retrieving revision 1.14
diff -u -r1.14 ptrace.h
--- amd64/include/ptrace.h	4 Jun 2019 16:29:53 -0000	1.14
+++ amd64/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -59,6 +59,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	(r)->regs[_REG_RIP]
+#define PTRACE_REG_FP(r)	(r)->regs[_REG_RBP]
 #define PTRACE_REG_SET_PC(r, v)	(r)->regs[_REG_RIP] = (v)
 #define PTRACE_REG_SP(r)	(r)->regs[_REG_RSP]
 #define PTRACE_REG_INTRV(r)	(r)->regs[_REG_RAX]
Index: arm/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/include/ptrace.h,v
retrieving revision 1.13
diff -u -r1.13 ptrace.h
--- arm/include/ptrace.h	17 Jun 2019 17:53:22 -0000	1.13
+++ arm/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -60,6 +60,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(_r)		(_r)->r_pc
+#define PTRACE_REG_FP(_r)		(_r)->r[11]
 #define PTRACE_REG_SET_PC(_r, _v)	(_r)->r_pc = (_v)
 #define PTRACE_REG_SP(_r)		(_r)->r_sp
 #define PTRACE_REG_INTRV(_r)		(_r)->r[0]
Index: hppa/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/hppa/include/ptrace.h,v
retrieving revision 1.8
diff -u -r1.8 ptrace.h
--- hppa/include/ptrace.h	12 Apr 2017 18:17:59 -0000	1.8
+++ hppa/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -50,6 +50,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	(r)->r_pcoqh
+#define PTRACE_REG_FP(r)	(r)->r_regs[3]
 #define PTRACE_REG_SET_PC(r, v)	do {	\
 	(r)->r_pcoqh = (v);		\
 	(r)->r_pcoqt = (v) + 4;		\
Index: i386/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/include/ptrace.h,v
retrieving revision 1.21
diff -u -r1.21 ptrace.h
--- i386/include/ptrace.h	17 Jun 2019 14:31:51 -0000	1.21
+++ i386/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -107,6 +107,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	(r)->r_eip
+#define PTRACE_REG_FP(r)	(r)->r_ebp
 #define PTRACE_REG_SET_PC(r, v)	(r)->r_eip = (v)
 #define PTRACE_REG_SP(r)	(r)->r_esp
 #define PTRACE_REG_INTRV(r)	(r)->r_eax
Index: ia64/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/ia64/include/ptrace.h,v
retrieving revision 1.4
diff -u -r1.4 ptrace.h
--- ia64/include/ptrace.h	8 Apr 2017 00:25:49 -0000	1.4
+++ ia64/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -52,6 +52,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	(r)->r_special.iip
+#define PTRACE_REG_FP(r)	0 /* Not supported in target */
 #define PTRACE_REG_SET_PC(r, v)	(r)->r_special.iip = (v)
 #define PTRACE_REG_SP(r)	(r)->r_special.sp
 #ifdef notyet
Index: m68k/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/m68k/include/ptrace.h,v
retrieving revision 1.12
diff -u -r1.12 ptrace.h
--- m68k/include/ptrace.h	12 Apr 2017 18:18:00 -0000	1.12
+++ m68k/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -54,6 +54,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	(r)->r_pc
+#define PTRACE_REG_FP(r)	(r)->r_regs[14]
 #define PTRACE_REG_SET_PC(r, v)	(r)->r_pc = (v)
 #define PTRACE_REG_SP(r)	(r)->r_regs[15]
 #define PTRACE_REG_INTRV(r)	(r)->r_regs[0]
Index: mips/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/include/ptrace.h,v
retrieving revision 1.16
diff -u -r1.16 ptrace.h
--- mips/include/ptrace.h	12 Apr 2017 18:18:00 -0000	1.16
+++ mips/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -62,6 +62,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	(r)->r_regs[35]
+#define PTRACE_REG_FP(r)	(r)->r_regs[30]
 #define PTRACE_REG_SET_PC(r, v)	(r)->r_regs[35] = (v)
 #define PTRACE_REG_SP(r)	(r)->r_regs[29]
 #define PTRACE_REG_INTRV(r)	(r)->r_regs[2]
Index: or1k/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/or1k/include/ptrace.h,v
retrieving revision 1.2
diff -u -r1.2 ptrace.h
--- or1k/include/ptrace.h	15 Sep 2015 15:49:03 -0000	1.2
+++ or1k/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -44,7 +44,8 @@
 	"PT_SETREGS"
 
 #include <machine/reg.h>
-#define PTRACE_REG_PC(r)	(r)->r_reg[31]	// XXX:!?!
+#define PTRACE_REG_PC(r)	(r)->r_reg[31]
+#define PTRACE_REG_FP(r)	(r)->r_reg[1]
 #define PTRACE_REG_SET_PC(r, v)	(r)->r_reg[31] = (v)
 #define PTRACE_REG_SP(r)	(r)->r_reg[11]
 #define PTRACE_REG_INTRV(r)	(r)->r_reg[0]
Index: powerpc/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/include/ptrace.h,v
retrieving revision 1.13
diff -u -r1.13 ptrace.h
--- powerpc/include/ptrace.h	8 Apr 2017 00:25:49 -0000	1.13
+++ powerpc/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -22,6 +22,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	(r)->pc
+#define PTRACE_REG_FP(r)	(r)->fixreg[31]
 #define PTRACE_REG_SET_PC(r, v)	(r)->pc = (v)
 #define PTRACE_REG_SP(r)	(r)->fixreg[1]
 #define PTRACE_REG_INTRV(r)	(r)->fixreg[3]
Index: riscv/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/riscv/include/ptrace.h,v
retrieving revision 1.2
diff -u -r1.2 ptrace.h
--- riscv/include/ptrace.h	15 Sep 2015 15:49:03 -0000	1.2
+++ riscv/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -49,6 +49,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	(r)->r_pc
+#define PTRACE_REG_FP(r)	(r)->r_reg[7]
 #define PTRACE_REG_SET_PC(r, v)	(r)->r_pc = (v)
 #define PTRACE_REG_SP(r)	(r)->r_reg[1]
 #define PTRACE_REG_INTRV(r)	(r)->r_reg[9]
Index: sh3/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sh3/include/ptrace.h,v
retrieving revision 1.14
diff -u -r1.14 ptrace.h
--- sh3/include/ptrace.h	12 Apr 2017 18:18:00 -0000	1.14
+++ sh3/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -67,6 +67,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	r->r_spc
+#define PTRACE_REG_FP(r)	r->r_r14
 #define PTRACE_REG_SET_PC(r, v)	r->r_spc = (v)
 #define PTRACE_REG_SP(r)	r->r_r15
 #define PTRACE_REG_INTV(r)	r->r_r0
Index: sparc/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/include/ptrace.h,v
retrieving revision 1.13
diff -u -r1.13 ptrace.h
--- sparc/include/ptrace.h	17 Apr 2019 15:42:02 -0000	1.13
+++ sparc/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -56,6 +56,7 @@
 
 #include <machine/reg.h>
 #define PTRACE_REG_PC(r)	((register_t)(r)->r_pc)
+#define PTRACE_REG_FP(r)	(((register_t*)((register_t)(r)->r_out[6]))[15])
 #define PTRACE_REG_SET_PC(r, v)	do {	\
 	(r)->r_pc = (v);		\
 	(r)->r_npc = (v) + 4;		\
Index: vax/include/ptrace.h
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/include/ptrace.h,v
retrieving revision 1.10
diff -u -r1.10 ptrace.h
--- vax/include/ptrace.h	22 May 2017 17:12:11 -0000	1.10
+++ vax/include/ptrace.h	17 Jun 2019 19:21:09 -0000
@@ -44,6 +44,7 @@
 #include <machine/reg.h>
 
 #define PTRACE_REG_PC(r)	(r)->pc
+#define PTRACE_REG_FP(r)	(r)->fp
 #define PTRACE_REG_SET_PC(r, v)	(r)->pc = (v)
 #define PTRACE_REG_SP(r)	(r)->sp
 #define PTRACE_REG_INTRV(r)	(r)->r0