Page MenuHomeFreeBSD
Files F153838962

D39955.id121495.diff
No OneTemporary
Actions

D39955.id121495.diff
View Options

diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -131,6 +131,10 @@
DSRCS+= regs_riscv.d
.endif
+.if ${MACHINE_CPUARCH} == "aarch64"
+SRCS+= instr_size.c
+.endif
+
YFLAGS+=-d
LIBADD= ctf elf proc pthread rtld_db
diff --git a/sys/cddl/dev/dtrace/aarch64/instr_size.c b/sys/cddl/dev/dtrace/aarch64/instr_size.c
new file mode 100644
--- /dev/null
+++ b/sys/cddl/dev/dtrace/aarch64/instr_size.c
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: CDDL 1.0
+ *
+ * Copyright 2023 Christos Margiolis <christos@FreeBSD.org>
+ */
+
+#include <sys/types.h>
+#include <sys/dtrace.h>
+
+int
+dtrace_instr_size(uint8_t *instr __unused)
+{
+ return (INSN_SIZE);
+}
diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile
--- a/sys/modules/dtrace/dtrace/Makefile
+++ b/sys/modules/dtrace/dtrace/Makefile
@@ -22,12 +22,11 @@
instr_size.c
CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/intel \
-I${SYSDIR}/cddl/dev/dtrace/x86
-.endif
-.if ${MACHINE_CPUARCH} == "riscv"
+.endif
+.if ${MACHINE_CPUARCH} == "riscv" || ${MACHINE_CPUARCH} == "aarch64"
SRCS+= instr_size.c
.endif
-
CFLAGS+= ${OPENZFS_CFLAGS}
SRCS+= bus_if.h device_if.h vnode_if.h

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 25, 4:07 AM (11 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32108468
Default Alt Text
D39955.id121495.diff (1 KB)

Event Timeline