Module Name:    src
Committed By:   rin
Date:           Mon Sep 23 10:43:33 UTC 2024

Modified Files:
        src/sys/arch/virt68k/virt68k: trap.c

Log Message:
virt68k: trap: Fix ksi_code for T_TRAP{,15}|T_USER

Fix ATF failures for lib/libc/sys/t_ptrace_wait*:{,set}step*.

XXX
It would be really nice if we can factor out copy-paste b/w
m68k ports...


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/virt68k/virt68k/trap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/virt68k/virt68k/trap.c
diff -u src/sys/arch/virt68k/virt68k/trap.c:1.3 src/sys/arch/virt68k/virt68k/trap.c:1.4
--- src/sys/arch/virt68k/virt68k/trap.c:1.3	Sun Feb 25 14:35:31 2024
+++ src/sys/arch/virt68k/virt68k/trap.c	Mon Sep 23 10:43:33 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.3 2024/02/25 14:35:31 mlelstv Exp $	*/
+/*	$NetBSD: trap.c,v 1.4 2024/09/23 10:43:33 rin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.3 2024/02/25 14:35:31 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.4 2024/09/23 10:43:33 rin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
@@ -505,6 +505,10 @@ trap(struct frame *fp, int type, unsigne
 	case T_TRAP15|T_USER:	/* SUN user trace trap */
 		fp->f_sr &= ~PSL_T;
 		ksi.ksi_signo = SIGTRAP;
+		if (type == (T_TRAP15|T_USER))
+			ksi.ksi_code = TRAP_BRKPT;
+		else
+			ksi.ksi_code = TRAP_TRACE;
 		break;
 
 	case T_ASTFLT:		/* system async trap, cannot happen */

Reply via email to