--- /sys/src/cmd/cc/bits.c
+++ /sys/src/cmd/cc/bits.c
@@ -65,7 +65,7 @@ bnum(Bits a)
 
 	for(i=0; i<BITS; i++)
 		if(b = a.b[i])
-			return 32*i + bitno(b);
+			return BI2LONG*i + bitno(b);
 	diag(Z, "bad in bnum");
 	return 0;
 }
@@ -76,14 +76,16 @@ blsh(uint n)
 	Bits c;
 
 	c = zbits;
-	c.b[n/32] = 1L << (n%32);
+	assert(n/BI2LONG < BITS);
+	c.b[n/BI2LONG] = 1L << (n%BI2LONG);
 	return c;
 }
 
 int
 bset(Bits a, uint n)
 {
-	if(a.b[n/32] & (1L << (n%32)))
+	assert(n/BI2LONG < BITS);
+	if(a.b[n/BI2LONG] & (1L << (n%BI2LONG)))
 		return 1;
 	return 0;
 }
--- /sys/src/cmd/cc/cc.h
+++ /sys/src/cmd/cc/cc.h
@@ -30,13 +30,14 @@
 #define	HISTSZ		20
 #define YYMAXDEPTH	1500
 #define	NTERM		10
-#define	MAXALIGN	7
+#define	MAXALIGN	7		/* sizeof(uvlong) - 1 */
 
-#define	SIGN(n)		((uvlong)1<<(n-1))
+#define	SIGN(n)		(1ULL<<((n)-1))
 #define	MASK(n)		(SIGN(n)|(SIGN(n)-1))
 
 #define	BITS	5
-#define	NVAR	(BITS*sizeof(ulong)*8)
+#define BI2LONG (sizeof(ulong)*8)
+#define	NVAR	(BITS*BI2LONG)
 struct	Bits
 {
 	ulong	b[BITS];
@@ -359,14 +360,16 @@
 	CEXREG,
 	NCTYPES,
 };
+/* garbage words; should match gnamesinit[] in sub.c */
 enum
 {
 	GXXX		= 0,
 	GCONSTNT	= 1<<0,
 	GVOLATILE	= 1<<1,
-	NGTYPES		= 1<<2,
+//	GNORETURN	= 1<<2,			/* future */
+	NGTYPES		= 1<<3,
 
-	GINCOMPLETE	= 1<<2,
+	GINCOMPLETE	= 1<<7,
 };
 enum
 {
@@ -437,7 +440,8 @@
 EXTERN	Sym*	firstarg;
 EXTERN	Type*	firstargtype;
 EXTERN	Decl*	firstdcl;
-EXTERN	int	fperror;
+// EXTERN	int	fperror;
+EXTERN	int	fpused;
 EXTERN	Sym*	hash[NHASH];
 EXTERN	int	hasdoubled;
 EXTERN	char*	hunk;
--- /sys/src/cmd/cc/sub.c
+++ /sys/src/cmd/cc/sub.c
@@ -1207,7 +1207,7 @@ bitno(long b)
 {
 	int i;
 
-	for(i=0; i<32; i++)
+	for(i=0; i < BI2LONG; i++)
 		if(b & (1L<<i))
 			return i;
 	diag(Z, "bad in bitno");