Pull up following revision(s) (requested by skrll in ticket #1161):

	sys/arch/hppa/hppa/trap.c: revision 1.124
	sys/arch/hppa/hppa/trap.c: revision 1.125
	sys/arch/hppa/hppa/trap.c: revision 1.126
	sys/arch/hppa/hppa/trap.c: revision 1.127
	sys/arch/hppa/hppa/trap.c: revision 1.128

Fix the inverted logic around probe access vs probe access immediate
instructions.  This affected the probe
   <__canonicalize_funcptr_for_compare+76>:     probei,r (r20),3,r20
and manifested as tests/lib/libc/tls/t_tls_dynamic failures

Remove empty else clause.

Code style around probe instruction priviledge level.

Actually use the PROBE_PL macro with a bitfield that covers the
instruction's 'i' immediate or 'r' fields and mask the bottom two bits as
the {read,write}_access_allowed architecture functions would.

Remove a magic number with s/3/HPPA_PC_PRIV_MASK/

Whitespace

Author: MartinHusemann

sys/arch/hppa/hppa/trap.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.121 2022/09/02 23:48:10 thorpej Exp $	*/
+/*	$NetBSD: trap.c,v 1.121.4.1 2025/09/23 12:50:45 martin Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.121 2022/09/02 23:48:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.121.4.1 2025/09/23 12:50:45 martin Exp $");
 
 /* #define INTRDEBUG */
 /* #define TRAPDEBUG */
@@ -480,31 +480,34 @@ do {							\
 #define __PABITS(x, y)		__BITS(31 - (x), 31 - (y))
 #define __PABIT(x)		__BIT(31 - (x))
 
-#define LPA_MASK				 \
-     (                      __PABITS(0, 5)     | \
-                            __PABITS(18, 25))
-#define LPA					 \
-     (__SHIFTIN(1,          __PABITS(0, 5))    | \
-      __SHIFTIN(0x4d, __PABITS(18, 25)))
+#define LPA_MASK					  \
+     (				__PABITS(0, 5)		| \
+				__PABITS(18, 25))
+#define LPA						  \
+     (__SHIFTIN(1,		__PABITS(0, 5))		| \
+      __SHIFTIN(0x4d,		__PABITS(18, 25)))
 
 
-#define PROBE_ENCS	(0x46 | 0xc6 | 0x47 | 0xc7)
-#define PROBE_PL	__PABITS(14, 15)
-#define PROBE_IMMED	__PABIT(18)
-#define PROBE_RW	__PABIT(25)
+#define PROBE_ENCS		(0x46 | 0xc6 | 0x47 | 0xc7)
+#define PROBE_PL		__PABITS(11, 15)
+#define PROBE_IMMED		__PABIT(18)
+#define PROBE_RW		__PABIT(25)
 
-#define PROBE_MASK                               \
-    ((                      __PABITS(0, 5)     | \
-                            __PABITS(18, 25)   | \
-                            __PABIT(26))       ^ \
+#define PROBE_MASK					  \
+    ((				__PABITS(0, 5)		| \
+				__PABITS(18, 25)	| \
+				__PABIT(26))		^ \
      (PROBE_IMMED | PROBE_RW))
 
-#define PROBE					 \
-    ((__SHIFTIN(1,          __PABITS(0, 5))    | \
-      __SHIFTIN(PROBE_ENCS, __PABITS(18, 25))  | \
-      __SHIFTIN(0,          __PABIT(26)))      ^ \
+#define PROBE						  \
+    ((__SHIFTIN(1,		__PABITS(0, 5))		| \
+      __SHIFTIN(PROBE_ENCS,	__PABITS(18, 25))	| \
+      __SHIFTIN(0,		__PABIT(26)))		^ \
      (PROBE_IMMED | PROBE_RW))
 
+#define PLMASK			__BITS(1, 0)
+
+
 /* for hppa64 */
 CTASSERT(sizeof(register_t) == sizeof(u_int));
 size_t hppa_regmap[] = {
@@ -931,16 +934,17 @@ trap(int type, struct trapframe *frame)
 			frame->tf_ipsw |= PSW_N;
 		} else if ((opcode & PROBE_MASK) == PROBE) {
 			u_int pl;
-			if ((opcode & PROBE_IMMED) == 0) {
-				pl = __SHIFTOUT(opcode, __PABITS(14, 15));
+			if ((opcode & PROBE_IMMED) != 0) {
+				pl = __SHIFTOUT(opcode, PROBE_PL) & PLMASK;
 			} else {
 				const u_int plreg =
-				    __SHIFTOUT(opcode, __PABITS(11, 15));
-				pl = tf_getregno(frame, plreg);
+				    __SHIFTOUT(opcode, PROBE_PL);
+				pl = tf_getregno(frame, plreg) & PLMASK;
 			}
+
 			bool ok = true;
 			if ((user && space == HPPA_SID_KERNEL) ||
-			    (frame->tf_iioq_head & 3) != pl ||
+			    (frame->tf_iioq_head & HPPA_PC_PRIV_MASK) != pl ||
 			    (user && va >= VM_MAXUSER_ADDRESS)) {
 				ok = false;
 			} else {
@@ -964,7 +968,6 @@ trap(int type, struct trapframe *frame)
 				tf_setregno(frame, regno, 0);
 				frame->tf_ipsw |= PSW_N;
 			}
-		} else {
 		}
 		break;