From: Dave Cheney <dave@cheney.net>
Date: Wed, 8 Apr 2015 15:49:28 +0000 (+1000)
Subject: cmd/internal/obj/arm64, cmd/asm/internal/asm: support CSEL instruction on arm64
X-Git-Tag: go1.5beta1~1225
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ef49b4ca78863766c86611de9b87ea14f56d8a3f;p=gostls13.git

cmd/internal/obj/arm64, cmd/asm/internal/asm: support CSEL instruction on arm64

Add support for arm64 four operand conditional instructions.

Superceedes CL 8405.

Change-Id: I12da8f4822938feec400bbcc426eeaf884536135
Reviewed-on: https://go-review.googlesource.com/8638
Reviewed-by: Aram Hăvărneanu <aram@mgk.ro>
---

diff --git a/src/cmd/asm/internal/asm/asm.go b/src/cmd/asm/internal/asm/asm.go
index 811853b31a..725c6352cb 100644
--- a/src/cmd/asm/internal/asm/asm.go
+++ b/src/cmd/asm/internal/asm/asm.go
@@ -545,6 +545,13 @@ func (p *Parser) asmInstruction(op int, cond string, a []obj.Addr) {
 			prog.Reg = r1
 			break
 		}
+		if p.arch.Thechar == '7' {
+			prog.From = a[0]
+			prog.Reg = p.getRegister(prog, op, &a[1])
+			prog.From3 = a[2]
+			prog.To = a[3]
+			break
+		}
 		if p.arch.Thechar == '9' && arch.IsPPC64RLD(op) {
 			// 2nd operand must always be a register.
 			// TODO: Do we need to guard this with the instruction type?
diff --git a/src/cmd/asm/internal/asm/testdata/arm64.out b/src/cmd/asm/internal/asm/testdata/arm64.out
index 077c562fa0..ceead884af 100644
--- a/src/cmd/asm/internal/asm/testdata/arm64.out
+++ b/src/cmd/asm/internal/asm/testdata/arm64.out
@@ -34,13 +34,18 @@
 116 00034 (testdata/arm64.s:116)	CMP	R1, R2
 126 00035 (testdata/arm64.s:126)	CBZ	R1
 135 00036 (testdata/arm64.s:135)	CSET	GT, R1
-149 00037 (testdata/arm64.s:149)	CSEL	LT, R1, R2
-166 00038 (testdata/arm64.s:166)	FADDD	$(0.5), F1
-167 00039 (testdata/arm64.s:167)	FADDD	F1, F2
-173 00040 (testdata/arm64.s:173)	FADDD	$(0.69999999999999996), F1, F2
-174 00041 (testdata/arm64.s:174)	FADDD	F1, F2, F3
-226 00042 (testdata/arm64.s:226)	DMB	$1
-235 00043 (testdata/arm64.s:235)	LDAXRW	(R0), R2
-236 00044 (testdata/arm64.s:236)	STLXRW	R1, (R0), R3
-244 00045 (testdata/arm64.s:244)	RET
-252 00046 (testdata/arm64.s:252)	END
+143 00037 (testdata/arm64.s:143)	CSEL	LT, R1, R2, ZR
+144 00038 (testdata/arm64.s:144)	CSINC	GT, R1, ZR, R3
+145 00039 (testdata/arm64.s:145)	CSNEG	MI, R1, R2, R3
+146 00040 (testdata/arm64.s:146)	CSINV	0, R1, R2, R3
+152 00041 (testdata/arm64.s:152)	CSEL	LT, R1, R2
+160 00042 (testdata/arm64.s:160)	CCMN	MI, ZR, R1, $4
+169 00043 (testdata/arm64.s:169)	FADDD	$(0.5), F1
+170 00044 (testdata/arm64.s:170)	FADDD	F1, F2
+176 00045 (testdata/arm64.s:176)	FADDD	$(0.69999999999999996), F1, F2
+177 00046 (testdata/arm64.s:177)	FADDD	F1, F2, F3
+229 00047 (testdata/arm64.s:229)	DMB	$1
+238 00048 (testdata/arm64.s:238)	LDAXRW	(R0), R2
+239 00049 (testdata/arm64.s:239)	STLXRW	R1, (R0), R3
+247 00050 (testdata/arm64.s:247)	RET
+255 00051 (testdata/arm64.s:255)	END
diff --git a/src/cmd/asm/internal/asm/testdata/arm64.s b/src/cmd/asm/internal/asm/testdata/arm64.s
index 6cb0edf60e..1e344b5db0 100644
--- a/src/cmd/asm/internal/asm/testdata/arm64.s
+++ b/src/cmd/asm/internal/asm/testdata/arm64.s
@@ -134,13 +134,16 @@ again:
 //	}
 	CSET	GT, R1
 //
-// CSEL/CINC/CNEG/CINV
+// CSEL/CSINC/CSNEG/CSINV
 //
 //		LTYPES cond ',' reg ',' reg ',' reg
 //	{
 //		outgcode($1, &$2, $6.reg, &$4, &$8);
 //	}
-//	CSEL	LT, R1, R2, ZR
+	CSEL	LT, R1, R2, ZR
+	CSINC	GT, R1, ZR, R3
+	CSNEG	MI, R1, R2, R3
+	CSINV	CS, R1, R2, R3
 
 //		LTYPES cond ',' reg ',' reg
 //	{
@@ -154,7 +157,7 @@ again:
 //	{
 //		outgcode($1, &$2, $6.reg, &$4, &$8);
 //	}
-// 	CCMN	MI, $1, R1, $4
+	CCMN	MI, ZR, R1, $4
 
 //
 // FADDD
diff --git a/src/cmd/internal/obj/arm64/asm7.go b/src/cmd/internal/obj/arm64/asm7.go
index 66780eb7c4..94dc4b1a61 100644
--- a/src/cmd/internal/obj/arm64/asm7.go
+++ b/src/cmd/internal/obj/arm64/asm7.go
@@ -2110,7 +2110,7 @@ func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) {
 		}
 
 		rt := int(p.To.Reg)
-		o1 |= (uint32(r&31) << 16) | (uint32(cond) << 12) | (uint32(rf&31) << 5) | uint32(rt&31)
+		o1 |= (uint32(rf&31) << 16) | (uint32(cond&31) << 12) | (uint32(r&31) << 5) | uint32(rt&31)
 
 	case 19: /* CCMN cond, (Rm|uimm5),Rn, uimm4 -> ccmn Rn,Rm,uimm4,cond */
 		nzcv := int(p.To.Offset)