[src/trunk]: src/external/cddl/osnet/dist/lib/libdtrace/common catch up with ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b9a19014700f
branches:  trunk
changeset: 810860:b9a19014700f
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Sep 26 00:33:34 2015 +0000

description:
catch up with unsigned long -> proc_breakpoint_t change.

diffstat:

 external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c |  6 +++---
 external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h |  2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 5342da7c58e5 -r b9a19014700f external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c
--- a/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c   Fri Sep 25 19:27:31 2015 +0000
+++ b/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c   Sat Sep 26 00:33:34 2015 +0000
@@ -136,7 +136,7 @@
                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 @@
            (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 @@
        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;
        }
 
diff -r 5342da7c58e5 -r b9a19014700f external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h
--- a/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h   Fri Sep 25 19:27:31 2015 +0000
+++ b/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h   Sat Sep 26 00:33:34 2015 +0000
@@ -80,7 +80,7 @@
        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;