@zigc/lib 0.17.0-dev.607 → 0.17.0-dev.633

package/libc/include/generic-netbsd/sys/sdt.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: sdt.h,v 1.15 2022/10/29 14:00:12 riastradh Exp $	*/
+/*	$NetBSD: sdt.h,v 1.24 2024/06/29 13:03:02 riastradh Exp $	*/
 
 /*-
  * Copyright 2006-2008 John Birrell <jb@FreeBSD.org>
@@ -11,7 +11,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -37,6 +37,9 @@
 
 #define	_DTRACE_VERSION	1
 
+#define SDT_PROVIDER_DEFINE(prov)
+#define SDT_PROVIDER_DECLARE(prov)
+
 #define	DTRACE_PROBE(prov, name) do {				\
 	extern void __dtrace_##prov##___##name(void);		\
 	__dtrace_##prov##___##name();				\
@@ -44,37 +47,37 @@
 
 #define	DTRACE_PROBE1(prov, name, arg1) do {			\
 	extern void __dtrace_##prov##___##name(unsigned long);	\
-	__dtrace_##prov##___##name((unsigned long)arg1);	\
+	__dtrace_##prov##___##name((unsigned long)(arg1));	\
 } while (0)
 
 #define	DTRACE_PROBE2(prov, name, arg1, arg2) do {		\
 	extern void __dtrace_##prov##___##name(unsigned long,	\
 	    unsigned long);					\
-	__dtrace_##prov##___##name((unsigned long)arg1,		\
-	    (unsigned long)arg2);				\
+	__dtrace_##prov##___##name((unsigned long)(arg1),	\
+	    (unsigned long)(arg2));				\
 } while (0)
 
 #define	DTRACE_PROBE3(prov, name, arg1, arg2, arg3) do {	\
 	extern void __dtrace_##prov##___##name(unsigned long,	\
 	    unsigned long, unsigned long);			\
-	__dtrace_##prov##___##name((unsigned long)arg1,		\
-	    (unsigned long)arg2, (unsigned long)arg3);		\
+	__dtrace_##prov##___##name((unsigned long)(arg1),	\
+	    (unsigned long)(arg2), (unsigned long)(arg3));	\
 } while (0)
 
 #define	DTRACE_PROBE4(prov, name, arg1, arg2, arg3, arg4) do {	\
 	extern void __dtrace_##prov##___##name(unsigned long,	\
 	    unsigned long, unsigned long, unsigned long);	\
-	__dtrace_##prov##___##name((unsigned long)arg1,		\
-	    (unsigned long)arg2, (unsigned long)arg3,		\
-	    (unsigned long)arg4);				\
+	__dtrace_##prov##___##name((unsigned long)(arg1),	\
+	    (unsigned long)(arg2), (unsigned long)(arg3),	\
+	    (unsigned long)(arg4));				\
 } while (0)
 
 #define	DTRACE_PROBE5(prov, name, arg1, arg2, arg3, arg4, arg5) do {	\
 	extern void __dtrace_##prov##___##name(unsigned long,		\
 	    unsigned long, unsigned long, unsigned long, unsigned long);\
-	__dtrace_##prov##___##name((unsigned long)arg1,			\
-	    (unsigned long)arg2, (unsigned long)arg3,			\
-	    (unsigned long)arg4, (unsigned long)arg5);			\
+	__dtrace_##prov##___##name((unsigned long)(arg1),		\
+	    (unsigned long)(arg2), (unsigned long)(arg3),		\
+	    (unsigned long)(arg4), (unsigned long)(arg5));		\
 } while (0)
 
 #else /* _KERNEL */
@@ -93,8 +96,14 @@
 #define SDT_PROVIDER_DECLARE(prov)
 #define SDT_PROBE_DEFINE(prov, mod, func, name)
 #define SDT_PROBE_DECLARE(prov, mod, func, name)
