Index: third_party/boringssl/linux-aarch64/crypto/modes/ghashv8-armx64.S |
diff --git a/third_party/boringssl/linux-aarch64/crypto/modes/ghashv8-armx64.S b/third_party/boringssl/linux-aarch64/crypto/modes/ghashv8-armx64.S |
index a0a9b6807a96bd2140a884ce39eecfc54afe70c5..f39f3ba870b7d660d1f721c091ed486344bf3799 100644 |
--- a/third_party/boringssl/linux-aarch64/crypto/modes/ghashv8-armx64.S |
+++ b/third_party/boringssl/linux-aarch64/crypto/modes/ghashv8-armx64.S |
@@ -1,11 +1,12 @@ |
#if defined(__aarch64__) |
-#include "arm_arch.h" |
+#include <openssl/arm_arch.h> |
.text |
#if !defined(__clang__) |
.arch armv8-a+crypto |
#endif |
.globl gcm_init_v8 |
+.hidden gcm_init_v8 |
.type gcm_init_v8,%function |
.align 4 |
gcm_init_v8: |
@@ -56,6 +57,7 @@ gcm_init_v8: |
ret |
.size gcm_init_v8,.-gcm_init_v8 |
.globl gcm_gmult_v8 |
+.hidden gcm_gmult_v8 |
.type gcm_gmult_v8,%function |
.align 4 |
gcm_gmult_v8: |
@@ -68,10 +70,10 @@ gcm_gmult_v8: |
#endif |
ext v3.16b,v17.16b,v17.16b,#8 |
- pmull v0.1q,v20.1d,v3.1d //H.lo·Xi.lo |
+ pmull v0.1q,v20.1d,v3.1d //H.lo·Xi.lo |
eor v17.16b,v17.16b,v3.16b //Karatsuba pre-processing |
- pmull2 v2.1q,v20.2d,v3.2d //H.hi·Xi.hi |
- pmull v1.1q,v21.1d,v17.1d //(H.lo+H.hi)·(Xi.lo+Xi.hi) |
+ pmull2 v2.1q,v20.2d,v3.2d //H.hi·Xi.hi |
+ pmull v1.1q,v21.1d,v17.1d //(H.lo+H.hi)·(Xi.lo+Xi.hi) |
ext v17.16b,v0.16b,v2.16b,#8 //Karatsuba post-processing |
eor v18.16b,v0.16b,v2.16b |
@@ -97,6 +99,7 @@ gcm_gmult_v8: |
ret |
.size gcm_gmult_v8,.-gcm_gmult_v8 |
.globl gcm_ghash_v8 |
+.hidden gcm_ghash_v8 |
.type gcm_ghash_v8,%function |
.align 4 |
gcm_ghash_v8: |
@@ -135,7 +138,7 @@ gcm_ghash_v8: |
#endif |
ext v7.16b,v17.16b,v17.16b,#8 |
eor v3.16b,v3.16b,v0.16b //I[i]^=Xi |
- pmull v4.1q,v20.1d,v7.1d //H·Ii+1 |
+ pmull v4.1q,v20.1d,v7.1d //H·Ii+1 |
eor v17.16b,v17.16b,v7.16b //Karatsuba pre-processing |
pmull2 v6.1q,v20.2d,v7.2d |
b .Loop_mod2x_v8 |
@@ -144,14 +147,14 @@ gcm_ghash_v8: |
.Loop_mod2x_v8: |
ext v18.16b,v3.16b,v3.16b,#8 |
subs x3,x3,#32 //is there more data? |
- pmull v0.1q,v22.1d,v3.1d //H^2.lo·Xi.lo |
+ pmull v0.1q,v22.1d,v3.1d //H^2.lo·Xi.lo |
csel x12,xzr,x12,lo //is it time to zero x12? |
pmull v5.1q,v21.1d,v17.1d |
eor v18.16b,v18.16b,v3.16b //Karatsuba pre-processing |
- pmull2 v2.1q,v22.2d,v3.2d //H^2.hi·Xi.hi |
+ pmull2 v2.1q,v22.2d,v3.2d //H^2.hi·Xi.hi |
eor v0.16b,v0.16b,v4.16b //accumulate |
- pmull2 v1.1q,v21.2d,v18.2d //(H^2.lo+H^2.hi)·(Xi.lo+Xi.hi) |
+ pmull2 v1.1q,v21.2d,v18.2d //(H^2.lo+H^2.hi)·(Xi.lo+Xi.hi) |
ld1 {v16.2d},[x2],x12 //load [rotated] I[i+2] |
eor v2.16b,v2.16b,v6.16b |
@@ -176,7 +179,7 @@ gcm_ghash_v8: |
ext v7.16b,v17.16b,v17.16b,#8 |
ext v3.16b,v16.16b,v16.16b,#8 |
eor v0.16b,v1.16b,v18.16b |
- pmull v4.1q,v20.1d,v7.1d //H·Ii+1 |
+ pmull v4.1q,v20.1d,v7.1d //H·Ii+1 |
eor v3.16b,v3.16b,v2.16b //accumulate v3.16b early |
ext v18.16b,v0.16b,v0.16b,#8 //2nd phase of reduction |
@@ -197,10 +200,10 @@ gcm_ghash_v8: |
eor v3.16b,v3.16b,v0.16b //inp^=Xi |
eor v17.16b,v16.16b,v18.16b //v17.16b is rotated inp^Xi |
- pmull v0.1q,v20.1d,v3.1d //H.lo·Xi.lo |
+ pmull v0.1q,v20.1d,v3.1d //H.lo·Xi.lo |
eor v17.16b,v17.16b,v3.16b //Karatsuba pre-processing |
- pmull2 v2.1q,v20.2d,v3.2d //H.hi·Xi.hi |
- pmull v1.1q,v21.1d,v17.1d //(H.lo+H.hi)·(Xi.lo+Xi.hi) |
+ pmull2 v2.1q,v20.2d,v3.2d //H.hi·Xi.hi |
+ pmull v1.1q,v21.1d,v17.1d //(H.lo+H.hi)·(Xi.lo+Xi.hi) |
ext v17.16b,v0.16b,v2.16b,#8 //Karatsuba post-processing |
eor v18.16b,v0.16b,v2.16b |
@@ -229,4 +232,4 @@ gcm_ghash_v8: |
.byte 71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 |
.align 2 |
.align 2 |
-#endif |
+#endif |