d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Export a breakpoint() function to userland for riscv.

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

Reviewed by:	br
Differential Revision:	https://reviews.freebsd.org/D15191
This commit is contained in:
John Baldwin 2018-05-16 16:56:35 +00:00
parent f2a2dfa729
commit ca75fa17ee
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/riscv/include/cpufunc.h
View File

@ -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)
{

4
tests/sys/kern/ptrace_test.c
View File

@ -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; \