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

dtrace: use dtrace_instr_size() in the riscv dtrace_subr.c

Browse Source 
No functional change intended.

Reviewed by:	mhorne, markj
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D39652
This commit is contained in:
Christos Margiolis 2023-04-20 16:24:03 +00:00 committed by Mark Johnston
parent 080e56a6c9
commit 75081b9ed8
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/cddl/dev/dtrace/riscv/dtrace_subr.c
View File

@ -190,8 +190,6 @@ dtrace_gethrestime(void)
int
dtrace_trap(struct trapframe *frame, u_int type)
{
uint16_t insn;
/*
* A trap can occur while DTrace executes a probe. Before
* executing the probe, DTrace blocks re-scheduling and sets
@ -219,15 +217,10 @@ dtrace_trap(struct trapframe *frame, u_int type)
/*
* Offset the instruction pointer to the instruction
* following the one causing the fault. Check if the
* instruction is compressed or not. Standard
* instructions always have bits [1:0] == 11.
* following the one causing the fault.
*/
insn = *(uint16_t *)frame->tf_sepc;
if (match_opcode(insn, 0x3, 0x3))
frame->tf_sepc += INSN_SIZE;
else
frame->tf_sepc += INSN_C_SIZE;
frame->tf_sepc +=
dtrace_instr_size((uint8_t *)frame->tf_sepc);
return (1);
default: