CVS commit: src/external/cddl/osnet/dev/dtrace/mips

[Simon Burge]

Module Name:src
Committed By:   simonb
Date:   Wed Apr  7 01:54:32 UTC 2021

Modified Files:
src/external/cddl/osnet/dev/dtrace/mips: dtrace_isa.c

Log Message:
Use NAL (nop-and-link) to get the current PC.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/dev/dtrace/mips/dtrace_isa.c

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/dev/dtrace/mips/dtrace_isa.c
diff -u src/external/cddl/osnet/dev/dtrace/mips/dtrace_isa.c:1.1 src/external/cddl/osnet/dev/dtrace/mips/dtrace_isa.c:1.2
--- src/external/cddl/osnet/dev/dtrace/mips/dtrace_isa.c:1.1	Mon Mar 29 05:17:09 2021
+++ src/external/cddl/osnet/dev/dtrace/mips/dtrace_isa.c	Wed Apr  7 01:54:31 2021
@@ -107,9 +107,8 @@ dtrace_getpcstack(pc_t *pcstack, int pcs
 	ra = (register_t)(intptr_t)__builtin_return_address(0);
 
	__asm __volatile(
-		"jal 99f\n"
-		"nop\n"
-		"99:\n"
+		"nal\n"
+		" nop\n"
 		"move %0, $31\n" /* get ra */
 		"move $31, %1\n" /* restore ra */
 		: "=r" (pc)

CVS commit: src/external/cddl/osnet/dev/dtrace/mips

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Apr  6 12:10:21 UTC 2021

Modified Files:
src/external/cddl/osnet/dev/dtrace/mips: dtrace_subr.c

Log Message:
sizeof(*var) instead of sizeof(type)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dev/dtrace/mips/dtrace_subr.c

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/dev/dtrace/mips/dtrace_subr.c
diff -u src/external/cddl/osnet/dev/dtrace/mips/dtrace_subr.c:1.2 src/external/cddl/osnet/dev/dtrace/mips/dtrace_subr.c:1.3
--- src/external/cddl/osnet/dev/dtrace/mips/dtrace_subr.c:1.2	Tue Apr  6 04:19:15 2021
+++ src/external/cddl/osnet/dev/dtrace/mips/dtrace_subr.c	Tue Apr  6 08:10:21 2021
@@ -88,7 +88,7 @@ dtrace_invop_add(int (*func)(uintptr_t, 
 {
 	dtrace_invop_hdlr_t *hdlr;
 
-	hdlr = kmem_alloc(sizeof (dtrace_invop_hdlr_t), KM_SLEEP);
+	hdlr = kmem_alloc(sizeof(*hdlr), KM_SLEEP);
 	hdlr->dtih_func = func;
 	hdlr->dtih_next = dtrace_invop_hdlr;
 	dtrace_invop_hdlr = hdlr;
@@ -121,7 +121,7 @@ dtrace_invop_remove(int (*func)(uintptr_
 		prev->dtih_next = hdlr->dtih_next;
 	}
 
-	kmem_free(hdlr, sizeof (dtrace_invop_hdlr_t));
+	kmem_free(hdlr, sizeof(*hdlr));
 }
 
 /*ARGSUSED*/

CVS commit: src/external/cddl/osnet/dev/dtrace/mips

[Simon Burge]

Module Name:src
Committed By:   simonb
Date:   Tue Apr  6 08:19:15 UTC 2021

Modified Files:
src/external/cddl/osnet/dev/dtrace/mips: dtrace_subr.c

Log Message:
Call kmem_free() with the size of the thing we are freeing.  Fixes panic
when unloading the ktrace module on MIPS.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/cddl/osnet/dev/dtrace/mips/dtrace_subr.c

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/dev/dtrace/mips/dtrace_subr.c
diff -u src/external/cddl/osnet/dev/dtrace/mips/dtrace_subr.c:1.1 src/external/cddl/osnet/dev/dtrace/mips/dtrace_subr.c:1.2
--- src/external/cddl/osnet/dev/dtrace/mips/dtrace_subr.c:1.1	Mon Mar 29 05:17:09 2021
+++ src/external/cddl/osnet/dev/dtrace/mips/dtrace_subr.c	Tue Apr  6 08:19:15 2021
@@ -121,7 +121,7 @@ dtrace_invop_remove(int (*func)(uintptr_
 		prev->dtih_next = hdlr->dtih_next;
 	}
 
-	kmem_free(hdlr, 0);
+	kmem_free(hdlr, sizeof (dtrace_invop_hdlr_t));
 }
 
 /*ARGSUSED*/