From e3bca5d865c831d3a6426b05bffd8c8d31e69886 Mon Sep 17 00:00:00 2001
From: David Boddie <david@boddie.org.uk>
Date: Fri, 14 Jul 2017 00:59:19 +0200
Subject: Fixed warnings from recent versions of GCC. Fixed incorrect buffering
 due to a change in the way the buf.dbuf array is compiled in at least GCC
 4.9.2, GCC 5.4.0 and GCC 6.3.0.

---
 utils/8l/asm.c | 20 ++++++++++----------
 utils/8l/l.h   |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'utils')

diff --git a/utils/8l/asm.c b/utils/8l/asm.c
index 6d09ae7c..de75499f 100644
--- a/utils/8l/asm.c
+++ b/utils/8l/asm.c
@@ -408,11 +408,11 @@ datblk(long s, long n)
 				if(debug['a'] && i == 0) {
 					Bprint(&bso, pcstr, l+s+INITDAT);
 					for(j=0; j<c; j++)
-						Bprint(&bso, "%.2ux", cast[fnuxi4[j]] & 0xff);
+						Bprint(&bso, "%.2ux", cast[(int)fnuxi4[j]] & 0xff);
 					Bprint(&bso, "\t%P\n", curp);
 				}
 				for(; i<c; i++) {
-					buf.dbuf[l] = cast[fnuxi4[i]];
+					buf.dbuf[l] = cast[(int)fnuxi4[i]];
 					l++;
 				}
 				break;
@@ -421,11 +421,11 @@ datblk(long s, long n)
 				if(debug['a'] && i == 0) {
 					Bprint(&bso, pcstr, l+s+INITDAT);
 					for(j=0; j<c; j++)
-						Bprint(&bso, "%.2ux", cast[fnuxi8[j]] & 0xff);
+						Bprint(&bso, "%.2ux", cast[(int)fnuxi8[j]] & 0xff);
 					Bprint(&bso, "\t%P\n", curp);
 				}
 				for(; i<c; i++) {
-					buf.dbuf[l] = cast[fnuxi8[i]];
+					buf.dbuf[l] = cast[(int)fnuxi8[i]];
 					l++;
 				}
 				break;
@@ -468,11 +468,11 @@ datblk(long s, long n)
 				if(debug['a'] && i == 0) {
 					Bprint(&bso, pcstr, l+s+INITDAT);
 					for(j=0; j<c; j++)
-						Bprint(&bso, "%.2ux", cast[inuxi1[j]] & 0xff);
+						Bprint(&bso, "%.2ux", cast[(int)inuxi1[j]] & 0xff);
 					Bprint(&bso, "\t%P\n", curp);
 				}
 				for(; i<c; i++) {
-					buf.dbuf[l] = cast[inuxi1[i]];
+					buf.dbuf[l] = cast[(int)inuxi1[i]];
 					l++;
 				}
 				break;
@@ -480,11 +480,11 @@ datblk(long s, long n)
 				if(debug['a'] && i == 0) {
 					Bprint(&bso, pcstr, l+s+INITDAT);
 					for(j=0; j<c; j++)
-						Bprint(&bso, "%.2ux", cast[inuxi2[j]] & 0xff);
+						Bprint(&bso, "%.2ux", cast[(int)inuxi2[j]] & 0xff);
 					Bprint(&bso, "\t%P\n", curp);
 				}
 				for(; i<c; i++) {
-					buf.dbuf[l] = cast[inuxi2[i]];
+					buf.dbuf[l] = cast[(int)inuxi2[i]];
 					l++;
 				}
 				break;
@@ -492,11 +492,11 @@ datblk(long s, long n)
 				if(debug['a'] && i == 0) {
 					Bprint(&bso, pcstr, l+s+INITDAT);
 					for(j=0; j<c; j++)
-						Bprint(&bso, "%.2ux", cast[inuxi4[j]] & 0xff);
+						Bprint(&bso, "%.2ux", cast[(int)inuxi4[j]] & 0xff);
 					Bprint(&bso, "\t%P\n", curp);
 				}
 				for(; i<c; i++) {
-					buf.dbuf[l] = cast[inuxi4[i]];
+					buf.dbuf[l] = cast[(int)inuxi4[i]];
 					l++;
 				}
 				break;
diff --git a/utils/8l/l.h b/utils/8l/l.h
index da151014..ca3059e9 100644
--- a/utils/8l/l.h
+++ b/utils/8l/l.h
@@ -195,7 +195,7 @@ EXTERN union
 		uchar	obuf[MAXIO];			/* output buffer */
 		uchar	ibuf[MAXIO];			/* input buffer */
 	} u;
-	char	dbuf[1];
+	char	dbuf[MAXIO];
 } buf;
 
 #define	cbuf	u.obuf
-- 
cgit v1.2.3


From 9daa5b837e2e1f494a95ecd298d5e428ccb76b01 Mon Sep 17 00:00:00 2001
From: David Boddie <david@boddie.org.uk>
Date: Sat, 15 Jul 2017 18:12:15 +0200
Subject: Reverted casts in asm.c, changing types in l.h to compensate.
 Increased the size of the dbuf array to match the total size of obuf and
 ibuf.

---
 utils/8l/asm.c | 20 ++++++++++----------
 utils/8l/l.h   | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'utils')

