Module Name: src
Committed By: christos
Date: Sat Sep 26 00:33:35 UTC 2015
Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_proc.c dt_proc.h
Log Message:
catch up with unsigned long -> proc_breakpoint_t change.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c:1.7 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c:1.8
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c:1.7 Thu Sep 24 10:25:29 2015
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c Fri Sep 25 20:33:34 2015
@@ -136,7 +136,7 @@ dt_proc_bpdestroy(dt_proc_t *dpr, int de
if (delbkpts && dbp->dbp_active &&
state != PS_LOST && state != PS_UNDEAD) {
(void) Pdelbkpt(dpr->dpr_proc,
- dbp->dbp_addr, dbp->dbp_instr);
+ dbp->dbp_addr, &dbp->dbp_instr);
}
nbp = dt_list_next(dbp);
dt_list_delete(&dpr->dpr_bps, dbp);
@@ -186,7 +186,7 @@ dt_proc_bpmatch(dtrace_hdl_t *dtp, dt_pr
(int)dpr->dpr_pid, (ulong_t)dbp->dbp_addr, ++dbp->dbp_hits);
dbp->dbp_func(dtp, dpr, dbp->dbp_data);
- (void) Pxecbkpt(dpr->dpr_proc, dbp->dbp_instr);
+ (void) Pxecbkpt(dpr->dpr_proc, &dbp->dbp_instr);
}
static void
@@ -216,7 +216,7 @@ dt_proc_bpdisable(dt_proc_t *dpr)
for (dbp = dt_list_next(&dpr->dpr_bps);
dbp != NULL; dbp = dt_list_next(dbp)) {
if (dbp->dbp_active && Pdelbkpt(dpr->dpr_proc,
- dbp->dbp_addr, dbp->dbp_instr) == 0)
+ dbp->dbp_addr, &dbp->dbp_instr) == 0)
dbp->dbp_active = B_FALSE;
}
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h:1.3 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h:1.4
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h:1.3 Thu Sep 24 10:25:29 2015
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h Fri Sep 25 20:33:34 2015
@@ -80,7 +80,7 @@ typedef struct dt_bkpt {
dt_bkpt_f *dbp_func; /* callback function to execute */
void *dbp_data; /* callback function private data */
uintptr_t dbp_addr; /* virtual address of breakpoint */
- ulong_t dbp_instr; /* saved instruction from breakpoint */
+ proc_breakpoint_t dbp_instr; /* saved instruction from breakpoint */
ulong_t dbp_hits; /* count of breakpoint hits for debug */
int dbp_active; /* flag indicating breakpoint is on */
} dt_bkpt_t;
