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

package/libc/include/arm-netbsd-eabi/machine/profile.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: profile.h,v 1.18 2018/01/24 09:04:45 skrll Exp $	*/
+/*	$NetBSD: profile.h,v 1.18.42.1 2026/04/02 19:12:03 martin Exp $	*/
 
 /*
  * Copyright (c) 2001 Ben Harris
@@ -38,90 +38,25 @@
  * prologue.
  */
 
-#define MCOUNT_ASM_NAME "__mcount"
 #define	PLTSYM
 
-#if !defined(__ARM_EABI__)
-#define	MCOUNT								\
-	__asm(".text");							\
-	__asm(".align	0");						\
-	__asm(".arm");							\
-	__asm(".type	" MCOUNT_ASM_NAME ",%function");		\
-	__asm(".global	" MCOUNT_ASM_NAME);				\
-	__asm(MCOUNT_ASM_NAME ":");					\
-	/*								\
-	 * Preserve registers that are trashed during mcount		\
-	 */								\
-	__asm("push	{r0-r3, ip, lr}");				\
-	/* Check what mode we're in.  EQ => 32, NE => 26 */		\
-	__asm("teq	r0, r0");					\
-	__asm("teq	pc, r15");					\
-	/*								\
-	 * find the return address for mcount,				\
-	 * and the return address for mcount's caller.			\
-	 *								\
-	 * frompcindex = pc pushed by call into self.			\
-	 */								\
-	__asm("moveq	r0, ip");					\
-	__asm("bicne	r0, ip, #0xfc000003");	       			\
-	/*								\
-	 * selfpc = pc pushed by mcount call				\
-	 */								\
-	__asm("moveq	r1, lr");					\
-	__asm("bicne	r1, lr, #0xfc000003");				\
-	/*								\
-	 * Call the real mcount code					\
-	 */								\
-	__asm("bl	" ___STRING(_C_LABEL(_mcount)) PLTSYM);		\
-	/*								\
-	 * Restore registers that were trashed during mcount		\
-	 */								\
-	__asm("pop	{r0-r3, lr}");					\
-	__asm("pop	{pc}");						\
-	__asm(".size	" MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);
-#elif defined(__ARM_DWARF_EH__)
-#define	MCOUNT								\
-	__asm(".text");							\
-	__asm(".align	0");						\
-	__asm(".arm");							\
-	__asm(".type	" MCOUNT_ASM_NAME ",%function");		\
-	__asm(".global	" MCOUNT_ASM_NAME);				\
-	__asm(MCOUNT_ASM_NAME ":");					\
-	__asm(".cfi_startproc");					\
-	/*								\
-	 * Preserve registers that are trashed during mcount		\
-	 */								\
-	__asm("push	{r0-r3, ip, lr}");				\
-	__asm(".cfi_def_cfa_offset 24");				\
-	__asm(".cfi_offset 14, -4");					\
-	__asm(".cfi_offset 12, -8");					\
-	__asm(".cfi_offset 3, -12");					\
-	__asm(".cfi_offset 2, -16");					\
-	__asm(".cfi_offset 1, -20");					\
-	__asm(".cfi_offset 0, -24");					\
-	/*								\
-	 * find the return address for mcount,				\
-	 * and the return address for mcount's caller.			\
-	 *								\
-	 * frompcindex = pc pushed by call into self.			\
-	 */								\
-	__asm("mov	r0, ip");					\
-	/*								\
-	 * selfpc = pc pushed by mcount call				\
-	 */								\
-	__asm("mov	r1, lr");					\
-	/*								\
-	 * Call the real mcount code					\
-	 */								\
-	__asm("bl	" ___STRING(_C_LABEL(_mcount)) PLTSYM);		\
-	/*								\
-	 * Restore registers that were trashed during mcount		\
-	 */								\
-	__asm("pop	{r0-r3, lr}");					\
-	__asm("pop	{pc}");						\
-	__asm(".cfi_endproc");						\
-	__asm(".size	" MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);
+#if defined (_ARM_ARCH_4T)
+# define RET		"bx	ip"
+#else
+# define RET		"mov	pc, ip"
+#endif
+
+#if defined(__ARM_DWARF_EH__)
+#define _PROF_UNWINDER_SAVE	""
+#define _PROF_UNWINDER_START	""
+#define _PROF_UNWINDER_END	""
 #else
+#define _PROF_UNWINDER_SAVE	".save {r0-r3, lr}\n"
+#define _PROF_UNWINDER_START	".fnstart\n"
+#define _PROF_UNWINDER_END	".fnend\n"
+#endif
+
+#define MCOUNT_ASM_NAME "__gnu_mcount_nc"
 #define	MCOUNT								\
 	__asm(".text");							\
 	__asm(".align	0");						\
@@ -129,27 +64,26 @@
 	__asm(".type	" MCOUNT_ASM_NAME ",%function");		\
 	__asm(".global	" MCOUNT_ASM_NAME);				\
 	__asm(MCOUNT_ASM_NAME ":");					\
-	__asm(".fnstart");						\
+	__asm(_PROF_UNWINDER_START);					\
 	__asm(".cfi_startproc");					\
 	/*								\
 	 * Preserve registers that are trashed during mcount		\
 	 */								\
-	__asm("push	{r0-r3, ip, lr}");				\
-	__asm(".save {r0-r3, lr}");					\
-	__asm(".cfi_def_cfa_offset 24");				\
+	__asm("push	{r0-r3, lr}");					\
+	__asm(_PROF_UNWINDER_SAVE);					\
+	__asm(".cfi_def_cfa_offset 20");				\
 	__asm(".cfi_offset 14, -4");					\
-	__asm(".cfi_offset 12, -8");					\
-	__asm(".cfi_offset 3, -12");					\
-	__asm(".cfi_offset 2, -16");					\
-	__asm(".cfi_offset 1, -20");					\
-	__asm(".cfi_offset 0, -24");					\
+	__asm(".cfi_offset 3, -8");					\
+	__asm(".cfi_offset 2, -12");					\
+	__asm(".cfi_offset 1, -16");					\
+	__asm(".cfi_offset 0, -20");					\
 	/*								\
 	 * find the return address for mcount,				\
 	 * and the return address for mcount's caller.			\
 	 *								\
 	 * frompcindex = pc pushed by call into self.			\
 	 */								\
-	__asm("mov	r0, ip");					\
+	__asm("ldr	r0, [sp, #20]");				\
 	/*								\
 	 * selfpc = pc pushed by mcount call				\
 	 */								\
@@ -161,12 +95,10 @@
 	/*								\
 	 * Restore registers that were trashed during mcount		\
 	 */								\
-	__asm("pop	{r0-r3, lr}");					\
-	__asm("pop	{pc}");						\
+	__asm("pop	{r0-r3, ip, lr}");				\
+	__asm(RET);							\
 	__asm(".cfi_endproc");						\
-	__asm(".fnend");						\
 	__asm(".size	" MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);
-#endif
 
 #ifdef _KERNEL
 #include <arm/cpufunc.h>

package/libc/include/arm-netbsd-eabi/machine/setjmp.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: setjmp.h,v 1.5 2013/01/11 13:56:32 matt Exp $	*/
+/*	$NetBSD: setjmp.h,v 1.6 2024/05/06 07:29:30 skrll Exp $	*/
 
 /*
  * machine/setjmp.h: machine dependent setjmp-related information.
@@ -10,11 +10,12 @@
  * NOTE: The internal structure of a jmp_buf is *PRIVATE*
  *       This information is provided as there is software
  *       that fiddles with this with obtain the stack pointer
- *	 (yes really ! and its commercial !).
+ *	 (yes really ! and it's commercial !).
  *
  * Description of the setjmp buffer
  *
- * word  0	magic number	(dependent on creator)
+ * Word		Field		Comment
+ * 	0	magic number	(dependent on creator)
  *	13	fpscr		vfp status control register
  *	14	r4		register 4
  *	15	r5		register 5
@@ -47,13 +48,13 @@
  * A side note I should mention - Please do not tamper
  * with the floating point fields. While they are
  * always saved and restored at the moment this cannot
- * be garenteed especially if the compiler happens
+ * be guaranteed especially if the compiler happens
  * to be generating soft-float code so no fp
  * registers will be used.
  *
- * Whilst this can be seen an encouraging people to
+ * Whilst this can be seen as encouraging people to
  * use the setjmp buffer in this way I think that it
- * is for the best then if changes occur compiles will
+ * is for the best then, if changes occur, compiles will
  * break rather than just having new builds falling over
  * mysteriously.
  */

