From ca75fa17ee4f19493d49c8183416a8f3015b542f Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 16 May 2018 16:56:35 +0000
Subject: [PATCH] Export a breakpoint() function to userland for riscv.

As a result, enable tests using breakpoint() on riscv.

Reviewed by:	br
Differential Revision:	https://reviews.freebsd.org/D15191
---
 sys/riscv/include/cpufunc.h  | 8 ++++----
 tests/sys/kern/ptrace_test.c | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sys/riscv/include/cpufunc.h b/sys/riscv/include/cpufunc.h
index 6cac649b4e9..e411c6db09e 100644
--- a/sys/riscv/include/cpufunc.h
+++ b/sys/riscv/include/cpufunc.h
@@ -37,10 +37,6 @@
 #ifndef _MACHINE_CPUFUNC_H_
 #define	_MACHINE_CPUFUNC_H_
 
-#ifdef _KERNEL
-
-#include <machine/riscvreg.h>
-
 static __inline void
 breakpoint(void)
 {
@@ -48,6 +44,10 @@ breakpoint(void)
 	__asm("ebreak");
 }
 
+#ifdef _KERNEL
+
+#include <machine/riscvreg.h>
+
 static __inline register_t
 intr_disable(void)
 {
diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c
index 75785eff503..a205f225fcf 100644
--- a/tests/sys/kern/ptrace_test.c
+++ b/tests/sys/kern/ptrace_test.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
  * Architectures with a user-visible breakpoint().
  */
 #if defined(__amd64__) || defined(__i386__) || defined(__mips__) ||	\
-    defined(__sparc64__)
+    defined(__riscv) || defined(__sparc64__)
 #define	HAVE_BREAKPOINT
 #endif
 
@@ -67,6 +67,8 @@ __FBSDID("$FreeBSD$");
 #define	SKIP_BREAK(reg)
 #elif defined(__mips__)
 #define	SKIP_BREAK(reg)	((reg)->r_regs[PC] += 4)
+#elif defined(__riscv)
+#define	SKIP_BREAK(reg)	((reg)->sepc += 4)
 #elif defined(__sparc64__)
 #define	SKIP_BREAK(reg)	do {						\
 	(reg)->r_tpc = (reg)->r_tnpc + 4;				\