[src/trunk]: src/sys/arch/arm/arm Only fetch savecode if scp is word aligned ...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dea914ea27e8
branches:  trunk
changeset: 781549:dea914ea27e8
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 14 03:58:47 2012 +0000

description:
Only fetch savecode if scp is word aligned (prevents recursive ddb faults).

diffstat:

 sys/arch/arm/arm/db_trace.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r a8a24e31a1c4 -r dea914ea27e8 sys/arch/arm/arm/db_trace.c
--- a/sys/arch/arm/arm/db_trace.c       Fri Sep 14 03:52:50 2012 +0000
+++ b/sys/arch/arm/arm/db_trace.c       Fri Sep 14 03:58:47 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_trace.c,v 1.24 2012/02/17 16:26:51 christos Exp $   */
+/*     $NetBSD: db_trace.c,v 1.25 2012/09/14 03:58:47 matt Exp $       */
 
 /* 
  * Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.24 2012/02/17 16:26:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.25 2012/09/14 03:58:47 matt Exp $");
 
 #include <sys/proc.h>
 #include <arm/armreg.h>
@@ -193,7 +193,11 @@
                db_read_bytes((db_addr_t)((u_int32_t *)scp + scp_offset),
                    sizeof(savecode), (void *)&savecode);
 #else
-               savecode = ((u_int32_t *)scp)[scp_offset];
+               if ((scp & 3) == 0) {
+                       savecode = ((u_int32_t *)scp)[scp_offset];
+               } else {
+                       savecode = 0;
+               }
 #endif
                if ((savecode & 0x0e100000) == 0x08000000) {
                        /* Looks like an STM */