From 29d7b25b9547905fe65d76460a918bfe6d4d39f7 Mon Sep 17 00:00:00 2001
From: Sun Yimin <emmansun@users.noreply.github.com>
Date: Tue, 8 Aug 2023 08:22:17 +0800
Subject: [PATCH] sm4: cbc ecb asm rename

---
 sm4/{cbc_cipher_asm_amd64.s => cbc_amd64.s} |  0
 sm4/{cbc_cipher_asm_arm64.s => cbc_arm64.s} | 14 +++++++++-----
 sm4/{ecb_sm4_amd64.s => ecb_amd64.s}        |  0
 sm4/{ecb_sm4_arm64.s => ecb_arm64.s}        | 18 ++++++++++--------
 4 files changed, 19 insertions(+), 13 deletions(-)
 rename sm4/{cbc_cipher_asm_amd64.s => cbc_amd64.s} (100%)
 rename sm4/{cbc_cipher_asm_arm64.s => cbc_arm64.s} (93%)
 rename sm4/{ecb_sm4_amd64.s => ecb_amd64.s} (100%)
 rename sm4/{ecb_sm4_arm64.s => ecb_arm64.s} (91%)

diff --git a/sm4/cbc_cipher_asm_amd64.s b/sm4/cbc_amd64.s
similarity index 100%
rename from sm4/cbc_cipher_asm_amd64.s
rename to sm4/cbc_amd64.s
diff --git a/sm4/cbc_cipher_asm_arm64.s b/sm4/cbc_arm64.s
similarity index 93%
rename from sm4/cbc_cipher_asm_arm64.s
rename to sm4/cbc_arm64.s
index 896a91a..a9c978f 100644
--- a/sm4/cbc_cipher_asm_arm64.s
+++ b/sm4/cbc_arm64.s
@@ -268,7 +268,9 @@ cbc4BlocksLoop64:
 cbcSm4Single16:
 	VLD1 (srcPtr), [t0.S4]
 	VREV32 t0.B16, t0.B16
-	PRE_TRANSPOSE_MATRIX(t0, t1, t2, t3, x, y, XTMP6, XTMP7)
+	VMOV t0.S[1], t1.S[0]
+	VMOV t0.S[2], t2.S[0]
+	VMOV t0.S[3], t3.S[0]
 
 cbc4BlocksLoop16:
 		SM4_ROUND(rk, R19, x, y, XTMP6, t0, t1, t2, t3)
@@ -280,12 +282,14 @@ cbc4BlocksLoop16:
 		CMP $128, R0
 		BNE cbc4BlocksLoop16
 
-	TRANSPOSE_MATRIX(t0, t1, t2, t3, x, y, XTMP6, XTMP7)
-	VREV32 t0.B16, t0.B16
+	VMOV t2.S[0], t3.S[1]
+	VMOV t1.S[0], t3.S[2]
+	VMOV t0.S[0], t3.S[3]
+	VREV32 t3.B16, t3.B16
 
-	VEOR IV.B16, t0.B16, t0.B16
+	VEOR IV.B16, t3.B16, t3.B16
 
-	VST1 [t0.S4], (dstPtr)
+	VST1 [t3.S4], (dstPtr)
 
 	B cbcSm4Done
 
diff --git a/sm4/ecb_sm4_amd64.s b/sm4/ecb_amd64.s
similarity index 100%
rename from sm4/ecb_sm4_amd64.s
rename to sm4/ecb_amd64.s
diff --git a/sm4/ecb_sm4_arm64.s b/sm4/ecb_arm64.s
similarity index 91%
rename from sm4/ecb_sm4_arm64.s
rename to sm4/ecb_arm64.s
index 2872c10..feafce1 100644
--- a/sm4/ecb_sm4_arm64.s
+++ b/sm4/ecb_arm64.s
@@ -129,9 +129,6 @@ ecbSm4Single:
 	MOVD rkSave, rk
 	EOR R0, R0
 
-	CMP $16, srcPtrLen
-	BEQ ecbSm4Single16
-
 	CMP $32, srcPtrLen
 	BEQ ecbSm4Single32
 
@@ -141,7 +138,10 @@ ecbSm4Single:
 ecbSm4Single16:
 	VLD1.P 16(srcPtr), [t0.S4]
 	VREV32 t0.B16, t0.B16
-    PRE_TRANSPOSE_MATRIX(t0, t1, t2, t3, x, y, XTMP6, XTMP7)
+	VREV32 t0.B16, t0.B16
+	VMOV t0.S[1], t1.S[0]
+	VMOV t0.S[2], t2.S[0]
+	VMOV t0.S[3], t3.S[0]
 
 encryptBlocksLoop1:
 		SM4_ROUND(rk, R6, x, y, XTMP6, t0, t1, t2, t3)
@@ -153,9 +153,11 @@ encryptBlocksLoop1:
 		CMP $128, R0
 		BNE encryptBlocksLoop1
 
-	TRANSPOSE_MATRIX(t0, t1, t2, t3, x, y, XTMP6, XTMP7)
-	VREV32 t0.B16, t0.B16
-	VST1.P [t0.S4], 16(dstPtr)
+	VMOV t2.S[0], t3.S[1]
+	VMOV t1.S[0], t3.S[2]
+	VMOV t0.S[0], t3.S[3]
+	VREV32 t3.B16, t3.B16
+	VST1.P [t3.S4], 16(dstPtr)
 
 	B ecbSm4Done
 
@@ -163,7 +165,7 @@ ecbSm4Single32:
 	VLD1.P 32(srcPtr), [t0.S4, t1.S4]
 	VREV32 t0.B16, t0.B16
 	VREV32 t1.B16, t1.B16
-    PRE_TRANSPOSE_MATRIX(t0, t1, t2, t3, x, y, XTMP6, XTMP7)
+	PRE_TRANSPOSE_MATRIX(t0, t1, t2, t3, x, y, XTMP6, XTMP7)
 
 encryptBlocksLoop2:
 		SM4_ROUND(rk, R6, x, y, XTMP6, t0, t1, t2, t3)