shift bug

R=r OCL=18166 CL=18166

shift bug
R=r OCL=18166 CL=18166
fd922c87 · Ken Thompson · c1198b9b · fd922c87
Commit fd922c87 authored Oct 30, 2008 by Ken Thompson
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

gen.c src/cmd/6g/gen.c +4 -1

No files found.
--- a/src/cmd/6g/gen.c
+++ b/src/cmd/6g/gen.c
@@ -1047,12 +1047,15 @@ cgen_shift(int op, Node *nl, Node *nr, Node *res)
 	regalloc(&n1, nr->type, &n1);

 	// clean out the CL register
-	if(rcl && !samereg(res, &n1)) {
+	if(rcl) {
 		regalloc(&n2, types[TINT64], N);
 		gins(AMOVQ, &n1, &n2);
 		regfree(&n1);

 		reg[D_CX] = 0;
+		if(samereg(res, &n1))
+			cgen_shift(op, nl, nr, &n2);
+		else
 			cgen_shift(op, nl, nr, res);
 		reg[D_CX] = rcl;