all: change the old assembly style AX:CX to CX, AX
Assembly files with "/vendor/" or "testdata" in their paths were
ignored.
Change-Id: I10621751b5eb649d0737025f944d5955c9204376
GitHub-Last-Rev: 005e16566cbfb36ffb4f31e4138e963c5dbcc700
GitHub-Pull-Request: golang/crypto#83
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/170778
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Filippo Valsorda <filippo@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
diff --git a/chacha20poly1305/chacha20poly1305_amd64.s b/chacha20poly1305/chacha20poly1305_amd64.s
index af76bbc..9dd5d7a 100644
--- a/chacha20poly1305/chacha20poly1305_amd64.s
+++ b/chacha20poly1305/chacha20poly1305_amd64.s
@@ -200,7 +200,7 @@
#define polyMulStage1 MOVQ (0*8)(BP), AX; MOVQ AX, t2; MULQ acc0; MOVQ AX, t0; MOVQ DX, t1; MOVQ (0*8)(BP), AX; MULQ acc1; IMULQ acc2, t2; ADDQ AX, t1; ADCQ DX, t2
#define polyMulStage2 MOVQ (1*8)(BP), AX; MOVQ AX, t3; MULQ acc0; ADDQ AX, t1; ADCQ $0, DX; MOVQ DX, acc0; MOVQ (1*8)(BP), AX; MULQ acc1; ADDQ AX, t2; ADCQ $0, DX
#define polyMulStage3 IMULQ acc2, t3; ADDQ acc0, t2; ADCQ DX, t3
-#define polyMulReduceStage MOVQ t0, acc0; MOVQ t1, acc1; MOVQ t2, acc2; ANDQ $3, acc2; MOVQ t2, t0; ANDQ $-4, t0; MOVQ t3, t1; SHRQ $2, t2:t3; SHRQ $2, t3; ADDQ t0, acc0; ADCQ t1, acc1; ADCQ $0, acc2; ADDQ t2, acc0; ADCQ t3, acc1; ADCQ $0, acc2
+#define polyMulReduceStage MOVQ t0, acc0; MOVQ t1, acc1; MOVQ t2, acc2; ANDQ $3, acc2; MOVQ t2, t0; ANDQ $-4, t0; MOVQ t3, t1; SHRQ $2, t3, t2; SHRQ $2, t3; ADDQ t0, acc0; ADCQ t1, acc1; ADCQ $0, acc2; ADDQ t2, acc0; ADCQ t3, acc1; ADCQ $0, acc2
#define polyMulStage1_AVX2 MOVQ (0*8)(BP), DX; MOVQ DX, t2; MULXQ acc0, t0, t1; IMULQ acc2, t2; MULXQ acc1, AX, DX; ADDQ AX, t1; ADCQ DX, t2
#define polyMulStage2_AVX2 MOVQ (1*8)(BP), DX; MULXQ acc0, acc0, AX; ADDQ acc0, t1; MULXQ acc1, acc1, t3; ADCQ acc1, t2; ADCQ $0, t3
@@ -248,7 +248,7 @@
ADDQ itr2, adp
hashADTailLoop:
- SHLQ $8, t1:t0
+ SHLQ $8, t0, t1
SHLQ $8, t0
MOVB -1(adp), t2
XORQ t2, t0
diff --git a/curve25519/ladderstep_amd64.s b/curve25519/ladderstep_amd64.s
index 9e9040b..e0ac30c 100644
--- a/curve25519/ladderstep_amd64.s
+++ b/curve25519/ladderstep_amd64.s
@@ -121,18 +121,18 @@
ADDQ AX,R12
ADCQ DX,R13
MOVQ $REDMASK51,DX
- SHLQ $13,CX:SI
+ SHLQ $13,SI,CX
ANDQ DX,SI
- SHLQ $13,R9:R8
+ SHLQ $13,R8,R9
ANDQ DX,R8
ADDQ CX,R8
- SHLQ $13,R11:R10
+ SHLQ $13,R10,R11
ANDQ DX,R10
ADDQ R9,R10
- SHLQ $13,R13:R12
+ SHLQ $13,R12,R13
ANDQ DX,R12
ADDQ R11,R12
- SHLQ $13,R15:R14
+ SHLQ $13,R14,R15
ANDQ DX,R14
ADDQ R13,R14
IMUL3Q $19,R15,CX
@@ -236,18 +236,18 @@
ADDQ AX,R12
ADCQ DX,R13
MOVQ $REDMASK51,DX
- SHLQ $13,CX:SI
+ SHLQ $13,SI,CX
ANDQ DX,SI
- SHLQ $13,R9:R8
+ SHLQ $13,R8,R9
ANDQ DX,R8
ADDQ CX,R8
- SHLQ $13,R11:R10
+ SHLQ $13,R10,R11
ANDQ DX,R10
ADDQ R9,R10
- SHLQ $13,R13:R12
+ SHLQ $13,R12,R13
ANDQ DX,R12
ADDQ R11,R12
- SHLQ $13,R15:R14
+ SHLQ $13,R14,R15
ANDQ DX,R14
ADDQ R13,R14
IMUL3Q $19,R15,CX
@@ -441,18 +441,18 @@
ADDQ AX,R12
ADCQ DX,R13
MOVQ $REDMASK51,DX
- SHLQ $13,CX:SI
+ SHLQ $13,SI,CX
ANDQ DX,SI
- SHLQ $13,R9:R8
+ SHLQ $13,R8,R9
ANDQ DX,R8
ADDQ CX,R8
- SHLQ $13,R11:R10
+ SHLQ $13,R10,R11
ANDQ DX,R10
ADDQ R9,R10
- SHLQ $13,R13:R12
+ SHLQ $13,R12,R13
ANDQ DX,R12
ADDQ R11,R12
- SHLQ $13,R15:R14
+ SHLQ $13,R14,R15
ANDQ DX,R14
ADDQ R13,R14
IMUL3Q $19,R15,CX
@@ -591,18 +591,18 @@
ADDQ AX,R12
ADCQ DX,R13
MOVQ $REDMASK51,DX
- SHLQ $13,CX:SI
+ SHLQ $13,SI,CX
ANDQ DX,SI
- SHLQ $13,R9:R8
+ SHLQ $13,R8,R9
ANDQ DX,R8
ADDQ CX,R8
- SHLQ $13,R11:R10
+ SHLQ $13,R10,R11
ANDQ DX,R10
ADDQ R9,R10
- SHLQ $13,R13:R12
+ SHLQ $13,R12,R13
ANDQ DX,R12
ADDQ R11,R12
- SHLQ $13,R15:R14
+ SHLQ $13,R14,R15
ANDQ DX,R14
ADDQ R13,R14
IMUL3Q $19,R15,CX
@@ -731,18 +731,18 @@
ADDQ AX,R12
ADCQ DX,R13
MOVQ $REDMASK51,DX
- SHLQ $13,CX:SI
+ SHLQ $13,SI,CX
ANDQ DX,SI
- SHLQ $13,R9:R8
+ SHLQ $13,R8,R9
ANDQ DX,R8
ADDQ CX,R8
- SHLQ $13,R11:R10
+ SHLQ $13,R10,R11
ANDQ DX,R10
ADDQ R9,R10
- SHLQ $13,R13:R12
+ SHLQ $13,R12,R13
ANDQ DX,R12
ADDQ R11,R12
- SHLQ $13,R15:R14
+ SHLQ $13,R14,R15
ANDQ DX,R14
ADDQ R13,R14
IMUL3Q $19,R15,CX
@@ -846,18 +846,18 @@
ADDQ AX,R12
ADCQ DX,R13
MOVQ $REDMASK51,DX
- SHLQ $13,CX:SI
+ SHLQ $13,SI,CX
ANDQ DX,SI
- SHLQ $13,R9:R8
+ SHLQ $13,R8,R9
ANDQ DX,R8
ADDQ CX,R8
- SHLQ $13,R11:R10
+ SHLQ $13,R10,R11
ANDQ DX,R10
ADDQ R9,R10
- SHLQ $13,R13:R12
+ SHLQ $13,R12,R13
ANDQ DX,R12
ADDQ R11,R12
- SHLQ $13,R15:R14
+ SHLQ $13,R14,R15
ANDQ DX,R14
ADDQ R13,R14
IMUL3Q $19,R15,CX
@@ -996,18 +996,18 @@
ADDQ AX,R12
ADCQ DX,R13
MOVQ $REDMASK51,DX
- SHLQ $13,CX:SI
+ SHLQ $13,SI,CX
ANDQ DX,SI
- SHLQ $13,R9:R8
+ SHLQ $13,R8,R9
ANDQ DX,R8
ADDQ CX,R8
- SHLQ $13,R11:R10
+ SHLQ $13,R10,R11
ANDQ DX,R10
ADDQ R9,R10
- SHLQ $13,R13:R12
+ SHLQ $13,R12,R13
ANDQ DX,R12
ADDQ R11,R12
- SHLQ $13,R15:R14
+ SHLQ $13,R14,R15
ANDQ DX,R14
ADDQ R13,R14
IMUL3Q $19,R15,CX
@@ -1146,18 +1146,18 @@
ADDQ AX,R12
ADCQ DX,R13
MOVQ $REDMASK51,DX
- SHLQ $13,CX:SI
+ SHLQ $13,SI,CX
ANDQ DX,SI
- SHLQ $13,R9:R8
+ SHLQ $13,R8,R9
ANDQ DX,R8
ADDQ CX,R8
- SHLQ $13,R11:R10
+ SHLQ $13,R10,R11
ANDQ DX,R10
ADDQ R9,R10
- SHLQ $13,R13:R12
+ SHLQ $13,R12,R13
ANDQ DX,R12
ADDQ R11,R12
- SHLQ $13,R15:R14
+ SHLQ $13,R14,R15
ANDQ DX,R14
ADDQ R13,R14
IMUL3Q $19,R15,CX
@@ -1332,18 +1332,18 @@
ADDQ AX,R12
ADCQ DX,R13
MOVQ $REDMASK51,DX
- SHLQ $13,CX:SI
+ SHLQ $13,SI,CX
ANDQ DX,SI
- SHLQ $13,R9:R8
+ SHLQ $13,R8,R9
ANDQ DX,R8
ADDQ CX,R8
- SHLQ $13,R11:R10
+ SHLQ $13,R10,R11
ANDQ DX,R10
ADDQ R9,R10
- SHLQ $13,R13:R12
+ SHLQ $13,R12,R13
ANDQ DX,R12
ADDQ R11,R12
- SHLQ $13,R15:R14
+ SHLQ $13,R14,R15
ANDQ DX,R14
ADDQ R13,R14
IMUL3Q $19,R15,CX
diff --git a/curve25519/mul_amd64.s b/curve25519/mul_amd64.s
index 5ce80a2..1f76d1a 100644
--- a/curve25519/mul_amd64.s
+++ b/curve25519/mul_amd64.s
@@ -124,18 +124,18 @@
ADDQ AX,R14
ADCQ DX,R15
MOVQ $REDMASK51,SI
- SHLQ $13,R9:R8
+ SHLQ $13,R8,R9
ANDQ SI,R8
- SHLQ $13,R11:R10
+ SHLQ $13,R10,R11
ANDQ SI,R10
ADDQ R9,R10
- SHLQ $13,R13:R12
+ SHLQ $13,R12,R13
ANDQ SI,R12
ADDQ R11,R12
- SHLQ $13,R15:R14
+ SHLQ $13,R14,R15
ANDQ SI,R14
ADDQ R13,R14
- SHLQ $13,BP:BX
+ SHLQ $13,BX,BP
ANDQ SI,BX
ADDQ R15,BX
IMUL3Q $19,BP,DX
diff --git a/curve25519/square_amd64.s b/curve25519/square_amd64.s
index 12f7373..07511a4 100644
--- a/curve25519/square_amd64.s
+++ b/curve25519/square_amd64.s
@@ -87,18 +87,18 @@
ADDQ AX,R13
ADCQ DX,R14
MOVQ $REDMASK51,SI
- SHLQ $13,R8:CX
+ SHLQ $13,CX,R8
ANDQ SI,CX
- SHLQ $13,R10:R9
+ SHLQ $13,R9,R10
ANDQ SI,R9
ADDQ R8,R9
- SHLQ $13,R12:R11
+ SHLQ $13,R11,R12
ANDQ SI,R11
ADDQ R10,R11
- SHLQ $13,R14:R13
+ SHLQ $13,R13,R14
ANDQ SI,R13
ADDQ R12,R13
- SHLQ $13,BX:R15
+ SHLQ $13,R15,BX
ANDQ SI,R15
ADDQ R14,R15
IMUL3Q $19,BX,DX