-#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)	      \
-	__nothing
+#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)	do    \
+{									      \
+	__MACROUSE((uintptr_t)(arg0));					      \
+	__MACROUSE((uintptr_t)(arg1));					      \
+	__MACROUSE((uintptr_t)(arg2));					      \
+	__MACROUSE((uintptr_t)(arg3));					      \
+	__MACROUSE((uintptr_t)(arg4));					      \
+} while (0)
 #define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype)
 
 #define	SDT_PROBE_DEFINE0(prov, mod, func, name)
@@ -108,19 +117,45 @@
 #define	SDT_PROBE_DEFINE7(prov, mod, func, name, arg0, arg1, arg2,      \
     arg3, arg4, arg5, arg6)
 
-#define	SDT_PROBE0(prov, mod, func, name)			__nothing
-#define	SDT_PROBE1(prov, mod, func, name, arg0)			__nothing
-#define	SDT_PROBE2(prov, mod, func, name, arg0, arg1)		__nothing
-#define	SDT_PROBE3(prov, mod, func, name, arg0, arg1, arg2)	__nothing
-#define	SDT_PROBE4(prov, mod, func, name, arg0, arg1, arg2, arg3)	      \
-	__nothing
-#define	SDT_PROBE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)	      \
-	__nothing
-#define	SDT_PROBE6(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5) \
-	__nothing
-#define	SDT_PROBE7(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5, \
-    arg6)								      \
+#define	SDT_PROBE0(prov, mod, func, name)				      \
 	__nothing
+#define	SDT_PROBE1(prov, mod, func, name, arg0)				      \
+	__MACROUSE((uintptr_t)(arg0))
+#define	SDT_PROBE2(prov, mod, func, name, arg0, arg1)	do		      \
+{									      \
+	__MACROUSE((uintptr_t)(arg0)); __MACROUSE((uintptr_t)(arg1));	      \
+} while (0)
+#define	SDT_PROBE3(prov, mod, func, name, arg0, arg1, arg2)	do	      \
+{									      \
+	__MACROUSE((uintptr_t)(arg0)); __MACROUSE((uintptr_t)(arg1));	      \
+	__MACROUSE((uintptr_t)(arg2));					      \
+} while (0)
+#define	SDT_PROBE4(prov, mod, func, name, arg0, arg1, arg2, arg3)	do    \
+{									      \
+	__MACROUSE((uintptr_t)(arg0)); __MACROUSE((uintptr_t)(arg1));	      \
+	__MACROUSE((uintptr_t)(arg2)); __MACROUSE((uintptr_t)(arg3));	      \
+} while (0)
+#define	SDT_PROBE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)	do    \
+{									      \
+	__MACROUSE((uintptr_t)(arg0)); __MACROUSE((uintptr_t)(arg1));	      \
+	__MACROUSE((uintptr_t)(arg2)); __MACROUSE((uintptr_t)(arg3));	      \
+	__MACROUSE((uintptr_t)(arg4));					      \
+} while (0)
+#define	SDT_PROBE6(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4,	      \
+    arg5)	do							      \
+{									      \
+	__MACROUSE((uintptr_t)(arg0)); __MACROUSE((uintptr_t)(arg1));	      \
+	__MACROUSE((uintptr_t)(arg2)); __MACROUSE((uintptr_t)(arg3));	      \
+	__MACROUSE((uintptr_t)(arg4)); __MACROUSE((uintptr_t)(arg5));	      \
+} while (0)
+#define	SDT_PROBE7(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4,	      \
+    arg5, arg6)	do							      \
+{									      \
+	__MACROUSE((uintptr_t)(arg0)); __MACROUSE((uintptr_t)(arg1));	      \
+	__MACROUSE((uintptr_t)(arg2)); __MACROUSE((uintptr_t)(arg3));	      \
+	__MACROUSE((uintptr_t)(arg4)); __MACROUSE((uintptr_t)(arg5));	      \
+	__MACROUSE((uintptr_t)(arg6));					      \
+} while (0)
 
 #define	SDT_PROBE_DEFINE0_XLATE(prov, mod, func, name)
 #define	SDT_PROBE_DEFINE1_XLATE(prov, mod, func, name, arg0, xarg0)
