upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dtrace: deduplicate arm64 breakpoint definition

Browse source 
Reviewed by:	markj
Approved by:	markj (mentor)
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D40363
This commit is contained in:
Christos Margiolis 2023-06-03 20:04:10 +03:00
parent 4a6b92849e
commit bab7781e78
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
View file

@ -2479,6 +2479,10 @@ extern int dtrace_instr_c_ret(uint32_t **instr);
#define INSN_SIZE 4
#define BRK_INSTR 0xd4200000
#define BRK_IMM16_SHIFT 5
#define BRK_IMM16_VAL (0x40d << BRK_IMM16_SHIFT)
#define B_MASK 0xff000000
#define B_DATA_MASK 0x00ffffff
#define B_INSTR 0x14000000
@ -2515,6 +2519,8 @@ extern int dtrace_instr_c_ret(uint32_t **instr);
#define OFFSET_SIZE 7
#define OFFSET_MASK ((1 << OFFSET_SIZE) - 1)
#define DTRACE_PATCHVAL (BRK_INSTR | BRK_IMM16_VAL)
#define DTRACE_INVOP_STP 1
#define DTRACE_INVOP_RET 2
#define DTRACE_INVOP_B 3

5
sys/cddl/dev/fbt/aarch64/fbt_isa.c
View file

@ -38,10 +38,7 @@
#include "fbt.h"
#define AARCH64_BRK 0xd4200000
#define AARCH64_BRK_IMM16_SHIFT 5
#define AARCH64_BRK_IMM16_VAL (0x40d << AARCH64_BRK_IMM16_SHIFT)
#define FBT_PATCHVAL (AARCH64_BRK | AARCH64_BRK_IMM16_VAL)
#define FBT_PATCHVAL DTRACE_PATCHVAL
#define FBT_AFRAMES 4
int