svn commit: r326318 - head/sys/arm64/arm64

[Andrew Turner]

Author: andrew
Date: Tue Nov 28 16:26:56 2017
New Revision: 326318
URL: https://svnweb.freebsd.org/changeset/base/326318

Log:
  Fix the direction we move the instruction to retuirn to after exiting the
  kernel debugger. We should skip the breakpoint instruction, not execute the
  instruction before it.
  
  Pointy-hat to:	andrew
  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 16:25:46 2017	(r326317)
+++ head/sys/arm64/arm64/trap.c	Tue Nov 28 16:26:56 2017	(r326318)
@@ -325,7 +325,7 @@ do_el1h_sync(struct thread *td, struct trapframe *fram
 #endif
 		kdb_trap(exception, 0,
 		    (td->td_frame != NULL) ? td->td_frame : frame);
-		frame->tf_elr -= 4;
+		frame->tf_elr += 4;
 		break;
 	case EXCP_WATCHPT_EL1:
 	case EXCP_SOFTSTP_EL1: