 @@ -1,14 +1,14 @@
-/*	$NetBSD: sljit_machdep.h,v 1.2 2018/12/02 20:54:44 alnsn Exp $	*/
+/*	$NetBSD: sljit_machdep.h,v 1.2.6.1 2024/04/18 15:24:20 martin Exp $	*/
 /*-
  * Copyright (c) 2014 Alexander Nasonov.
  * 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.
 @@ -32,22 +32,27 @@
 #include <sys/cdefs.h>
 #ifdef _KERNEL
 #include <machine/types.h>
 #include <aarch64/cpufunc.h>
 #else
 #include <stddef.h>
 #include <stdint.h>
 #include <aarch64/sysarch.h>
 #endif
 #define SLJIT_CONFIG_ARM_64 1
-#ifdef _KERNEL
+#ifdef _HARDKERNEL
 /*
  * XXX Currently sys/rump/include/machine/cpu.h doesn't have
  * ci_cpufuncs for cpu_icache_sync_range, so we do this only for
  * non-rump kernels for now.
  */
 #define SLJIT_CACHE_FLUSH(from, to) \
 	cpu_icache_sync_range((vaddr_t)(from), (vsize_t)((to) - (from)))
 #else
 #define SLJIT_CACHE_FLUSH(from, to) \
 	(void)__builtin___clear_cache((char *)(from), (char *)(to))
 #endif
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sljitNativeARM_64.c,v 1.4 2019/01/20 23:14:16 alnsn Exp $	*/
+/*	$NetBSD: sljitNativeARM_64.c,v 1.4.4.1 2024/04/18 15:24:21 martin Exp $	*/
 /*
  *    Stack-less Just-In-Time compiler
+ *
  *    Copyright Zoltan Herczeg (hzmester@freemail.hu). 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
 @@ -1069,27 +1069,28 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
 	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+{
 	sljit_s32 i, tmp, offs, prev, saved_regs_size;
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size));
 	set_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size);
 	saved_regs_size = GET_SAVED_REGISTERS_SIZE(scratches, saveds, 0);
 	local_size += saved_regs_size + SLJIT_LOCALS_OFFSET;
 	local_size = (local_size + 15) & ~0xf;
 	compiler->local_size = local_size;
-	if (local_size <= (63 * sizeof(sljit_sw))) {
+	SLJIT_ASSERT(local_size >= 0);
 	if ((size_t)local_size <= (63 * sizeof(sljit_sw))) {
 		FAIL_IF(push_inst(compiler, STP_PRE | 29 | RT2(TMP_LR)
 			| RN(TMP_SP) | ((-(local_size >> 3) & 0x7f) << 15)));
 		FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(TMP_SP) | (0 << 10)));
 		offs = (local_size - saved_regs_size) << (15 - 3);
 	} else {
 		offs = 0 << 15;
 		if (saved_regs_size & 0x8) {
 			offs = 1 << 15;
 			saved_regs_size += sizeof(sljit_sw);
+		}
 		local_size -= saved_regs_size + SLJIT_LOCALS_OFFSET;
 		if (saved_regs_size > 0)
 			FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10)));
 @@ -1119,27 +1120,28 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
 				continue;
+			}
 			FAIL_IF(push_inst(compiler, STRI | RT(i) | RN(TMP_SP) | (offs >> 5)));
 			offs += 1 << 15;
 			continue;
+		}
 		FAIL_IF(push_inst(compiler, STP | RT(prev) | RT2(i) | RN(TMP_SP) | offs));
 		offs += 2 << 15;
 		prev = -1;
+	}
 	SLJIT_ASSERT(prev == -1);
-	if (compiler->local_size > (63 * sizeof(sljit_sw))) {
+	SLJIT_ASSERT(compiler->local_size >= 0);
 	if ((size_t)compiler->local_size > (63 * sizeof(sljit_sw))) {
 		/* The local_size is already adjusted by the saved registers. */
 		if (local_size > 0xfff) {
 			FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | ((local_size >> 12) << 10) | (1 << 22)));
 			local_size &= 0xfff;
