svn commit: r354619 - head/sys/amd64/amd64

[Andriy Gapon]

Author: avg
Date: Mon Nov 11 17:11:49 2019
New Revision: 354619
URL: https://svnweb.freebsd.org/changeset/base/354619

Log:
  db_nextframe/amd64: remove TRAP_INTERRUPT frame type
  
  Besides the confusing name, this type is effectively unused.
  In all cases where it could be set, the INTERRUPT type is set by the
  earlier code.  The conditions for TRAP_INTERRUPT are a subset of the
  conditions for INTERRUPT.
  
  Reviewed by:	kib, markj
  MFC after:	2 weeks
  Differential Revision: https://reviews.freebsd.org/D22305

Modified:
  head/sys/amd64/amd64/db_trace.c

Modified: head/sys/amd64/amd64/db_trace.c
==============================================================================
--- head/sys/amd64/amd64/db_trace.c	Mon Nov 11 16:59:49 2019	(r354618)
+++ head/sys/amd64/amd64/db_trace.c	Mon Nov 11 17:11:49 2019	(r354619)
@@ -123,7 +123,6 @@ db_frame(struct db_variable *vp, db_expr_t *valuep, in
 #define	TRAP		1
 #define	INTERRUPT	2
 #define	SYSCALL		3
-#define	TRAP_INTERRUPT	5
 
 static void db_nextframe(struct amd64_frame **, db_addr_t *, struct thread *);
 static void db_print_stack_entry(const char *, db_addr_t, void *);
@@ -218,13 +217,6 @@ db_nextframe(struct amd64_frame **fp, db_addr_t *ip, s
 		else if (strcmp(name, "Xint0x80_syscall") == 0)
 			frame_type = SYSCALL;
 #endif
-		/* XXX: These are interrupts with trap frames. */
-		else if (strcmp(name, "Xtimerint") == 0 ||
-		    strcmp(name, "Xcpustop") == 0 ||
-		    strcmp(name, "Xcpususpend") == 0 ||
-		    strcmp(name, "Xrendezvous") == 0 ||
-		    strcmp(name, "Xipi_intr_bitmap_handler") == 0)
-			frame_type = TRAP_INTERRUPT;
 	}
 
 	/*
@@ -256,7 +248,6 @@ db_nextframe(struct amd64_frame **fp, db_addr_t *ip, s
 			db_printf("--- syscall");
 			decode_syscall(tf->tf_rax, td);
 			break;
-		case TRAP_INTERRUPT:
 		case INTERRUPT:
 			db_printf("--- interrupt");
 			break;