package/libc/include/arm-netbsd-eabi/machine/sysarch.h

@@ -0,0 +1,85 @@
+/*	$NetBSD: sysarch.h,v 1.15 2021/10/06 05:33:15 skrll Exp $	*/
+
+/*
+ * Copyright (c) 1996-1997 Mark Brinicombe.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Mark Brinicombe.
+ * 4. The name of the company nor the name of the author may be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _ARM_SYSARCH_H_
+#define _ARM_SYSARCH_H_
+
+#include <sys/cdefs.h>
+
+/*
+ * Pickup definition of size_t and uintptr_t
+ */
+#include <machine/ansi.h>
+#include <sys/stdint.h>
+#ifndef _KERNEL
+#include <stdbool.h>
+#endif
+
+#ifdef	_BSD_SIZE_T_
+typedef	_BSD_SIZE_T_ size_t;
+#undef	_BSD_SIZE_T_
+#endif
+
+/*
+ * Architecture specific syscalls (arm)
+ */
+
+#define ARM_SYNC_ICACHE		0
+#define ARM_DRAIN_WRITEBUF	1
+#define ARM_VFP_FPSCR		2
+#define ARM_FPU_USED		3
+
+struct arm_sync_icache_args {
+	uintptr_t	addr;		/* Virtual start address */
+	size_t		len;		/* Region size */
+};
+
+struct arm_vfp_fpscr_args {
+	uint32_t	fpscr_clear;	/* bits to clear */
+	uint32_t	fpscr_set;	/* bits to set */
+};
+
+struct arm_unaligned_faults_args {
+	bool		enabled;	/* unaligned faults are enabled */
+};
+
+#ifndef _KERNEL
+__BEGIN_DECLS
+int	arm_sync_icache(uintptr_t, size_t);
+int	arm_drain_writebuf(void);
+int	sysarch(int, void *);
+__END_DECLS
+#endif
+
+#endif /* !_ARM_SYSARCH_H_ */

package/libc/include/generic-netbsd/altq/altq.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: altq.h,v 1.4 2006/10/12 19:59:08 peter Exp $ */
+/*	$NetBSD: altq.h,v 1.5 2024/12/24 08:35:28 ozaki-r Exp $ */
 /*	$KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $	*/
 
 /*
@@ -74,7 +74,7 @@ struct	altqreq {
 
 /* simple token backet meter profile */
 struct	tb_profile {
-	u_int	rate;	/* rate in bit-per-sec */
+	uint64_t	rate;	/* rate in bit-per-sec */
 	u_int	depth;	/* depth in bytes */
 };
 

package/libc/include/generic-netbsd/altq/altq_afmap.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_afmap.h,v 1.3 2006/10/12 19:59:08 peter Exp $	*/
+/*	$NetBSD: altq_afmap.h,v 1.4 2025/01/14 13:49:17 joe Exp $	*/
 /*	$KAME: altq_afmap.h,v 1.6 2002/04/03 05:38:50 kjc Exp $	*/
 
 /*
@@ -98,6 +98,7 @@ int		afm_remove(struct afm *);
 int		afm_removeall(struct ifnet *);
 struct		afm *afm_lookup(struct ifnet *, int, int);
 struct afm 	*afm_match(struct ifnet *, struct flowinfo *);
+struct afm_head *afmhead_if(struct ifnet *);
 
 #endif /* _KERNEL */
 

package/libc/include/generic-netbsd/altq/altq_classq.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_classq.h,v 1.8 2018/04/19 21:50:06 christos Exp $	*/
+/*	$NetBSD: altq_classq.h,v 1.12 2025/01/22 22:41:38 joe Exp $	*/
 /*	$KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $	*/
 
 /*
@@ -53,6 +53,8 @@ extern "C" {
 
 #ifdef _KERNEL
 
+#include <sys/cprng.h>
+
 /*
  * Packet Queue structures and macros to manipulate them.
  */
