 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_machdep.c,v 1.5 2014/01/11 17:11:50 christos Exp $	*/
+/*	$NetBSD: db_machdep.c,v 1.6 2017/08/15 06:39:37 maxv Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -17,27 +17,27 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.5 2014/01/11 17:11:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.6 2017/08/15 06:39:37 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #ifndef _KERNEL
 #include <stdbool.h>
 #endif
 #include <machine/frame.h>
 #include <machine/trap.h>
 #include <machine/intrdefs.h>
 #include <machine/cpu.h>
 @@ -121,81 +121,52 @@ db_frame_info(long *frame, db_addr_t cal
 	db_symbol_values(sym, &name, NULL);
 	if (sym == (db_sym_t)0)
 		return (db_sym_t)0;
 	*is_trap = NONE;
 	narg = MAXNARG;
 	if (INKERNEL((int)frame) && name) {
 		/*
 		 * XXX traps should be based off of the Xtrap*
 		 * locations rather than on trap, since some traps
 		 * (e.g., npxdna) don't go through trap()
 		 */
 #ifdef __ELF__
 		if (!strcmp(name, "trap_tss")) {
 			*is_trap = TRAP_TSS;
 			narg = 0;
 		} else if (!strcmp(name, "trap")) {
 			*is_trap = TRAP;
 			narg = 0;
 		} else if (!strcmp(name, "syscall")) {
 			*is_trap = SYSCALL;
 			narg = 0;
 		} else if (name[0] == 'X') {
 			if (!strncmp(name, "Xintr", 5) ||
 			    !strncmp(name, "Xresume", 7) ||
 			    !strncmp(name, "Xstray", 6) ||
 			    !strncmp(name, "Xhold", 5) ||
 			    !strncmp(name, "Xrecurse", 8) ||
 			    !strcmp(name, "Xdoreti")) {
 				*is_trap = INTERRUPT;
 				narg = 0;
 			} else if (!strcmp(name, "Xsoftintr")) {
 				*is_trap = SOFTINTR;
 				narg = 0;
 			} else if (!strncmp(name, "Xtss_", 5)) {
 				*is_trap = INTERRUPT_TSS;
 				narg = 0;
+			}
+		}
 #else
 		if (!strcmp(name, "_trap_tss")) {
 			*is_trap = TRAP_TSS;
 			narg = 0;
 		} else if (!strcmp(name, "_trap")) {
 			*is_trap = TRAP;
 			narg = 0;
 		} else if (!strcmp(name, "_syscall")) {
 			*is_trap = SYSCALL;
 			narg = 0;
 		} else if (name[0] == '_' && name[1] == 'X') {
 			if (!strncmp(name, "_Xintr", 6) ||
 			    !strncmp(name, "_Xresume", 8) ||
 			    !strncmp(name, "_Xstray", 7) ||
 			    !strncmp(name, "_Xhold", 6) ||
 			    !strncmp(name, "_Xrecurse", 9) ||
 			    !strcmp(name, "_Xdoreti")) {
 				*is_trap = INTERRUPT;
 				narg = 0;
 			} else if (!strcmp(name, "_Xsoftintr")) {
 				*is_trap = SOFTINTR;
 				narg = 0;
 			} else if (!strncmp(name, "_Xtss_", 6)) {
 				*is_trap = INTERRUPT_TSS;
 				narg = 0;
 #endif /* __ELF__ */
+	}
 	if (offp != NULL)
 		*offp = offset;
 	if (nargp != NULL)
 		*nargp = narg;
 	if (namep != NULL)
 		*namep = name;
 	return sym;
+}
 /*
  * Figure out the next frame up in the call stack.