The branch master has been updated
via bdbd3aea590e45d52c7b120ea6eaff38295b5011 (commit)
from 359aa38fbeecd920a60c739c64cda06fe295684f (commit)
- Log -----------------------------------------------------------------
commit bdbd3aea590e45d52c7b120ea6eaff38295b5011
Author: David Benjamin <david...@google.com>
Date: Tue Feb 23 11:41:55 2016 -0500
Consistently use arm_arch.h constants in armcap assembly code.
Most of the assembly uses constants from arm_arch.h, but a few references to
ARMV7_NEON don't. Consistently use the macros everywhere.
Signed-off-by: Andy Polyakov <ap...@openssl.org>
Reviewed-by: Rich Salz <rs...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/bn/asm/armv4-mont.pl | 2 +-
crypto/chacha/asm/chacha-armv4.pl | 2 +-
crypto/poly1305/asm/poly1305-armv4.pl | 2 +-
crypto/sha/asm/sha512-armv4.pl | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl
index 7017ad5..6fb5bb4 100644
--- a/crypto/bn/asm/armv4-mont.pl
+++ b/crypto/bn/asm/armv4-mont.pl
@@ -121,7 +121,7 @@ bn_mul_mont:
#ifdef __APPLE__
ldr r0,[r0]
#endif
- tst r0,#1 @ NEON available?
+ tst r0,#ARMV7_NEON @ NEON available?
ldmia sp, {r0,r2}
beq .Lialu
add sp,sp,#8
diff --git a/crypto/chacha/asm/chacha-armv4.pl
b/crypto/chacha/asm/chacha-armv4.pl
index 6c20755..4545101 100755
--- a/crypto/chacha/asm/chacha-armv4.pl
+++ b/crypto/chacha/asm/chacha-armv4.pl
@@ -214,7 +214,7 @@ ChaCha20_ctr32:
# ifdef __APPLE__
ldr r4,[r4]
# endif
- tst r4,#1
+ tst r4,#ARMV7_NEON
bne .LChaCha20_neon
.Lshort:
#endif
diff --git a/crypto/poly1305/asm/poly1305-armv4.pl
b/crypto/poly1305/asm/poly1305-armv4.pl
index 65b79cf..86a6070 100755
--- a/crypto/poly1305/asm/poly1305-armv4.pl
+++ b/crypto/poly1305/asm/poly1305-armv4.pl
@@ -108,7 +108,7 @@ poly1305_init:
and r5,r5,r3
#if __ARM_MAX_ARCH__>=7
- tst r12,#1 @ check for NEON
+ tst r12,#ARMV7_NEON @ check for NEON
# ifdef __APPLE__
adr r9,poly1305_blocks_neon
adr r11,poly1305_blocks
diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl
index 56bb9fd..9e3c4db 100644
--- a/crypto/sha/asm/sha512-armv4.pl
+++ b/crypto/sha/asm/sha512-armv4.pl
@@ -287,7 +287,7 @@ sha512_block_data_order:
#ifdef __APPLE__
ldr r12,[r12]
#endif
- tst r12,#1
+ tst r12,#ARMV7_NEON
bne .LNEON
#endif
add $len,$inp,$len,lsl#7 @ len to point at the end of inp
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
