提交 bdbd3aea 编写于 作者: D David Benjamin 提交者: Andy Polyakov

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: NAndy Polyakov <appro@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 359aa38f
...@@ -121,7 +121,7 @@ bn_mul_mont: ...@@ -121,7 +121,7 @@ bn_mul_mont:
#ifdef __APPLE__ #ifdef __APPLE__
ldr r0,[r0] ldr r0,[r0]
#endif #endif
tst r0,#1 @ NEON available? tst r0,#ARMV7_NEON @ NEON available?
ldmia sp, {r0,r2} ldmia sp, {r0,r2}
beq .Lialu beq .Lialu
add sp,sp,#8 add sp,sp,#8
......
...@@ -214,7 +214,7 @@ ChaCha20_ctr32: ...@@ -214,7 +214,7 @@ ChaCha20_ctr32:
# ifdef __APPLE__ # ifdef __APPLE__
ldr r4,[r4] ldr r4,[r4]
# endif # endif
tst r4,#1 tst r4,#ARMV7_NEON
bne .LChaCha20_neon bne .LChaCha20_neon
.Lshort: .Lshort:
#endif #endif
......
...@@ -108,7 +108,7 @@ poly1305_init: ...@@ -108,7 +108,7 @@ poly1305_init:
and r5,r5,r3 and r5,r5,r3
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
tst r12,#1 @ check for NEON tst r12,#ARMV7_NEON @ check for NEON
# ifdef __APPLE__ # ifdef __APPLE__
adr r9,poly1305_blocks_neon adr r9,poly1305_blocks_neon
adr r11,poly1305_blocks adr r11,poly1305_blocks
......
...@@ -287,7 +287,7 @@ sha512_block_data_order: ...@@ -287,7 +287,7 @@ sha512_block_data_order:
#ifdef __APPLE__ #ifdef __APPLE__
ldr r12,[r12] ldr r12,[r12]
#endif #endif
tst r12,#1 tst r12,#ARMV7_NEON
bne .LNEON bne .LNEON
#endif #endif
add $len,$inp,$len,lsl#7 @ len to point at the end of inp add $len,$inp,$len,lsl#7 @ len to point at the end of inp
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册