Author: andrew
Date: Tue Nov 28 11:04:47 2017
New Revision: 326312
URL: https://svnweb.freebsd.org/changeset/base/326312
Log:
When we exit the kernel debugger having entered because of a breakpoint
instruction we need to jump over the instruction. Without this we will
execute the same instruction again and enter into the debugger again.
PR: 223917
Reported by: emaste
MFC after: 1 week
Sponsored by: DARPA, AFRL
Modified:
head/sys/arm64/arm64/trap.c
Modified: head/sys/arm64/arm64/trap.c
==============================================================================
--- head/sys/arm64/arm64/trap.c Tue Nov 28 09:34:43 2017 (r326311)
+++ head/sys/arm64/arm64/trap.c Tue Nov 28 11:04:47 2017 (r326312)
@@ -323,7 +323,10 @@ do_el1h_sync(struct thread *td, struct trapframe *fram
break;
}
#endif
- /* FALLTHROUGH */
+ kdb_trap(exception, 0,
+ (td->td_frame != NULL) ? td->td_frame : frame);
+ frame->tf_elr -= 4;
+ break;
case EXCP_WATCHPT_EL1:
case EXCP_SOFTSTP_EL1:
#ifdef KDB
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
