Use [XNF]IP_ADDR constants rather than their numeric values.

4 files changed, 12 insertions, 13 deletions

diff --git a/sys/arch/m88k/m88k/db_trace.c b/sys/arch/m88k/m88k/db_trace.c
index f763e040284..532e74ed1a3 100644
--- a/sys/arch/m88k/m88k/db_trace.c
+++ b/sys/arch/m88k/m88k/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.3 2004/09/30 21:48:56 miod Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.4 2005/04/30 16:44:08 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -813,13 +813,13 @@ db_stack_trace_cmd2(db_regs_t *regs, int (*pr)(const char *, ...))
 	/* use sxip if valid, otherwise try snip or sfip */
 #ifdef M88110
 	if (CPU_IS88110) {
-		where = regs->exip & ~3;
+		where = regs->exip & XIP_ADDR;
 	}
 #endif
 #ifdef M88100
 	if (CPU_IS88100) {
 		where = ((regs->sxip & 2) ? regs->sxip :
-			 ((regs->snip & 2) ? regs->snip : regs->sfip)) & ~3;
+			 ((regs->snip & 2) ? regs->snip : regs->sfip)) & XIP_ADDR;
 	}
 #endif
 	stack = regs->r[31];
diff --git a/sys/arch/m88k/m88k/m88k_machdep.c b/sys/arch/m88k/m88k/m88k_machdep.c
index d8f89677efb..931b5026d92 100644
--- a/sys/arch/m88k/m88k/m88k_machdep.c
+++ b/sys/arch/m88k/m88k/m88k_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88k_machdep.c,v 1.2 2004/09/30 21:48:56 miod Exp $	*/
+/*	$OpenBSD: m88k_machdep.c,v 1.3 2005/04/30 16:44:08 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -191,13 +191,13 @@ setregs(p, pack, stack, retval)
 	 */
 #ifdef M88110
 	if (CPU_IS88110) {
-		tf->tf_exip = pack->ep_entry & ~3;
+		tf->tf_exip = pack->ep_entry & XIP_ADDR;
 	}
 #endif
 #ifdef M88100
 	if (CPU_IS88100) {
-		tf->tf_snip = pack->ep_entry & ~3;
-		tf->tf_sfip = (pack->ep_entry & ~3) | FIP_V;
+		tf->tf_snip = pack->ep_entry & NIP_ADDR;
+		tf->tf_sfip = (pack->ep_entry & FIP_ADDR) | FIP_V;
 	}
 #endif
 	tf->tf_r[2] = stack;
diff --git a/sys/arch/m88k/m88k/sig_machdep.c b/sys/arch/m88k/m88k/sig_machdep.c
index 19088953577..1b460a1b2bd 100644
--- a/sys/arch/m88k/m88k/sig_machdep.c
+++ b/sys/arch/m88k/m88k/sig_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sig_machdep.c,v 1.2 2004/09/30 21:48:56 miod Exp $	*/
+/*	$OpenBSD: sig_machdep.c,v 1.3 2005/04/30 16:44:08 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -166,14 +166,13 @@ sendsig(sig_t catcher, int sig, int mask, unsigned long code, int type,
 	addr = p->p_sigcode;
 #ifdef M88100
 	if (CPU_IS88100) {
-		tf->tf_snip = (addr & ~3) | NIP_V;
+		tf->tf_snip = (addr & NIP_ADDR) | NIP_V;
 		tf->tf_sfip = (tf->tf_snip + 4) | FIP_V;
 	}
 #endif
 #ifdef M88110
 	if (CPU_IS88110) {
-		tf->tf_exip = (addr & ~3);
-		tf->tf_enip = (tf->tf_exip + 4);
+		tf->tf_exip = (addr & XIP_ADDR);
 	}
 #endif
 	tf->tf_r[31] = (unsigned)fp;
diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c
index ee27b2afa45..0e05ec143fc 100644
--- a/sys/arch/mvme88k/ddb/db_interface.c
+++ b/sys/arch/mvme88k/ddb/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.43 2004/09/30 21:48:56 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.44 2005/04/30 16:44:11 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -241,7 +241,7 @@ m88k_db_print_frame(addr, have_addr, count, modif)
 	db_printf("R30-31: 0x%08x  0x%08x\n", R(30), R(31));
 
 	db_printf("%cxip: 0x%08x ",
-	    CPU_IS88110 ? 'e' : 's', s->tf_sxip & ~3);
+	    CPU_IS88110 ? 'e' : 's', s->tf_sxip & XIP_ADDR);
 	db_find_xtrn_sym_and_offset((db_addr_t)IPMASK(s->tf_sxip),
 	    &name, &offset);
 	if (name != NULL && (unsigned)offset <= db_maxoff)