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

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

details:   https://anonhg.NetBSD.org/src/rev/17d351e3eb80
branches:  netbsd-6
changeset: 774032:17d351e3eb80
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Apr 23 16:51:51 2012 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #196):
        sys/arch/hppa/hppa/trap.c: revision 1.101
Pass the trap address in ksi_addr without privilege bits.
Previously GDB would get confused by the trap address given when hitting
the _rtld_debug_state breakpoint.

diffstat:

 sys/arch/hppa/hppa/trap.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 7fe4be4acbdb -r 17d351e3eb80 sys/arch/hppa/hppa/trap.c
--- a/sys/arch/hppa/hppa/trap.c Mon Apr 23 16:48:52 2012 +0000
+++ b/sys/arch/hppa/hppa/trap.c Mon Apr 23 16:51:51 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.97.2.1 2012/03/17 17:33:08 bouyer Exp $     */
+/*     $NetBSD: trap.c,v 1.97.2.2 2012/04/23 16:51:51 riz Exp $        */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.97.2.1 2012/03/17 17:33:08 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.97.2.2 2012/04/23 16:51:51 riz Exp $");
 
 /* #define INTRDEBUG */
 /* #define TRAPDEBUG */
@@ -702,7 +702,7 @@
                ksi.ksi_signo = SIGTRAP;
                ksi.ksi_code = TRAP_TRACE;
                ksi.ksi_trap = trapnum;
-               ksi.ksi_addr = (void *)frame->tf_iioq_head;
+               ksi.ksi_addr = (void *)(frame->tf_iioq_head & ~HPPA_PC_PRIV_MASK);
 #ifdef PTRACE
                ss_clear_breakpoints(l);
                if (opcode == SSBREAKPOINT)
@@ -710,7 +710,6 @@
 #endif
                /* pass to user debugger */
                trapsignal(l, &ksi);
- 
                break;
 
 #ifdef PTRACE
@@ -721,7 +720,7 @@
                ksi.ksi_signo = SIGTRAP;
                ksi.ksi_code = TRAP_TRACE;
                ksi.ksi_trap = trapnum;
-               ksi.ksi_addr = (void *)frame->tf_iioq_head;
+               ksi.ksi_addr = (void *)(frame->tf_iioq_head & ~HPPA_PC_PRIV_MASK);
 
                 /* pass to user debugger */
                trapsignal(l, &ksi);