Module Name: src
Committed By: matt
Date: Sat Aug 11 07:05:57 UTC 2012
Modified Files:
src/sys/arch/arm/arm: undefined.c
Log Message:
Make sure to advance the PC after emulating an instruction.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arm/arm/undefined.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/arm/arm/undefined.c
diff -u src/sys/arch/arm/arm/undefined.c:1.44 src/sys/arch/arm/arm/undefined.c:1.45
--- src/sys/arch/arm/arm/undefined.c:1.44 Thu Jul 12 17:20:20 2012
+++ src/sys/arch/arm/arm/undefined.c Sat Aug 11 07:05:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: undefined.c,v 1.44 2012/07/12 17:20:20 matt Exp $ */
+/* $NetBSD: undefined.c,v 1.45 2012/08/11 07:05:57 matt Exp $ */
/*
* Copyright (c) 2001 Ben Harris.
@@ -54,7 +54,7 @@
#include <sys/kgdb.h>
#endif
-__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.44 2012/07/12 17:20:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.45 2012/08/11 07:05:57 matt Exp $");
#include <sys/malloc.h>
#include <sys/queue.h>
@@ -155,6 +155,7 @@ cp15_trapper(u_int addr, u_int insn, str
*/
if ((insn & 0xffff0fff) == 0xee1d0f70) {
*regp = (uintptr_t)l->l_private;
+ frame->tf_pc += INSN_SIZE;
cp15_ev.ev_count++;
return 0;
}