+		}
 		if (local_size)
 			FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | (local_size << 10)));
 		FAIL_IF(push_inst(compiler, STP_PRE | 29 | RT2(TMP_LR)
 			| RN(TMP_SP) | ((-(16 >> 3) & 0x7f) << 15)));
 		FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(TMP_SP) | (0 << 10)));
+	}
 	if (args >= 1)
 @@ -1169,27 +1171,28 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return(struct sljit_compiler *compiler, sljit_s32 op, sljit_s32 src, sljit_sw srcw)
+{
 	sljit_s32 local_size;
 	sljit_s32 i, tmp, offs, prev, saved_regs_size;
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_return(compiler, op, src, srcw));
 	FAIL_IF(emit_mov_before_return(compiler, op, src, srcw));
 	local_size = compiler->local_size;
 	saved_regs_size = GET_SAVED_REGISTERS_SIZE(compiler->scratches, compiler->saveds, 0);
-	if (local_size <= (63 * sizeof(sljit_sw)))
+	SLJIT_ASSERT(local_size >= 0);
 	if ((size_t)local_size <= (63 * sizeof(sljit_sw)))
 		offs = (local_size - saved_regs_size) << (15 - 3);
 	else {
 		FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR)
 			| RN(TMP_SP) | (((16 >> 3) & 0x7f) << 15)));
 		offs = 0 << 15;
 		if (saved_regs_size & 0x8) {
 			offs = 1 << 15;
 			saved_regs_size += sizeof(sljit_sw);
+		}
 		local_size -= saved_regs_size + SLJIT_LOCALS_OFFSET;
 		if (local_size > 0xfff) {
 			FAIL_IF(push_inst(compiler, ADDI | RD(TMP_SP) | RN(TMP_SP) | ((local_size >> 12) << 10) | (1 << 22)));
 			local_size &= 0xfff;
 @@ -1222,27 +1225,28 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
 				continue;
+			}
 			FAIL_IF(push_inst(compiler, LDRI | RT(i) | RN(TMP_SP) | (offs >> 5)));
 			offs += 1 << 15;
 			continue;
+		}
 		FAIL_IF(push_inst(compiler, LDP | RT(prev) | RT2(i) | RN(TMP_SP) | offs));
 		offs += 2 << 15;
 		prev = -1;
+	}
 	SLJIT_ASSERT(prev == -1);
-	if (compiler->local_size <= (63 * sizeof(sljit_sw))) {
+	SLJIT_ASSERT(compiler->local_size >= 0);
 	if ((size_t)compiler->local_size <= (63 * sizeof(sljit_sw))) {
 		FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR)
 			| RN(TMP_SP) | (((local_size >> 3) & 0x7f) << 15)));
 	} else if (saved_regs_size > 0) {
 		FAIL_IF(push_inst(compiler, ADDI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10)));
+	}
 	FAIL_IF(push_inst(compiler, RET | RN(TMP_LR)));
 	return SLJIT_SUCCESS;
+}
 /* --------------------------------------------------------------------- */
 /*  Operators                                                            */
 /* --------------------------------------------------------------------- */

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.222.2.1 2019/09/01 13:00:37 martin Exp $
+#	$NetBSD: Makefile,v 1.222.2.2 2024/04/18 15:24:20 martin Exp $
 .include <bsd.own.mk>
 # For all platforms
 # Modules for compatability with earlier versions of NetBSD
 SUBDIR+=	compat_util
 SUBDIR+=	compat_43   compat_sysctl_09_43
 SUBDIR+=	compat_09   compat_10   compat_12   compat_13   compat_14
 SUBDIR+=	compat_16   compat_20   compat_30   compat_40   compat_50
 SUBDIR+=	compat_60   compat_70   compat_80
 @@ -220,35 +220,29 @@ SUBDIR+=	tprof_x86
 SUBDIR+=	vmt
 .endif
 .if ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=	nvmm
 .endif
 .if ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=	ubsec		# Builds on architectures with PCI bus
 .endif
 .if ${MKSLJIT} != "no"
 # No modules for 32-bit arm, mips and powerpc yet.
 .if ${MACHINE_ARCH} == "aarch64" || \
     ${MACHINE_ARCH} == "i386"    || \
     ${MACHINE_ARCH} == "sparc"   || \
     ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=	bpfjit
 SUBDIR+=	sljit
 .endif
 .endif
