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

dtrace: Fix the i386 FBT build

Browse Source 
Reported by:	Jenkins
Fixes:	0e69c95915 ("dtrace: Fix up %rip for invop probes on x86")
This commit is contained in:
Mark Johnston 2022-11-01 00:14:30 -04:00
parent e7fe037310
commit 60013d9c50
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/cddl/dev/fbt/x86/fbt_isa.c
View File

@ -89,7 +89,11 @@ fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused)
* Report the address of the breakpoint for the benefit
* of consumers fetching register values with regs[].
*/
#ifdef __i386__
frame->tf_eip--;
#else
frame->tf_rip--;
#endif
for (; fbt != NULL; fbt = fbt->fbtp_tracenext) {
ASSERT(fbt->fbtp_rval == fbtrval);
if (fbt->fbtp_roffset == 0) {
@ -150,7 +154,11 @@ fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused)
}
}
/* Advance to the instruction following the breakpoint. */
#ifdef __i386__
frame->tf_eip++;
#else
frame->tf_rip++;
#endif
return (fbtrval);
}