20100715-1712

3 files changed, 11 insertions, 5 deletions

diff --git a/utils/8c/list.c b/utils/8c/list.c
index 8ee83383..84466942 100644
--- a/utils/8c/list.c
+++ b/utils/8c/list.c
@@ -70,7 +70,7 @@ Aconv(Fmt *fp)
 int
 Dconv(Fmt *fp)
 {
-	char str[40], s[20];
+	char str[STRINGSZ], s[STRINGSZ];
 	Adr *a;
 	int i;
 
@@ -224,7 +224,7 @@ char*	regstr[] =
 int
 Rconv(Fmt *fp)
 {
-	char str[20];
+	char str[STRINGSZ];
 	int r;
 
 	r = va_arg(fp->args, int);
@@ -240,7 +240,7 @@ int
 Sconv(Fmt *fp)
 {
 	int i, c;
-	char str[30], *p, *a;
+	char str[STRINGSZ], *p, *a;
 
 	a = va_arg(fp->args, char*);
 	p = str;
diff --git a/utils/8c/peep.c b/utils/8c/peep.c
index ed3e6b78..3d98b771 100644
--- a/utils/8c/peep.c
+++ b/utils/8c/peep.c
@@ -639,10 +639,14 @@ copyu(Prog *p, Adr *v, Adr *s)
 			return 2;
 		goto caseread;
 
-	case AMOVSL:
 	case AREP:
 	case AREPN:
-		if(v->type == D_CX || v->type == D_DI || v->type == D_SI)
+		if(v->type == D_CX)
+			return 2;
+		goto caseread;
+
+	case AMOVSL:
+		if(v->type == D_DI || v->type == D_SI)
 			return 2;
 		goto caseread;
 
diff --git a/utils/8c/reg.c b/utils/8c/reg.c
index 12ad50ab..fe84f573 100644
--- a/utils/8c/reg.c
+++ b/utils/8c/reg.c
@@ -224,7 +224,9 @@ regopt(Prog *p)
 		 */
 		case AFMOVDP:
 		case AFMOVFP:
+		case AFMOVLP:
 		case AFMOVVP:
+		case AFMOVWP:
 		case ACALL:
 			for(z=0; z<BITS; z++)
 				addrs.b[z] |= bit.b[z];