@@ -109,14 +111,14 @@ _getq(class_queue_t *q)
 	struct mbuf  *m, *m0;
 
 	if ((m = qtail(q)) == NULL)
-		return (NULL);
+		return NULL;
 	if ((m0 = m->m_nextpkt) != m)
 		m->m_nextpkt = m0->m_nextpkt;
 	else
 		qtail(q) = NULL;
 	qlen(q)--;
 	m0->m_nextpkt = NULL;
-	return (m0);
+	return m0;
 }
 
 /* drop a packet at the tail of the queue */
@@ -138,7 +140,7 @@ _getq_tail(class_queue_t *q)
 		qtail(q) = prev;
 	qlen(q)--;
 	m->m_nextpkt = NULL;
-	return (m);
+	return m;
 }
 
 /* randomly select a packet in the queue */
@@ -155,7 +157,7 @@ _getq_random(class_queue_t *q)
 	else {
 		struct mbuf *prev = NULL;
 
-		n = random() % qlen(q) + 1;
+		n = cprng_fast32() % qlen(q) + 1;
 		for (i = 0; i < n; i++) {
 			prev = m;
 			m = m->m_nextpkt;
@@ -166,7 +168,7 @@ _getq_random(class_queue_t *q)
 	}
 	qlen(q)--;
 	m->m_nextpkt = NULL;
-	return (m);
+	return m;
 }
 
 static __inline void

package/libc/include/generic-netbsd/altq/altq_jobs.h

@@ -1,58 +1,58 @@
-/*	$NetBSD: altq_jobs.h,v 1.5 2010/04/09 19:32:45 plunky Exp $	*/
+/*	$NetBSD: altq_jobs.h,v 1.6 2025/02/10 19:12:49 joe Exp $	*/
 /*	$KAME: altq_jobs.h,v 1.6 2003/07/10 12:07:48 kjc Exp $	*/
 /*
- * Copyright (c) 2001, Rector and Visitors of the University of 
+ * Copyright (c) 2001, Rector and Visitors of the University of
  * Virginia.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, 
- * with or without modification, are permitted provided 
+ * Redistribution and use in source and binary forms,
+ * with or without modification, are permitted provided
  * that the following conditions are met:
  *
- * Redistributions of source code must retain the above 
- * copyright notice, this list of conditions and the following 
- * disclaimer. 
+ * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
  *
- * 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. 
+ * 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.
  *
- * Neither the name of the University of Virginia nor the names 
- * of its contributors may be used to endorse or promote products 
- * derived from this software without specific prior written 
- * permission. 
+ * Neither the name of the University of Virginia nor the names
+ * of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE 
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-/*                                                                     
- * JoBS - altq prototype implementation                                
- *                                                                     
+/*
+ * JoBS - altq prototype implementation
+ *
  * Author: Nicolas Christin <nicolas@cs.virginia.edu>
  *
- * JoBS algorithms originally devised and proposed by		       
+ * JoBS algorithms originally devised and proposed by
  * Nicolas Christin and Jorg Liebeherr.
- * Grateful Acknowledgments to Tarek Abdelzaher for his help and       
+ * Grateful Acknowledgments to Tarek Abdelzaher for his help and
  * comments, and to Kenjiro Cho for some helpful advice.
  * Contributed by the Multimedia Networks Group at the University
- * of Virginia. 
+ * of Virginia.
  *
- * Papers and additional info can be found at 
+ * Papers and additional info can be found at
  * http://qosbox.cs.virginia.edu
- *                                                                      
- */ 							               
+ *
+ */
 
 #ifndef _ALTQ_ALTQ_JOBS_H_
 #define	_ALTQ_ALTQ_JOBS_H_