@@ -134,56 +169,80 @@
     arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4)
 #define	SDT_PROBE_DEFINE6_XLATE(prov, mod, func, name, arg0, xarg0,     \
     arg1,  xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5)
-#define	SDT_PROBE_DEFINE7_XLATE(prov, mod, func, name, arg0, xarg0,     \
-    arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5, arg6,     \
+#define	SDT_PROBE_DEFINE7_XLATE(prov, mod, func, name, arg0, xarg0,	      \
+    arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5, arg6,    \
     xarg6)
 
-#define	DTRACE_PROBE(name)					__nothing
-#define	DTRACE_PROBE1(name, type0, arg0)			__nothing
-#define	DTRACE_PROBE2(name, type0, arg0, type1, arg1)		__nothing
-#define	DTRACE_PROBE3(name, type0, arg0, type1, arg1, type2, arg2)	      \
-	__nothing
-#define	DTRACE_PROBE4(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3)\
-	__nothing
-#define	DTRACE_PROBE5(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3,\
-    type4, arg4)							      \
+#define	DTRACE_PROBE(name)						      \
 	__nothing
+#define	DTRACE_PROBE1(name, type0, arg0)				      \
+	__MACROUSE((uintptr_t)(arg0))
+#define	DTRACE_PROBE2(name, type0, arg0, type1, arg1)	do		      \
+{									      \
+	__MACROUSE((uintptr_t)(arg0)); __MACROUSE((uintptr_t)(arg1));	      \
+} while (0)
+#define	DTRACE_PROBE3(name, type0, arg0, type1, arg1, type2, arg2)	do    \
+{									      \
+	__MACROUSE((uintptr_t)(arg0)); __MACROUSE((uintptr_t)(arg1));	      \
+	__MACROUSE((uintptr_t)(arg2));					      \
+} while (0)
+#define	DTRACE_PROBE4(name, type0, arg0, type1, arg1, type2, arg2, type3,     \
+    arg3)	do							      \
+{									      \
+	__MACROUSE((uintptr_t)(arg0)); __MACROUSE((uintptr_t)(arg1));	      \
+	__MACROUSE((uintptr_t)(arg2)); __MACROUSE((uintptr_t)(arg3));	      \
+} while (0)
+#define	DTRACE_PROBE5(name, type0, arg0, type1, arg1, type2, arg2, type3,     \
+    arg3, type4, arg4)	do						      \
+{									      \
+	__MACROUSE((uintptr_t)(arg0)); __MACROUSE((uintptr_t)(arg1));	      \
+	__MACROUSE((uintptr_t)(arg2)); __MACROUSE((uintptr_t)(arg3));	      \
+	__MACROUSE((uintptr_t)(arg4));					      \
+} while (0)
 
 #else
 
-#define SDT_PROVIDER_DEFINE(prov)						\
-	struct sdt_provider sdt_provider_##prov[1] = {				\
-		{ #prov, { NULL, NULL }, 0, 0 }					\
-	};									\
+#define SDT_PROVIDER_DEFINE(prov)					      \
+	struct sdt_provider sdt_provider_##prov[1] = {			      \
+		{ #prov, { NULL, NULL }, 0, 0 }				      \
+	};								      \
 	__link_set_add_data(sdt_providers_set, sdt_provider_##prov);
 
-#define SDT_PROVIDER_DECLARE(prov)						\
+#define SDT_PROVIDER_DECLARE(prov)					      \
 	extern struct sdt_provider sdt_provider_##prov[1]
 
-#define SDT_PROBE_DEFINE(prov, mod, func, name)					\
-	struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] = {		\
-		{ sizeof(struct sdt_probe), sdt_provider_##prov,		\
-		    { NULL, NULL }, { NULL, NULL }, #mod, #func, #name, 0, 0,	\
-		    NULL }							\
-	};									\
-	__link_set_add_data(sdt_probes_set, sdt_##prov##_##mod##_##func##_##name);
-
-#define SDT_PROBE_DECLARE(prov, mod, func, name)				\
+#define SDT_PROBE_DEFINE(prov, mod, func, name)				      \
+	struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] = {	      \
+		{							      \
+			sizeof(struct sdt_probe), sdt_provider_##prov,	      \
+			{ NULL, NULL }, { NULL, NULL },			      \
+			#mod, #func, #name, 0, 0,			      \
+			NULL,						      \
+		}							      \
+	};								      \
+	__link_set_add_data(sdt_probes_set,				      \
+	    sdt_##prov##_##mod##_##func##_##name);
+
+#define SDT_PROBE_DECLARE(prov, mod, func, name)			      \
 	extern struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1]
 
