generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sha/asm/sha256-armv4.pl: one of "universal" flags combination didn't compile.

Browse Source 
(and unify table address calculation in ARMv8 code path).

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Andy Polyakov 2015-12-15 21:43:56 +01:00
parent 79caf5d323
commit cfe670732b
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/sha/asm/sha256-armv4.pl
View File

@ -178,7 +178,6 @@ $code=<<___;
#if defined(__thumb2__) #if defined(__thumb2__)
.syntax unified .syntax unified
.thumb .thumb
# define adrl adr
#else #else
.code 32 .code 32
#endif #endif
@ -469,7 +468,8 @@ $code.=<<___;
.global sha256_block_data_order_neon .global sha256_block_data_order_neon
.type sha256_block_data_order_neon,%function .type sha256_block_data_order_neon,%function
.align 4 .align 5
.skip 16
sha256_block_data_order_neon: sha256_block_data_order_neon:
.LNEON: .LNEON:
stmdb sp!,{r4-r12,lr} stmdb sp!,{r4-r12,lr}
@ -606,16 +606,11 @@ $code.=<<___;
sha256_block_data_order_armv8: sha256_block_data_order_armv8:
.LARMv8: .LARMv8:
vld1.32 {$ABCD,$EFGH},[$ctx] vld1.32 {$ABCD,$EFGH},[$ctx]
# ifdef __APPLE__
sub $Ktbl,$Ktbl,#256+32 sub $Ktbl,$Ktbl,#256+32
# elif defined(__thumb2__)
adr $Ktbl,.LARMv8
sub $Ktbl,$Ktbl,#.LARMv8-K256
# else
adrl $Ktbl,K256
# endif
add $len,$inp,$len,lsl#6 @ len to point at the end of inp add $len,$inp,$len,lsl#6 @ len to point at the end of inp
b .Loop_v8
.align 4
.Loop_v8: .Loop_v8:
vld1.8 {@MSG[0]-@MSG[1]},[$inp]! vld1.8 {@MSG[0]-@MSG[1]},[$inp]!
vld1.8 {@MSG[2]-@MSG[3]},[$inp]! vld1.8 {@MSG[2]-@MSG[3]},[$inp]!