[src/netbsd-6]: src/sys/arch/sparc64/sparc64 Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/cfe8548f5056
branches:  netbsd-6
changeset: 774038:cfe8548f5056
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Apr 24 19:44:16 2012 +0000

description:
Pull up following revision(s) (requested by martin in ticket #199):
        sys/arch/sparc64/sparc64/trap.c: revision 1.175
Report faulting data address with SIGBUS (instead of the faulting instruction)

diffstat:

 sys/arch/sparc64/sparc64/trap.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 44735b4ebf19 -r cfe8548f5056 sys/arch/sparc64/sparc64/trap.c
--- a/sys/arch/sparc64/sparc64/trap.c   Tue Apr 24 19:38:35 2012 +0000
+++ b/sys/arch/sparc64/sparc64/trap.c   Tue Apr 24 19:44:16 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.168.8.1 2012/03/21 16:10:21 riz Exp $ */
+/*     $NetBSD: trap.c,v 1.168.8.2 2012/04/24 19:44:16 riz Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.168.8.1 2012/03/21 16:10:21 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.168.8.2 2012/04/24 19:44:16 riz Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -732,7 +732,6 @@
                       l->l_proc->p_pid, l->l_lid, l->l_proc->p_comm, fmt64(dsfsr), fmt64(dsfar),
                       fmt64(isfsr), pc);
 #endif
-               }
                
 #if defined(DDB) && defined(DEBUG)
                if (trapdebug & TDB_STOPSIG) {
@@ -749,7 +748,8 @@
                sig = SIGBUS;
                ksi.ksi_trap = type;
                ksi.ksi_code = BUS_ADRALN;
-               ksi.ksi_addr = (void *)pc;
+               ksi.ksi_addr = (void*)dsfar;
+               }
                break;
 
        case T_FP_IEEE_754:
@@ -1573,7 +1573,7 @@
                ksi.ksi_signo = SIGBUS;
                ksi.ksi_code = BUS_OBJERR;
                ksi.ksi_trap = type;
-               ksi.ksi_addr = (void *)pc;
+               ksi.ksi_addr = (void *)afva;
                trapsignal(l, &ksi);
        }