-#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)	do {	\
-	if (__predict_false(sdt_##prov##_##mod##_##func##_##name->id))		\
-		(*sdt_probe_func)(sdt_##prov##_##mod##_##func##_##name->id,	\
-		    (uintptr_t) (arg0), (uintptr_t) (arg1), (uintptr_t) (arg2),	\
-		    (uintptr_t) (arg3), (uintptr_t) (arg4));			\
-} while (0)
-
-#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype)		\
-	static struct sdt_argtype sdta_##prov##_##mod##_##func##_##name##num[1]	\
-	    = { { num, type, xtype, { NULL, NULL },				\
-	    sdt_##prov##_##mod##_##func##_##name }				\
-	};									\
-	__link_set_add_data(sdt_argtypes_set, sdta_##prov##_##mod##_##func##_##name##num);
+#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)	      \
+	(__predict_false(sdt_##prov##_##mod##_##func##_##name->id)	      \
+	    ? (*sdt_probe_func)(sdt_##prov##_##mod##_##func##_##name->id,     \
+		(uintptr_t)(arg0), (uintptr_t)(arg1), (uintptr_t)(arg2),      \
+		(uintptr_t)(arg3), (uintptr_t)(arg4))			      \
+	    : 0)
+
+#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype)	      \
+	static struct sdt_argtype sdta_##prov##_##mod##_##func##_##name##num[1]\
+	= {								      \
+		{							      \
+			num, type, xtype, { NULL, NULL },		      \
+			sdt_##prov##_##mod##_##func##_##name,		      \
+		}							      \
+	};								      \
+	__link_set_add_data(sdt_argtypes_set,				      \
+		sdta_##prov##_##mod##_##func##_##name##num);
 
 #define	SDT_PROBE_DEFINE0(prov, mod, func, name)			\
 	SDT_PROBE_DEFINE(prov, mod, func, name)
@@ -210,7 +269,8 @@
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, NULL)
 
-#define	SDT_PROBE_DEFINE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \
+#define	SDT_PROBE_DEFINE5(prov, mod, func, name, arg0, arg1, arg2, arg3,\
+    arg4)								\
 	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
@@ -311,72 +371,76 @@
 #define	SDT_PROBE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \
 	SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
 /* XXX: void * function casts */
-#define	SDT_PROBE6(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5)  \
-	do {								       \
-		if (__predict_false(sdt_##prov##_##mod##_##func##_##name->id)) \
-			__FPTRCAST(void (*)(uint32_t, uintptr_t, uintptr_t,    \
-			    uintptr_t, uintptr_t, uintptr_t, uintptr_t),       \
-			    sdt_probe_func)(  				       \
-			    sdt_##prov##_##mod##_##func##_##name->id,	       \
-			    (uintptr_t)arg0, (uintptr_t)arg1, (uintptr_t)arg2, \
-			    (uintptr_t)arg3, (uintptr_t)arg4, (uintptr_t)arg5);\
-	} while (0)
-#define	SDT_PROBE7(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5,  \
-    arg6)								       \
-	do {								       \
-		if (__predict_false(sdt_##prov##_##mod##_##func##_##name->id)) \
-			__FPTRCAST(void (*)(uint32_t, uintptr_t, uintptr_t,    \
-			    uintptr_t, uintptr_t, uintptr_t, uintptr_t,	       \
-			    uintptr_t), sdt_probe_func)(		       \
-			    sdt_##prov##_##mod##_##func##_##name->id,	       \
-			    (uintptr_t)arg0, (uintptr_t)arg1, (uintptr_t)arg2, \
-			    (uintptr_t)arg3, (uintptr_t)arg4, (uintptr_t)arg5, \
-			    (uintptr_t)arg6);				       \
-	} while (0)
-
-#define	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, arg4)	do { \
-	static SDT_PROBE_DEFINE(sdt, , , name);				     \
-	SDT_PROBE(sdt, , , name, arg0, arg1, arg2, arg3, arg4);
-#define DTRACE_PROBE_IMPL_END	} while (0)
+#define	SDT_PROBE6(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5) \
+	(__predict_false(sdt_##prov##_##mod##_##func##_##name->id)	      \
+	    ? __FPTRCAST(void (*)(uint32_t, uintptr_t, uintptr_t,	      \
+		    uintptr_t, uintptr_t, uintptr_t, uintptr_t),	      \
+		sdt_probe_func)(					      \
+			sdt_##prov##_##mod##_##func##_##name->id,	      \
+			(uintptr_t)(arg0), (uintptr_t)(arg1),		      \
+			(uintptr_t)(arg2), (uintptr_t)(arg3),		      \
+			(uintptr_t)(arg4), (uintptr_t)(arg5))		      \
+	    : 0)
+#define	SDT_PROBE7(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5, \
+    arg6)								      \
+	(__predict_false(sdt_##prov##_##mod##_##func##_##name->id)	      \
+	    ? __FPTRCAST(void (*)(uint32_t, uintptr_t, uintptr_t,	      \
+		    uintptr_t, uintptr_t, uintptr_t, uintptr_t,		      \
+		    uintptr_t),						      \
+		sdt_probe_func)(					      \
+			sdt_##prov##_##mod##_##func##_##name->id,	      \
+			(uintptr_t)(arg0), (uintptr_t)(arg1),		      \
+			(uintptr_t)(arg2), (uintptr_t)(arg3),		      \
+			(uintptr_t)(arg4), (uintptr_t)(arg5),		      \
+			(uintptr_t)(arg6))				      \
+	    : 0)
+
+#define	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, arg4)	do    \
+{									      \
+	static SDT_PROBE_DEFINE(sdt, , , name);				      \
+	SDT_PROBE(sdt, , , name, arg0, arg1, arg2, arg3, arg4)
+#define DTRACE_PROBE_IMPL_END						      \
+} while (0)
 
 #define DTRACE_PROBE(name)						\
-	DTRACE_PROBE_IMPL_START(name, 0, 0, 0, 0, 0)			\
+	DTRACE_PROBE_IMPL_START(name, 0, 0, 0, 0, 0);			\
 	DTRACE_PROBE_IMPL_END
 
 #define DTRACE_PROBE1(name, type0, arg0)				\
-	DTRACE_PROBE_IMPL_START(name, arg0, 0, 0, 0, 0) 		\
+	DTRACE_PROBE_IMPL_START(name, arg0, 0, 0, 0, 0); 		\
 	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
 	DTRACE_PROBE_IMPL_END
 
 #define DTRACE_PROBE2(name, type0, arg0, type1, arg1)			\
-	DTRACE_PROBE_IMPL_START(name, arg0, arg1, 0, 0, 0) 		\
+	DTRACE_PROBE_IMPL_START(name, arg0, arg1, 0, 0, 0); 		\
 	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
 	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
 	DTRACE_PROBE_IMPL_END
 
 #define DTRACE_PROBE3(name, type0, arg0, type1, arg1, type2, arg2)	\
-	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, 0, 0)	 	\
+	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, 0, 0);	 	\
 	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
 	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
 	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		\
 	DTRACE_PROBE_IMPL_END
 
-#define DTRACE_PROBE4(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3)	\
-	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, 0) 	\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 3, #type3, NULL);		\
+#define DTRACE_PROBE4(name, type0, arg0, type1, arg1, type2, arg2, type3,     \
+    arg3)								      \
+	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, 0);	      \
+	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		      \
+	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		      \
+	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		      \
+	SDT_PROBE_ARGTYPE(sdt, , , name, 3, #type3, NULL);		      \
 	DTRACE_PROBE_IMPL_END
 
-#define DTRACE_PROBE5(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3,	\
-    type4, arg4)								\
-	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, arg4) 	\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 3, #type3, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 4, #type4, NULL);		\
+#define DTRACE_PROBE5(name, type0, arg0, type1, arg1, type2, arg2, type3,     \
+    arg3, type4, arg4)							      \
+	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, arg4);	      \
+	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		      \
+	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		      \
+	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		      \
+	SDT_PROBE_ARGTYPE(sdt, , , name, 3, #type3, NULL);		      \
+	SDT_PROBE_ARGTYPE(sdt, , , name, 4, #type4, NULL);		      \
 	DTRACE_PROBE_IMPL_END
 
 #endif /* KDTRACE_HOOKS */
@@ -436,6 +500,12 @@ SDT_PROVIDER_DECLARE(sdt);
 void sdt_init(void *);
 void sdt_exit(void);
 
+#ifdef KDTRACE_HOOKS
+SDT_PROBE_DECLARE(sdt, , , set__error);
+#define	SET_ERROR(err)	(SDT_PROBE1(sdt, , , set__error,  (err)), (err))
+#else
+#define	SET_ERROR(err)	(err)
+#endif	/* KDTRACE_HOOKS */
 
 #endif /* _KERNEL */
 

package/libc/include/generic-netbsd/sys/sem.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.h,v 1.34 2019/08/07 00:38:02 pgoyette Exp $	*/
+/*	$NetBSD: sem.h,v 1.37 2025/05/09 10:22:55 martin Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -204,7 +204,10 @@ extern struct semid_ds *sema;		/* semaphore id pool */
 	(dst).sem_nsems = (src).sem_nsems; \
 	(dst).sem_otime = (src).sem_otime; \
 	(dst).sem_ctime = (src).sem_ctime; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
+
+void do_semop_init(void);
+int do_semop1(struct lwp*, int, struct sembuf*, size_t, struct timespec*, register_t*);
 
 #endif /* _KERNEL */
 
@@ -217,6 +220,8 @@ int	semctl(int, int, int, ...) __RENAME(__semctl50);
 #endif
 int	semget(key_t, int, int);
 int	semop(int, struct sembuf *, size_t);
+struct timespec;
+int	semtimedop(int, struct sembuf *, size_t, struct timespec *);
 #if defined(_NETBSD_SOURCE)
 int	semconfig(int);
 #endif

package/libc/include/generic-netbsd/sys/sha1.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: sha1.h,v 1.15 2016/07/01 16:43:16 christos Exp $	*/
+/*	$NetBSD: sha1.h,v 1.16 2023/08/01 07:04:16 mrg Exp $	*/
 
 /*
  * SHA-1 in C
@@ -28,10 +28,10 @@ void	SHA1Init(SHA1_CTX *);
 void	SHA1Update(SHA1_CTX *, const uint8_t *, unsigned int);
 void	SHA1Final(uint8_t[SHA1_DIGEST_LENGTH], SHA1_CTX *);
 #ifndef _KERNEL
-char	*SHA1End(SHA1_CTX *, char *);
+char	*SHA1End(SHA1_CTX *, char[SHA1_DIGEST_STRING_LENGTH]);
 char	*SHA1FileChunk(const char *, char *, off_t, off_t);
 char	*SHA1File(const char *, char *);
-char	*SHA1Data(const uint8_t *, size_t, char *);
+char	*SHA1Data(const uint8_t *, size_t, char[SHA1_DIGEST_STRING_LENGTH]);
 #endif /* _KERNEL */
 __END_DECLS
 

package/libc/include/generic-netbsd/sys/sha2.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: sha2.h,v 1.3 2009/05/26 08:04:12 joerg Exp $	*/
+/*	$NetBSD: sha2.h,v 1.4 2024/01/19 18:39:59 christos Exp $	*/
 /*	$KAME: sha2.h,v 1.4 2003/07/20 00:28:38 itojun Exp $	*/
 
 /*
@@ -115,6 +115,13 @@ char *SHA512_FileChunk(const char *, char *, off_t, off_t);
 char *SHA512_File(const char *, char *);
 char *SHA512_Data(const uint8_t *, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
 #endif /* !_KERNEL */
+
+#ifdef _LIBC_INTERNAL
+void SHA224_Transform(SHA224_CTX *, const uint32_t*);
+void SHA256_Transform(SHA256_CTX *, const uint32_t*);
+void SHA384_Transform(SHA384_CTX *, const uint64_t*);
+void SHA512_Transform(SHA512_CTX *, const uint64_t*);
+#endif
 __END_DECLS
 
 #endif /* __SHA2_H__ */

package/libc/include/generic-netbsd/sys/shm.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: shm.h,v 1.55 2021/08/17 22:00:32 andvar Exp $	*/
+/*	$NetBSD: shm.h,v 1.56 2024/05/12 10:34:56 rillig Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -192,7 +192,7 @@ extern void (*uvm_shmfork)(struct vmspace *, struct vmspace *);
 	(dst).shm_dtime = (src).shm_dtime; \
 	(dst).shm_ctime = (src).shm_ctime; \
 	(dst).shm_nattch = (src).shm_nattch; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
 
 #else /* !_KERNEL */
 

package/libc/include/generic-netbsd/sys/siginfo.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: siginfo.h,v 1.34 2019/09/30 21:13:33 kamil Exp $	 */
+/*	$NetBSD: siginfo.h,v 1.35 2024/05/12 10:34:56 rillig Exp $	 */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -112,26 +112,26 @@ typedef struct ksiginfo {
 #define	KSI_INIT(ksi)							\
 do {									\
 	memset((ksi), 0, sizeof(*(ksi)));				\
-} while (/*CONSTCOND*/0)
+} while (0)
 
 #define	KSI_INIT_EMPTY(ksi)						\
 do {									\
 	KSI_INIT((ksi));						\
 	(ksi)->ksi_flags = KSI_EMPTY;					\
-} while (/*CONSTCOND*/0)
+} while (0)
 
 #define	KSI_INIT_TRAP(ksi)						\
 do {									\
 	KSI_INIT((ksi));						\
 	(ksi)->ksi_flags = KSI_TRAP;					\
-} while (/*CONSTCOND*/0)
+} while (0)
 
 /* Copy the part of ksiginfo_t without the queue pointers */
 #define	KSI_COPY(fksi, tksi)						\
 do {									\
 	(tksi)->ksi_info = (fksi)->ksi_info;				\
 	(tksi)->ksi_flags = (fksi)->ksi_flags;				\
-} while (/*CONSTCOND*/0)
+} while (0)
 
 
 /* Predicate macros to test how a ksiginfo_t was generated. */

