[src/trunk]: src/external/cddl/osnet/dev Tidy up a bit. No functional change...

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

details:   https://anonhg.NetBSD.org/src/rev/2a7d53f7aff6
branches:  trunk
changeset: 744741:2a7d53f7aff6
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Feb 12 01:09:38 2020 +0000

description:
Tidy up a bit.  No functional change intended.

aarch64 fbt_invop doesn't actually use the argument, but it would
make more sense for it to be the return value and/or first argument
register.  Certainly it's not `eax'!

diffstat:

 external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c |  8 ++++----
 external/cddl/osnet/dev/fbt/aarch64/fbt_isa.c        |  2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r aa3448fc5dcd -r 2a7d53f7aff6 external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c
--- a/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c      Wed Feb 12 01:09:27 2020 +0000
+++ b/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c      Wed Feb 12 01:09:38 2020 +0000
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dtrace_subr.c,v 1.1 2019/12/03 22:10:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtrace_subr.c,v 1.2 2020/02/12 01:09:38 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -69,13 +69,13 @@
 dtrace_invop_hdlr_t *dtrace_invop_hdlr;
 
 int
-dtrace_invop(uintptr_t addr, struct trapframe *frame, uintptr_t eax)
+dtrace_invop(uintptr_t addr, struct trapframe *frame, uintptr_t r0)
 {
        dtrace_invop_hdlr_t *hdlr;
        int rval;
 
        for (hdlr = dtrace_invop_hdlr; hdlr != NULL; hdlr = hdlr->dtih_next)
-               if ((rval = hdlr->dtih_func(addr, frame, eax)) != 0)
+               if ((rval = hdlr->dtih_func(addr, frame, r0)) != 0)
                        return (rval);
 
        return (0);
@@ -263,7 +263,7 @@
        int tmp;
        int i;
 
-       invop = dtrace_invop(frame->tf_pc, frame, frame->tf_pc);
+       invop = dtrace_invop(frame->tf_pc, frame, frame->tf_regs.r_reg[0]);
 
        tmp = (invop & LDP_STP_MASK);
        if (tmp == STP_64 || tmp == LDP_64) {
diff -r aa3448fc5dcd -r 2a7d53f7aff6 external/cddl/osnet/dev/fbt/aarch64/fbt_isa.c
--- a/external/cddl/osnet/dev/fbt/aarch64/fbt_isa.c     Wed Feb 12 01:09:27 2020 +0000
+++ b/external/cddl/osnet/dev/fbt/aarch64/fbt_isa.c     Wed Feb 12 01:09:38 2020 +0000
@@ -53,7 +53,7 @@
 #define        FBT_RETURN      "return"
 
 int
-fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t rval)
+fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t r0)
 {
        solaris_cpu_t *cpu;
        fbt_probe_t *fbt;