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

Export a breakpoint() function to userland for arm and arm64.

Browse Source 
Enable ptrace() tests using breakpoint() on these architectures.

Reviewed by:	andrew
Differential Revision:	https://reviews.freebsd.org/D15191
This commit is contained in:
jhb 2018-07-06 23:49:17 +00:00
parent e38a7dec6f
commit 465d5a960e
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/arm/include/cpufunc.h
View File

@ -54,7 +54,7 @@
static __inline void
breakpoint(void)
{
__asm(".word 0xe7ffffff");
__asm("udf 0xffff");
}
struct cpu_functions {
@ -495,6 +495,19 @@ extern u_int arm_cache_level;
extern u_int arm_cache_loc;
extern u_int arm_cache_type[14];
#else /* !_KERNEL */
static __inline void
breakpoint(void)
{
/*
* This matches the instruction used by GDB for software
* breakpoints.
*/
__asm("udf 0xfdee");
}
#endif /* _KERNEL */
#endif /* _MACHINE_CPUFUNC_H_ */

12
sys/arm64/include/cpufunc.h
View File

@ -29,12 +29,6 @@
#ifndef _MACHINE_CPUFUNC_H_
#define _MACHINE_CPUFUNC_H_
#ifdef _KERNEL
#include <machine/armreg.h>
void pan_enable(void);
static __inline void
breakpoint(void)
{
@ -42,6 +36,12 @@ breakpoint(void)
__asm("brk #0");
}
#ifdef _KERNEL
#include <machine/armreg.h>
void pan_enable(void);
static __inline register_t
dbg_disable(void)
{

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

@ -54,8 +54,9 @@ __FBSDID("$FreeBSD$");
/*
* Architectures with a user-visible breakpoint().
*/
#if defined(__amd64__) || defined(__i386__) || defined(__mips__) || \
defined(__riscv) || defined(__sparc64__)
#if defined(__aarch64__) || defined(__amd64__) || defined(__arm__) || \
defined(__i386__) || defined(__mips__) || defined(__riscv) || \
defined(__sparc64__)
#define HAVE_BREAKPOINT
#endif
@ -63,8 +64,12 @@ __FBSDID("$FreeBSD$");
* Adjust PC to skip over a breakpoint when stopped for a breakpoint trap.
*/
#ifdef HAVE_BREAKPOINT
#if defined(__amd64__) || defined(__i386__)
#if defined(__aarch64__)
#define SKIP_BREAK(reg) ((reg)->elr += 4)
#elif defined(__amd64__) || defined(__i386__)
#define SKIP_BREAK(reg)
#elif defined(__arm__)
#define SKIP_BREAK(reg) ((reg)->r_pc += 4)
#elif defined(__mips__)
#define SKIP_BREAK(reg) ((reg)->r_regs[PC] += 4)
#elif defined(__riscv)