diff --git a/utils/8l/asm.c b/utils/8l/asm.c
index de75499f..6d09ae7c 100644
--- a/utils/8l/asm.c
+++ b/utils/8l/asm.c
@@ -408,11 +408,11 @@ datblk(long s, long n)
 				if(debug['a'] && i == 0) {
 					Bprint(&bso, pcstr, l+s+INITDAT);
 					for(j=0; j<c; j++)
-						Bprint(&bso, "%.2ux", cast[(int)fnuxi4[j]] & 0xff);
+						Bprint(&bso, "%.2ux", cast[fnuxi4[j]] & 0xff);
 					Bprint(&bso, "\t%P\n", curp);
 				}
 				for(; i<c; i++) {
-					buf.dbuf[l] = cast[(int)fnuxi4[i]];
+					buf.dbuf[l] = cast[fnuxi4[i]];
 					l++;
 				}
 				break;
@@ -421,11 +421,11 @@ datblk(long s, long n)
 				if(debug['a'] && i == 0) {
 					Bprint(&bso, pcstr, l+s+INITDAT);
 					for(j=0; j<c; j++)
-						Bprint(&bso, "%.2ux", cast[(int)fnuxi8[j]] & 0xff);
+						Bprint(&bso, "%.2ux", cast[fnuxi8[j]] & 0xff);
 					Bprint(&bso, "\t%P\n", curp);
 				}
 				for(; i<c; i++) {
-					buf.dbuf[l] = cast[(int)fnuxi8[i]];
+					buf.dbuf[l] = cast[fnuxi8[i]];
 					l++;
 				}
 				break;
@@ -468,11 +468,11 @@ datblk(long s, long n)
 				if(debug['a'] && i == 0) {
 					Bprint(&bso, pcstr, l+s+INITDAT);
 					for(j=0; j<c; j++)
-						Bprint(&bso, "%.2ux", cast[(int)inuxi1[j]] & 0xff);
+						Bprint(&bso, "%.2ux", cast[inuxi1[j]] & 0xff);
 					Bprint(&bso, "\t%P\n", curp);
 				}
 				for(; i<c; i++) {
-					buf.dbuf[l] = cast[(int)inuxi1[i]];
+					buf.dbuf[l] = cast[inuxi1[i]];
 					l++;
 				}
 				break;
@@ -480,11 +480,11 @@ datblk(long s, long n)
 				if(debug['a'] && i == 0) {
 					Bprint(&bso, pcstr, l+s+INITDAT);
 					for(j=0; j<c; j++)
-						Bprint(&bso, "%.2ux", cast[(int)inuxi2[j]] & 0xff);
+						Bprint(&bso, "%.2ux", cast[inuxi2[j]] & 0xff);
 					Bprint(&bso, "\t%P\n", curp);
 				}
 				for(; i<c; i++) {
-					buf.dbuf[l] = cast[(int)inuxi2[i]];
+					buf.dbuf[l] = cast[inuxi2[i]];
 					l++;
 				}
 				break;
@@ -492,11 +492,11 @@ datblk(long s, long n)
 				if(debug['a'] && i == 0) {
 					Bprint(&bso, pcstr, l+s+INITDAT);
 					for(j=0; j<c; j++)
-						Bprint(&bso, "%.2ux", cast[(int)inuxi4[j]] & 0xff);
+						Bprint(&bso, "%.2ux", cast[inuxi4[j]] & 0xff);
 					Bprint(&bso, "\t%P\n", curp);
 				}
 				for(; i<c; i++) {
-					buf.dbuf[l] = cast[(int)inuxi4[i]];
+					buf.dbuf[l] = cast[inuxi4[i]];
 					l++;
 				}
 				break;
diff --git a/utils/8l/l.h b/utils/8l/l.h
index ca3059e9..85964bc3 100644
--- a/utils/8l/l.h
+++ b/utils/8l/l.h
@@ -195,7 +195,7 @@ EXTERN union
 		uchar	obuf[MAXIO];			/* output buffer */
 		uchar	ibuf[MAXIO];			/* input buffer */
 	} u;
-	char	dbuf[MAXIO];
+	char	dbuf[2*MAXIO];
 } buf;
 
 #define	cbuf	u.obuf
@@ -236,8 +236,8 @@ EXTERN	char	debug[128];
 EXTERN	char	literal[32];
 EXTERN	Prog*	etextp;
 EXTERN	Prog*	firstp;
-EXTERN	char	fnuxi8[8];
-EXTERN	char	fnuxi4[4];
+EXTERN	uchar	fnuxi8[8];
+EXTERN	uchar	fnuxi4[4];
 EXTERN	Sym*	hash[NHASH];
 EXTERN	Sym*	histfrog[MAXHIST];
 EXTERN	int	histfrogp;
@@ -247,9 +247,9 @@ EXTERN	char*	libraryobj[50];
 EXTERN	int	libraryp;
 EXTERN	int	xrefresolv;
 EXTERN	char*	hunk;
-EXTERN	char	inuxi1[1];
-EXTERN	char	inuxi2[2];
-EXTERN	char	inuxi4[4];
+EXTERN	uchar	inuxi1[1];
+EXTERN	uchar	inuxi2[2];
+EXTERN	uchar	inuxi4[4];
 EXTERN	char	ycover[Ymax*Ymax];
 EXTERN	uchar*	andptr;
 EXTERN	uchar	and[30];
-- 
cgit v1.2.3