D40363.1787895969.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40363.1787895969.diff
View Options

	diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
	--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
	+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
	@@ -2479,6 +2479,10 @@

	#define INSN_SIZE 4

	+#define BRK 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
	@@ -2520,6 +2524,8 @@
	#define DTRACE_INVOP_B 3
	#define DTRACE_INVOP_SUB 4

	+#define DTRACE_PATCHVAL (BRK \| BRK_IMM16_VAL)
	+
	#elif defined(__mips__)

	#define INSN_SIZE 4
	diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
	--- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c
	+++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
	@@ -38,12 +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_ENTRY "entry"
	-#define FBT_RETURN "return"
	+#define FBT_PATCHVAL DTRACE_PATCHVAL
	#define FBT_AFRAMES 4

	int