package/libc/include/generic-netbsd/sys/signal.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: signal.h,v 1.75.4.2 2024/10/14 17:44:57 martin Exp $	*/
+/*	$NetBSD: signal.h,v 1.78 2024/09/19 14:41:05 kre Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993

package/libc/include/generic-netbsd/sys/sigtypes.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: sigtypes.h,v 1.12 2021/11/02 20:12:26 christos Exp $	*/
+/*	$NetBSD: sigtypes.h,v 1.13 2024/05/12 10:34:56 rillig Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -87,21 +87,21 @@ typedef struct {
 		(t)->__bits[1] |= (s)->__bits[1];	\
 		(t)->__bits[2] |= (s)->__bits[2];	\
 		(t)->__bits[3] |= (s)->__bits[3];	\
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 #define	__sigminusset(s, t) \
 	do {						\
 		(t)->__bits[0] &= ~(s)->__bits[0];	\
 		(t)->__bits[1] &= ~(s)->__bits[1];	\
 		(t)->__bits[2] &= ~(s)->__bits[2];	\
 		(t)->__bits[3] &= ~(s)->__bits[3];	\
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 #define	__sigandset(s, t) \
 	do {						\
 		(t)->__bits[0] &= (s)->__bits[0];	\
 		(t)->__bits[1] &= (s)->__bits[1];	\
 		(t)->__bits[2] &= (s)->__bits[2];	\
 		(t)->__bits[3] &= (s)->__bits[3];	\
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 
 #if (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \
     (_XOPEN_SOURCE - 0) >= 500 || (_POSIX_C_SOURCE - 0) >= 200809L || \

package/libc/include/generic-netbsd/sys/sleepq.h

@@ -1,7 +1,7 @@
-/*	$NetBSD: sleepq.h,v 1.36 2022/10/26 23:24:59 riastradh Exp $	*/
+/*	$NetBSD: sleepq.h,v 1.42 2023/10/15 10:30:00 riastradh Exp $	*/
 
 /*-
- * Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020
+ * Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020, 2023
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -33,13 +33,16 @@
 #ifndef	_SYS_SLEEPQ_H_
 #define	_SYS_SLEEPQ_H_
 
+#include <sys/param.h>
+
 #include <sys/lwp.h>
 #include <sys/mutex.h>
 #include <sys/pool.h>
 #include <sys/queue.h>
 #include <sys/sched.h>
-#include <sys/syncobj.h>
-#include <sys/param.h>
+#include <sys/wchan.h>
+
+struct syncobj;
 
 /*
  * Generic sleep queues.
@@ -48,11 +51,12 @@
 typedef struct sleepq sleepq_t;
 
 void	sleepq_init(sleepq_t *);
-void	sleepq_remove(sleepq_t *, lwp_t *);
-void	sleepq_enqueue(sleepq_t *, wchan_t, const char *, struct syncobj *,
-	    bool);
+void	sleepq_remove(sleepq_t *, lwp_t *, bool);
+int	sleepq_enter(sleepq_t *, lwp_t *, kmutex_t *);
+void	sleepq_enqueue(sleepq_t *, wchan_t, const char *,
+	    const struct syncobj *, bool);
 void	sleepq_transfer(lwp_t *, sleepq_t *, sleepq_t *, wchan_t, const char *,
-	    struct syncobj *, kmutex_t *, bool);
+	    const struct syncobj *, kmutex_t *, bool);
 void	sleepq_uncatch(lwp_t *);
 void	sleepq_unsleep(lwp_t *, bool);
 void	sleepq_timeout(void *);
@@ -60,7 +64,7 @@ void	sleepq_wake(sleepq_t *, wchan_t, u_int, kmutex_t *);
 int	sleepq_abort(kmutex_t *, int);
 void	sleepq_changepri(lwp_t *, pri_t);
 void	sleepq_lendpri(lwp_t *, pri_t);
-int	sleepq_block(int, bool, struct syncobj *);
+int	sleepq_block(int, bool, const struct syncobj *, int);
 
 #ifdef _KERNEL
 
@@ -83,24 +87,7 @@ sleepq_dontsleep(lwp_t *l)
 	return cold || (doing_shutdown && (panicstr || CURCPU_IDLE_P()));
 }
 
-/*
- * Prepare to block on a sleep queue, after which any interlock can be
- * safely released.
- */
-static __inline void
-sleepq_enter(sleepq_t *sq, lwp_t *l, kmutex_t *mp)
-{
-
-	/*
-	 * Acquire the per-LWP mutex and lend it ours sleep queue lock.
-	 * Once interlocked, we can release the kernel lock.
-	 */
-	lwp_lock(l);
-	lwp_unlock_to(l, mp);
-	KERNEL_UNLOCK_ALL(NULL, &l->l_biglocks);
-}
-
-#endif
+#endif	/* _KERNEL */
 
 #include <sys/sleeptab.h>