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

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

details:   https://anonhg.NetBSD.org/src/rev/b29d58b26b29
branches:  netbsd-6
changeset: 777068:b29d58b26b29
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jul 13 08:25:44 2016 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #1360):
        sys/arch/hppa/include/db_machdep.h: revision 1.13
PR port-hppa/50642: src/sys/arch/hppa/include/db_machdep.h:118: bad if test ?
Correct the test for rfir and add one for rfi while I'm here.

diffstat:

 sys/arch/hppa/include/db_machdep.h |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r c316de5b5546 -r b29d58b26b29 sys/arch/hppa/include/db_machdep.h
--- a/sys/arch/hppa/include/db_machdep.h        Wed Jul 13 08:20:45 2016 +0000
+++ b/sys/arch/hppa/include/db_machdep.h        Wed Jul 13 08:25:44 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_machdep.h,v 1.12 2012/01/18 09:35:48 skrll Exp $    */
+/*     $NetBSD: db_machdep.h,v 1.12.2.1 2016/07/13 08:25:44 snj Exp $  */
 
 /*     $OpenBSD: db_machdep.h,v 1.5 2001/02/16 19:20:13 mickey Exp $   */
 
@@ -115,7 +115,8 @@
               (ins & 0xfc000000) == 0xe0000000;
 }
 static __inline int inst_trap_return(u_int ins)        {
-       return (ins & 0xfc001fc0) == 0x00000ca0;
+       return (ins & 0xfc001fe0) == 0x00000c00 ||
+              (ins & 0xfc001fe0) == 0x00000ca0;
 }
 
 #define db_clear_single_step(r)        ((r)->tf_ipsw &= ~PSW_R)