@@ -73,7 +73,7 @@ extern "C" {
 
 /* list of packet arrival times */
 struct _tsentry;
-typedef TAILQ_HEAD(_timestamps, _tsentry) TSLIST;  
+typedef TAILQ_HEAD(_timestamps, _tsentry) TSLIST;
 typedef struct _tsentry {
 	TAILQ_ENTRY(_tsentry) ts_list;
 	uint64_t	timestamp;

package/libc/include/generic-netbsd/altq/altq_rmclass.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_rmclass.h,v 1.13 2022/05/24 20:50:18 andvar Exp $	*/
+/*	$NetBSD: altq_rmclass.h,v 1.14 2025/02/03 07:40:24 ozaki-r Exp $	*/
 /*	$KAME: altq_rmclass.h,v 1.10 2003/08/20 23:30:23 itojun Exp $	*/
 
 /*
@@ -82,14 +82,14 @@ struct red;
 } while (0)
 
 #define	TS_ADD_DELTA(a, delta, res) do { \
-	register long xxns = (a)->tv_nsec + (long)(delta); \
-	\
-	(res)->tv_sec = (a)->tv_sec; \
-	while (xxns >= 1000000000) { \
-		++((res)->tv_sec); \
-		xxns -= 1000000000; \
+	KASSERT(delta >= 0); \
+	(res)->tv_sec = (a)->tv_sec + (delta) / 1000000000L; \
+	(res)->tv_nsec = (a)->tv_nsec + (long)((delta) % 1000000000L); \
+	if ((res)->tv_nsec >= 1000000000L) { \
+		(res)->tv_nsec -= 1000000000L; \
+		(res)->tv_sec++; \
 	} \
-	(res)->tv_nsec = xxns; \
+	KASSERT((res)->tv_nsec >= 0); \
 } while (0)
 
 #define	RM_TIMEOUT	2	/* 1 Clock tick. */

package/libc/include/generic-netbsd/altq/altq_var.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_var.h,v 1.12 2008/11/25 15:59:10 tsutsui Exp $	*/
+/*	$NetBSD: altq_var.h,v 1.13 2024/12/07 07:45:43 andvar Exp $	*/
 /*	$KAME: altq_var.h,v 1.18 2005/04/13 03:44:25 suz Exp $	*/
 
 /*
@@ -191,7 +191,7 @@ struct callout {
 /* dummy callout structure */
 struct callout {
 	void		*c_arg;			/* function argument */
-	void		(*c_func)(void *);	/* functiuon to call */
+	void		(*c_func)(void *);	/* function to call */
 };
 #define	CALLOUT_INIT(c)		do { (void)memset((c), 0, sizeof(*(c))); } while (/*CONSTCOND*/ 0)
 #define	CALLOUT_RESET(c,t,f,a)	do {	(c)->c_arg = (a);	\

package/libc/include/generic-netbsd/arm/arm32/pmap.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.173.4.1 2023/10/14 06:52:17 martin Exp $	*/
+/*	$NetBSD: pmap.h,v 1.177 2023/10/12 11:33:37 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -79,7 +79,10 @@
 #endif
 #include <arm/cpufunc.h>
 #include <arm/locore.h>
+
 #include <uvm/uvm_object.h>
+
+#include <uvm/pmap/pmap_devmap.h>
 #include <uvm/pmap/pmap_pvt.h>
 #endif
 
@@ -91,12 +94,7 @@
 #endif
 #define	PMAP_TLB_FLUSH_ASID_ON_RESET	arm_has_tlbiasid_p
 #define	PMAP_TLB_NUM_PIDS		256
-#define	cpu_set_tlb_info(ci, ti)        ((void)((ci)->ci_tlb_info = (ti)))
-#if PMAP_TLB_MAX > 1
-#define	cpu_tlb_info(ci)		((ci)->ci_tlb_info)
-#else
-#define	cpu_tlb_info(ci)		(&pmap_tlb0_info)
-#endif
+
 #define	pmap_md_tlb_asid_max()		(PMAP_TLB_NUM_PIDS - 1)
 #include <uvm/pmap/tlb.h>
 #include <uvm/pmap/pmap_tlb.h>
@@ -201,29 +199,10 @@ union pmap_cache_state {
 #define	PMAP_CACHE_STATE_ALL	0xffffffffu
 #endif /* !ARM_MMU_EXTENDED */
 
-/*
- * This structure is used by machine-dependent code to describe
- * static mappings of devices, created at bootstrap time.
- */
-struct pmap_devmap {
-	vaddr_t		pd_va;		/* virtual address */
-	paddr_t		pd_pa;		/* physical address */
-	psize_t		pd_size;	/* size of region */
-	vm_prot_t	pd_prot;	/* protection code */
-	int		pd_cache;	/* cache attributes */
-};
 
 #define	DEVMAP_ALIGN(a)	((a) & ~L1_S_OFFSET)
 #define	DEVMAP_SIZE(s)	roundup2((s), L1_S_SIZE)
-#define	DEVMAP_ENTRY(va, pa, sz)			\
-	{						\
-		.pd_va = DEVMAP_ALIGN(va),		\
-		.pd_pa = DEVMAP_ALIGN(pa),		\
-		.pd_size = DEVMAP_SIZE(sz),		\
-		.pd_prot = VM_PROT_READ|VM_PROT_WRITE,	\
-		.pd_cache = PTE_DEV			\
-	}
-#define	DEVMAP_ENTRY_END	{ 0 }
+#define	DEVMAP_FLAGS	PMAP_DEV
 
 /*
  * The pmap structure itself
@@ -419,17 +398,14 @@ void	pmap_postinit(void);
 
 void	vector_page_setprot(int);
 
-const struct pmap_devmap *pmap_devmap_find_pa(paddr_t, psize_t);
-const struct pmap_devmap *pmap_devmap_find_va(vaddr_t, vsize_t);
-
 /* Bootstrapping routines. */
 void	pmap_map_section(vaddr_t, vaddr_t, paddr_t, int, int);
 void	pmap_map_entry(vaddr_t, vaddr_t, paddr_t, int, int);
 vsize_t	pmap_map_chunk(vaddr_t, vaddr_t, paddr_t, vsize_t, int, int);
 void	pmap_unmap_chunk(vaddr_t, vaddr_t, vsize_t);
 void	pmap_link_l2pt(vaddr_t, vaddr_t, pv_addr_t *);
-void	pmap_devmap_bootstrap(vaddr_t, const struct pmap_devmap *);
-void	pmap_devmap_register(const struct pmap_devmap *);
+
+vsize_t pmap_kenter_range(vaddr_t, paddr_t, vsize_t, vm_prot_t, u_int);
 
 /*
  * Special page zero routine for use by the idle loop (no cache cleans).

package/libc/include/generic-netbsd/arm/arm32/vmparam.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.56 2020/10/08 12:49:06 he Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.58 2024/09/07 06:17:37 andvar Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -54,7 +54,7 @@
 #define	USRSTACK	VM_MAXUSER_ADDRESS
 
 /*
- * ARMv4 systems are normaly configured for 256MB KVA only, so restrict
+ * ARMv4 systems are normally configured for 256MB KVA only, so restrict
  * the size of the pager map to 4MB.
  */
 #ifndef _ARM_ARCH_5
@@ -131,7 +131,7 @@
 #define VM_KERNEL_KASAN_END	(VM_KERNEL_KASAN_BASE + VM_KERNEL_KASAN_SIZE)
 #define VM_KERNEL_VM_END	VM_KERNEL_KASAN_BASE
 #else
-#define VM_KERNEL_VM_END	VM_KERNEL_IO_ADDRESS
+#define VM_KERNEL_VM_END	VM_KERNEL_IO_BASE
 #endif
 
 #ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
@@ -146,8 +146,8 @@
 #define VM_KERNEL_ADDR_SIZE	(VM_KERNEL_VM_END - KERNEL_BASE)
 #define VM_KERNEL_VM_SIZE	(VM_KERNEL_VM_END - VM_KERNEL_VM_BASE)
 
-#define VM_KERNEL_IO_ADDRESS	0xf0000000
-#define VM_KERNEL_IO_SIZE	(VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS)
+#define VM_KERNEL_IO_BASE	0xf0000000
+#define VM_KERNEL_IO_SIZE	(VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_BASE)
 #endif
 
 #endif /* _ARM_ARM32_VMPARAM_H_ */