From: Ken Thompson <ken@golang.org>
Date: Sun, 16 Jan 2011 00:55:47 +0000 (-0800)
Subject: arm reg bug MOVW into bool variable
X-Git-Tag: weekly.2011-01-19~54
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2c35e548bb170421b1463b0a4bb5d6ab653e1d14;p=gostls13.git

arm reg bug MOVW into bool variable

R=r
CC=golang-dev
https://golang.org/cl/4034042
---

diff --git a/src/cmd/5g/reg.c b/src/cmd/5g/reg.c
index c71bade0e6..7971022072 100644
--- a/src/cmd/5g/reg.c
+++ b/src/cmd/5g/reg.c
@@ -137,18 +137,16 @@ regopt(Prog *firstp)
 	uint32 vreg;
 	Bits bit;
 
-return;
-
 	if(first == 0) {
 		fmtinstall('Q', Qconv);
 	}
 	first++;
 
 	if(debug['K']) {
-		if(first != 20)
+		if(first != 2)
 			return;
-//		debug['R'] = 2;
-//		debug['P'] = 2;
+		debug['R'] = 2;
+		debug['P'] = 2;
 		print("optimizing %S\n", curfn->nname->sym);
 	}
 
@@ -480,7 +478,7 @@ brk:
 	 * peep-hole on basic block
 	 */
 	if(!debug['R'] || debug['P']) {
-		peep();
+//		peep();
 	}
 
 	/*
@@ -562,20 +560,24 @@ addmove(Reg *r, int bn, int rn, int f)
 	default:
 		print("What is this %E\n", v->etype);
 
-	case TINT32:
-	case TUINT32:
-	case TPTR32:
-	case TBOOL:
-		p1->as = AMOVW;
-		break;
 	case TINT8:
-	case TUINT8:
 		p1->as = AMOVB;
 		break;
+	case TBOOL:
+	case TUINT8:
+		p1->as = AMOVBU;
+		break;
 	case TINT16:
-	case TUINT16:
 		p1->as = AMOVH;
 		break;
+	case TUINT16:
+		p1->as = AMOVHU;
+		break;
+	case TINT32:
+	case TUINT32:
+	case TPTR32:
+		p1->as = AMOVW;
+		break;
 	case TFLOAT32:
 		p1->as = AMOVF;
 		break;
@@ -599,7 +601,7 @@ addmove(Reg *r, int bn, int rn, int f)
 			a->type = D_FREG;
 			a->reg = rn-NREG;
 		}
-		if(v->etype == TUINT8)
+		if(v->etype == TUINT8 || v->etype == TBOOL)
 			p1->as = AMOVBU;
 		if(v->etype == TUINT16)
 			p1->as = AMOVHU;