Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/arm Make sure to advance the PC after emulating...



details:   https://anonhg.NetBSD.org/src/rev/ced593b14c39
branches:  trunk
changeset: 780910:ced593b14c39
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Aug 11 07:05:57 2012 +0000

description:
Make sure to advance the PC after emulating an instruction.

diffstat:

 sys/arch/arm/arm/undefined.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r f565143af63a -r ced593b14c39 sys/arch/arm/arm/undefined.c
--- a/sys/arch/arm/arm/undefined.c      Sat Aug 11 03:19:48 2012 +0000
+++ b/sys/arch/arm/arm/undefined.c      Sat Aug 11 07:05:57 2012 +0000
@@ -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 @@
         */
        if ((insn & 0xffff0fff) == 0xee1d0f70) {
                *regp = (uintptr_t)l->l_private;
+               frame->tf_pc += INSN_SIZE;
                cp15_ev.ev_count++;
                return 0;
        }



Home | Main Index | Thread Index | Old Index