diff options
| author | Christos Margiolis <christos@FreeBSD.org> | 2023-04-20 16:21:46 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2023-04-20 17:35:57 +0000 |
| commit | 080e56a6c98c7e7a241a4260d4c19d3cad5b22af (patch) | |
| tree | 46b242f0f7896aed33510eb7cfc2bf033cf47d2d /sys/cddl | |
| parent | 1a149d65baed31b90a0b8abe2d6c5a568122a5ec (diff) | |
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 5 | ||||
| -rw-r--r-- | sys/cddl/dev/dtrace/riscv/instr_size.c | 22 |
2 files changed, 26 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index d3d8fbca6164..7b8da08e9ae9 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -2399,7 +2399,6 @@ extern void dtrace_safe_synchronous_signal(void); extern int dtrace_mach_aframes(void); #if defined(__i386) || defined(__amd64) -extern int dtrace_instr_size(uint8_t *instr); extern int dtrace_instr_size_isa(uint8_t *, model_t, int *); extern void dtrace_invop_callsite(void); #endif @@ -2428,6 +2427,10 @@ extern void dtrace_helpers_destroy(proc_t *); #endif /* _KERNEL */ +#if defined(__i386) || defined(__amd64) || defined (__riscv) +extern int dtrace_instr_size(uint8_t *instr); +#endif + #endif /* _ASM */ #if defined(__i386) || defined(__amd64) diff --git a/sys/cddl/dev/dtrace/riscv/instr_size.c b/sys/cddl/dev/dtrace/riscv/instr_size.c new file mode 100644 index 000000000000..bfdc962f4aa9 --- /dev/null +++ b/sys/cddl/dev/dtrace/riscv/instr_size.c @@ -0,0 +1,22 @@ +/* + * SPDX-License-Identifier: CDDL 1.0 + * + * Copyright 2023 Christos Margiolis <christos@FreeBSD.org> + */ + +#include <sys/types.h> +#include <sys/dtrace.h> + +#include <machine/riscvreg.h> + +#define RVC_MASK 0x03 + +int +dtrace_instr_size(uint8_t *instr) +{ + /* Detect compressed instructions. */ + if ((~(*instr) & RVC_MASK) == 0) + return (INSN_SIZE); + else + return (INSN_C_SIZE); +} |