Page MenuHomeFreeBSD
Files F150579926

D25685.id.diff
No OneTemporary
Actions

D25685.id.diff
View Options

Index: head/sys/cddl/dev/dtrace/arm/dtrace_subr.c
===================================================================
--- head/sys/cddl/dev/dtrace/arm/dtrace_subr.c
+++ head/sys/cddl/dev/dtrace/arm/dtrace_subr.c
@@ -248,7 +248,7 @@
register_t *r0, *sp;
int data, invop, reg, update_sp;
- invop = dtrace_invop(frame->tf_pc, frame, frame->tf_pc);
+ invop = dtrace_invop(frame->tf_pc, frame, frame->tf_r0);
switch (invop & DTRACE_INVOP_MASK) {
case DTRACE_INVOP_PUSHM:
sp = (register_t *)frame->tf_svc_sp;
Index: head/sys/cddl/dev/fbt/arm/fbt_isa.c
===================================================================
--- head/sys/cddl/dev/fbt/arm/fbt_isa.c
+++ head/sys/cddl/dev/fbt/arm/fbt_isa.c
@@ -56,9 +56,12 @@
register_t fifthparam;
for (; fbt != NULL; fbt = fbt->fbtp_hashnext) {
- if ((uintptr_t)fbt->fbtp_patchpoint == addr) {
- cpu->cpu_dtrace_caller = addr;
+ if ((uintptr_t)fbt->fbtp_patchpoint != addr)
+ continue;
+ cpu->cpu_dtrace_caller = addr;
+
+ if (fbt->fbtp_roffset == 0) {
/* Get 5th parameter from stack */
DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
fifthparam = *(register_t *)frame->tf_svc_sp;
@@ -67,11 +70,13 @@
dtrace_probe(fbt->fbtp_id, frame->tf_r0,
frame->tf_r1, frame->tf_r2,
frame->tf_r3, fifthparam);
-
- cpu->cpu_dtrace_caller = 0;
-
- return (fbt->fbtp_rval | (fbt->fbtp_savedval << DTRACE_INVOP_SHIFT));
+ } else {
+ dtrace_probe(fbt->fbtp_id, fbt->fbtp_roffset, rval,
+ 0, 0, 0);
}
+
+ cpu->cpu_dtrace_caller = 0;
+ return (fbt->fbtp_rval | (fbt->fbtp_savedval << DTRACE_INVOP_SHIFT));
}
return (0);
@@ -178,6 +183,7 @@
fbt->fbtp_rval = DTRACE_INVOP_B;
else
fbt->fbtp_rval = DTRACE_INVOP_POPM;
+ fbt->fbtp_roffset = (uintptr_t)instr - (uintptr_t)symval->value;
fbt->fbtp_savedval = *instr;
fbt->fbtp_patchval = FBT_BREAKPOINT;
fbt->fbtp_hashnext = fbt_probetab[FBT_ADDR2NDX(instr)];

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 1:42 PM (12 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30759610
Default Alt Text
D25685.id.diff (1 KB)

Event Timeline