1 << 31 cleanup. Eitan Adler pointed out that there has been a

resurrection of the bad idiom in the tree.
sufficient review by miod, kettenis, tedu

4 files changed, 15 insertions, 15 deletions

diff --git a/sys/arch/sparc/dev/rfx.c b/sys/arch/sparc/dev/rfx.c
index 0e7ac912003..94703fbe316 100644
--- a/sys/arch/sparc/dev/rfx.c
+++ b/sys/arch/sparc/dev/rfx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rfx.c,v 1.15 2013/10/20 20:07:26 miod Exp $	*/
+/*	$OpenBSD: rfx.c,v 1.16 2013/11/26 20:33:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -490,8 +490,8 @@ rfx_initialize(struct rfx_softc *sc, struct rfx_config *cf)
 			value = letoh32(offset);
 		}
 
-		if (offset & (1 << 31)) {
-			offset = (offset & ~(1 << 31)) - RFX_RAMDAC_ADDR;
+		if (offset & (1U << 31)) {
+			offset = (offset & ~(1U << 31)) - RFX_RAMDAC_ADDR;
 			if (offset < RFX_RAMDAC_SIZE)
 				sc->sc_ramdac[offset] = value >> 24;
 		} else {
diff --git a/sys/arch/sparc/fpu/fpu.c b/sys/arch/sparc/fpu/fpu.c
index 59dd54e7a10..bc7be989315 100644
--- a/sys/arch/sparc/fpu/fpu.c
+++ b/sys/arch/sparc/fpu/fpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu.c,v 1.12 2006/05/14 21:58:05 kettenis Exp $	*/
+/*	$OpenBSD: fpu.c,v 1.13 2013/11/26 20:33:14 deraadt Exp $	*/
 /*	$NetBSD: fpu.c,v 1.6 1997/07/29 10:09:51 fair Exp $	*/
 
 /*
@@ -281,11 +281,11 @@ fpu_execute(fe, instr)
 		goto mov;
 
 	case FNEG >> 2:
-		rs1 = fs->fs_regs[rs2] ^ (1 << 31);
+		rs1 = fs->fs_regs[rs2] ^ (1U << 31);
 		goto mov;
 
 	case FABS >> 2:
-		rs1 = fs->fs_regs[rs2] & ~(1 << 31);
+		rs1 = fs->fs_regs[rs2] & ~(1U << 31);
 	mov:
 		fs->fs_regs[rd] = rs1;
 		fs->fs_fsr = fe->fe_fsr;
diff --git a/sys/arch/sparc/fpu/fpu_div.c b/sys/arch/sparc/fpu/fpu_div.c
index 5afae751aa1..97b67fd0d92 100644
--- a/sys/arch/sparc/fpu/fpu_div.c
+++ b/sys/arch/sparc/fpu/fpu_div.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_div.c,v 1.3 2003/06/02 23:27:54 millert Exp $	*/
+/*	$OpenBSD: fpu_div.c,v 1.4 2013/11/26 20:33:14 deraadt Exp $	*/
 /*	$NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp $ */
 
 /*
@@ -78,7 +78,7 @@
  *		R *= 2;
  *	for (bit = FP_NMANT; --bit >= 0; R *= 2) {
  *		if (R >= Y) {
- *			Q |= 1 << bit;
+ *			Q |= 1U << bit;
  *			R -= Y;
  *		}
  *	}
@@ -129,7 +129,7 @@
  *	} while ((bit >>= 1) != 0);
  *	Q[0] = q;
  *	for (i = 1; i < 4; i++) {
- *		q = 0, bit = 1 << 31;
+ *		q = 0, bit = 1U << 31;
  *		do {
  *			D = R - Y;
  *			if (D >= 0) {
@@ -228,7 +228,7 @@ fpu_div(fe)
 
 #define	WORD(r, i)			/* calculate r->fp_mant[i] */ \
 	q = 0; \
-	bit = 1 << 31; \
+	bit = 1U << 31; \
 	LOOP; \
 	(x)->fp_mant[i] = q
 
diff --git a/sys/arch/sparc/fpu/fpu_sqrt.c b/sys/arch/sparc/fpu/fpu_sqrt.c
index 53a786e623a..96f4d68caae 100644
--- a/sys/arch/sparc/fpu/fpu_sqrt.c
+++ b/sys/arch/sparc/fpu/fpu_sqrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_sqrt.c,v 1.3 2003/06/02 23:27:54 millert Exp $	*/
+/*	$OpenBSD: fpu_sqrt.c,v 1.4 2013/11/26 20:33:14 deraadt Exp $	*/
 /*	$NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp $ */
 
 /*
@@ -254,7 +254,7 @@ fpu_sqrt(fe)
 	 * double x correctly while doing the `known q=1.0'.
 	 *
 	 * We do this one mantissa-word at a time, as noted above, to
-	 * save work.  To avoid `(1 << 31) << 1', we also do the top bit
+	 * save work.  To avoid `(1U << 31) << 1', we also do the top bit
 	 * outside of each per-word loop.
 	 *
 	 * The calculation `t = y + bit' breaks down into `t0 = y0, ...,
@@ -292,7 +292,7 @@ fpu_sqrt(fe)
 #define t1 tt
 	q = 0;
 	y1 = 0;
-	bit = 1 << 31;
+	bit = 1U << 31;
 	EVEN_DOUBLE;
 	t1 = bit;
 	FPU_SUBS(d1, x1, t1);
@@ -323,7 +323,7 @@ fpu_sqrt(fe)
 #define t2 tt
 	q = 0;
 	y2 = 0;
-	bit = 1 << 31;
+	bit = 1U << 31;
 	EVEN_DOUBLE;
 	t2 = bit;
 	FPU_SUBS(d2, x2, t2);
@@ -356,7 +356,7 @@ fpu_sqrt(fe)
 #define t3 tt
 	q = 0;
 	y3 = 0;
-	bit = 1 << 31;
+	bit = 1U << 31;
 	EVEN_DOUBLE;
 	t3 = bit;
 	FPU_SUBS(d3, x3, t3);