+#
 # ACPI modules
+#
 .if ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "ia64" || \
     ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=	acpiverbose
 .endif
 .if ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=	acpiacad

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.own.mk,v 1.1149.2.6 2021/02/04 19:05:00 martin Exp $
+#	$NetBSD: bsd.own.mk,v 1.1149.2.7 2024/04/18 15:24:20 martin Exp $
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
 .include <${BSD_MK_COMPAT_FILE}>
 .endif
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
 MAKECONF?=	/etc/mk.conf
 .-include "${MAKECONF}"
+#
 @@ -1159,26 +1159,45 @@ EXTERNAL_MESALIB_DIR?=	MesaLib.old
 .elif ${HAVE_MESA_VER} == "18"
 EXTERNAL_MESALIB_DIR?=	MesaLib
 .endif
 # Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18
 # XXX This knows that MKX11=no is default below, but would
 # require splitting the below loop in two parts.
 .if ${MKX11:Uno} != "no" && ${HAVE_MESA_VER} == "18"
 MKLLVMRT.amd64=		yes
 MKLLVMRT.i386=		yes
 MKLLVMRT.aarch64=	yes
 .endif
 # Just-in-time compiler for bpf, npf acceleration
 MKSLJIT.aarch64=	yes
 MKSLJIT.i386=		yes
 MKSLJIT.sparc=		yes
 #MKSLJIT.sparc64=	yes	# not suppored in sljit (yet?)
 MKSLJIT.x86_64=		yes
 #MKSLJIT.powerpc=	yes	# XXX
 #MKSLJIT.powerpc64=	yes	# XXX
 #MKSLJIT.mipsel=	yes	# XXX
 #MKSLJIT.mipseb=	yes	# XXX
 #MKSLJIT.mips64el=	yes	# XXX
 #MKSLJIT.mips64eb=	yes	# XXX
 #MKSLJIT.riscv32=	yes	# not until we update sljit
 #MKSLJIT.riscv64=	yes	# not until we update sljit
 # compat with old names
 MKDEBUGKERNEL?=${MKKDEBUG:Uno}
 MKDEBUGTOOLS?=${MKTOOLSDEBUG:Uno}
+#
 # MK* options which default to "no".  Note that MKZFS has a different
 # default for some platforms, see above.  Please keep alphabetically
 # sorted with at most one letter per line.
+#
 _MKVARS.no= \
 	MKARZERO \
 	MKBSDGREP \
 	MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCTF \
 	MKDEBUG MKDEBUGLIB MKDTRACE \
 	MKEXTSRC \
 	MKFIRMWARE \
 	MKGROFFHTMLDOC \
 @@ -1188,32 +1207,26 @@ _MKVARS.no= \
 	MKNOUVEAUFIRMWARE MKNSD \
 	MKOBJDIRS \
 	MKPCC MKPICINSTALL MKPIGZGZIP \
 	MKRADEONFIRMWARE MKREPRO \
 	MKSLJIT MKSOFTFLOAT MKSTRIPIDENT \
 	MKTEGRAFIRMWARE MKTPM \
 	MKUNPRIVED MKUPDATE \
 	MKX11 MKX11MOTIF MKXORG_SERVER \
 	MKZFS
 .for var in ${_MKVARS.no}
 ${var}?=	${${var}.${MACHINE_ARCH}:U${${var}.${MACHINE}:Uno}}
 .endfor
 .if ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "x86_64" || \
     ${MACHINE_ARCH} == "sparc"
 MKSLJIT=	yes
 .endif
+#
 # Which platforms build the xorg-server drivers (as opposed
 # to just Xnest and Xvfb.)
+#
 .if ${MACHINE} == "alpha"	|| \
     ${MACHINE} == "amd64"	|| \
     ${MACHINE} == "amiga"	|| \
     ${MACHINE} == "bebox"	|| \
     ${MACHINE} == "cats"	|| \
     ${MACHINE} == "dreamcast"	|| \
     ${MACHINE} == "ews4800mips"	|| \
     ${MACHINE} == "evbarm"	|| \
     ${MACHINE} == "evbmips"	|| \