Module Name: src Committed By: skrll Date: Mon Jan 11 08:14:08 UTC 2016
Modified Files: src/sys/arch/hppa/include: db_machdep.h Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/db_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/hppa/include/db_machdep.h diff -u src/sys/arch/hppa/include/db_machdep.h:1.12 src/sys/arch/hppa/include/db_machdep.h:1.13 --- src/sys/arch/hppa/include/db_machdep.h:1.12 Wed Jan 18 09:35:48 2012 +++ src/sys/arch/hppa/include/db_machdep.h Mon Jan 11 08:14:08 2016 @@ -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.13 2016/01/11 08:14:08 skrll Exp $ */ /* $OpenBSD: db_machdep.h,v 1.5 2001/02/16 19:20:13 mickey Exp $ */ @@ -115,7 +115,8 @@ static __inline int inst_return(u_int in (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)