mirror of https://github.com/openssl/openssl.git
aes/asm/bsaes-armv7.pl: omit redundant stores in XTS subroutines.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 4973a60cb9)
This commit is contained in:
parent
b62e9bf5cb
commit
c3bc7f4988
|
|
@ -1797,8 +1797,6 @@ $code.=<<___;
|
||||||
b .Lxts_enc_done
|
b .Lxts_enc_done
|
||||||
.align 4
|
.align 4
|
||||||
.Lxts_enc_6:
|
.Lxts_enc_6:
|
||||||
vst1.64 {@XMM[14]}, [r0,:128] @ next round tweak
|
|
||||||
|
|
||||||
veor @XMM[4], @XMM[4], @XMM[12]
|
veor @XMM[4], @XMM[4], @XMM[12]
|
||||||
#ifndef BSAES_ASM_EXTENDED_KEY
|
#ifndef BSAES_ASM_EXTENDED_KEY
|
||||||
add r4, sp, #0x90 @ pass key schedule
|
add r4, sp, #0x90 @ pass key schedule
|
||||||
|
|
@ -1834,8 +1832,6 @@ $code.=<<___;
|
||||||
|
|
||||||
.align 5
|
.align 5
|
||||||
.Lxts_enc_5:
|
.Lxts_enc_5:
|
||||||
vst1.64 {@XMM[13]}, [r0,:128] @ next round tweak
|
|
||||||
|
|
||||||
veor @XMM[3], @XMM[3], @XMM[11]
|
veor @XMM[3], @XMM[3], @XMM[11]
|
||||||
#ifndef BSAES_ASM_EXTENDED_KEY
|
#ifndef BSAES_ASM_EXTENDED_KEY
|
||||||
add r4, sp, #0x90 @ pass key schedule
|
add r4, sp, #0x90 @ pass key schedule
|
||||||
|
|
@ -1864,8 +1860,6 @@ $code.=<<___;
|
||||||
b .Lxts_enc_done
|
b .Lxts_enc_done
|
||||||
.align 4
|
.align 4
|
||||||
.Lxts_enc_4:
|
.Lxts_enc_4:
|
||||||
vst1.64 {@XMM[12]}, [r0,:128] @ next round tweak
|
|
||||||
|
|
||||||
veor @XMM[2], @XMM[2], @XMM[10]
|
veor @XMM[2], @XMM[2], @XMM[10]
|
||||||
#ifndef BSAES_ASM_EXTENDED_KEY
|
#ifndef BSAES_ASM_EXTENDED_KEY
|
||||||
add r4, sp, #0x90 @ pass key schedule
|
add r4, sp, #0x90 @ pass key schedule
|
||||||
|
|
@ -1891,8 +1885,6 @@ $code.=<<___;
|
||||||
b .Lxts_enc_done
|
b .Lxts_enc_done
|
||||||
.align 4
|
.align 4
|
||||||
.Lxts_enc_3:
|
.Lxts_enc_3:
|
||||||
vst1.64 {@XMM[11]}, [r0,:128] @ next round tweak
|
|
||||||
|
|
||||||
veor @XMM[1], @XMM[1], @XMM[9]
|
veor @XMM[1], @XMM[1], @XMM[9]
|
||||||
#ifndef BSAES_ASM_EXTENDED_KEY
|
#ifndef BSAES_ASM_EXTENDED_KEY
|
||||||
add r4, sp, #0x90 @ pass key schedule
|
add r4, sp, #0x90 @ pass key schedule
|
||||||
|
|
@ -1917,8 +1909,6 @@ $code.=<<___;
|
||||||
b .Lxts_enc_done
|
b .Lxts_enc_done
|
||||||
.align 4
|
.align 4
|
||||||
.Lxts_enc_2:
|
.Lxts_enc_2:
|
||||||
vst1.64 {@XMM[10]}, [r0,:128] @ next round tweak
|
|
||||||
|
|
||||||
veor @XMM[0], @XMM[0], @XMM[8]
|
veor @XMM[0], @XMM[0], @XMM[8]
|
||||||
#ifndef BSAES_ASM_EXTENDED_KEY
|
#ifndef BSAES_ASM_EXTENDED_KEY
|
||||||
add r4, sp, #0x90 @ pass key schedule
|
add r4, sp, #0x90 @ pass key schedule
|
||||||
|
|
@ -1941,7 +1931,7 @@ $code.=<<___;
|
||||||
.align 4
|
.align 4
|
||||||
.Lxts_enc_1:
|
.Lxts_enc_1:
|
||||||
mov r0, sp
|
mov r0, sp
|
||||||
veor @XMM[0], @XMM[8]
|
veor @XMM[0], @XMM[0], @XMM[8]
|
||||||
mov r1, sp
|
mov r1, sp
|
||||||
vst1.8 {@XMM[0]}, [sp,:128]
|
vst1.8 {@XMM[0]}, [sp,:128]
|
||||||
mov r2, $key
|
mov r2, $key
|
||||||
|
|
@ -2251,8 +2241,6 @@ $code.=<<___;
|
||||||
b .Lxts_dec_done
|
b .Lxts_dec_done
|
||||||
.align 4
|
.align 4
|
||||||
.Lxts_dec_5:
|
.Lxts_dec_5:
|
||||||
vst1.64 {@XMM[13]}, [r0,:128] @ next round tweak
|
|
||||||
|
|
||||||
veor @XMM[3], @XMM[3], @XMM[11]
|
veor @XMM[3], @XMM[3], @XMM[11]
|
||||||
#ifndef BSAES_ASM_EXTENDED_KEY
|
#ifndef BSAES_ASM_EXTENDED_KEY
|
||||||
add r4, sp, #0x90 @ pass key schedule
|
add r4, sp, #0x90 @ pass key schedule
|
||||||
|
|
@ -2281,8 +2269,6 @@ $code.=<<___;
|
||||||
b .Lxts_dec_done
|
b .Lxts_dec_done
|
||||||
.align 4
|
.align 4
|
||||||
.Lxts_dec_4:
|
.Lxts_dec_4:
|
||||||
vst1.64 {@XMM[12]}, [r0,:128] @ next round tweak
|
|
||||||
|
|
||||||
veor @XMM[2], @XMM[2], @XMM[10]
|
veor @XMM[2], @XMM[2], @XMM[10]
|
||||||
#ifndef BSAES_ASM_EXTENDED_KEY
|
#ifndef BSAES_ASM_EXTENDED_KEY
|
||||||
add r4, sp, #0x90 @ pass key schedule
|
add r4, sp, #0x90 @ pass key schedule
|
||||||
|
|
@ -2308,8 +2294,6 @@ $code.=<<___;
|
||||||
b .Lxts_dec_done
|
b .Lxts_dec_done
|
||||||
.align 4
|
.align 4
|
||||||
.Lxts_dec_3:
|
.Lxts_dec_3:
|
||||||
vst1.64 {@XMM[11]}, [r0,:128] @ next round tweak
|
|
||||||
|
|
||||||
veor @XMM[1], @XMM[1], @XMM[9]
|
veor @XMM[1], @XMM[1], @XMM[9]
|
||||||
#ifndef BSAES_ASM_EXTENDED_KEY
|
#ifndef BSAES_ASM_EXTENDED_KEY
|
||||||
add r4, sp, #0x90 @ pass key schedule
|
add r4, sp, #0x90 @ pass key schedule
|
||||||
|
|
@ -2334,8 +2318,6 @@ $code.=<<___;
|
||||||
b .Lxts_dec_done
|
b .Lxts_dec_done
|
||||||
.align 4
|
.align 4
|
||||||
.Lxts_dec_2:
|
.Lxts_dec_2:
|
||||||
vst1.64 {@XMM[10]}, [r0,:128] @ next round tweak
|
|
||||||
|
|
||||||
veor @XMM[0], @XMM[0], @XMM[8]
|
veor @XMM[0], @XMM[0], @XMM[8]
|
||||||
#ifndef BSAES_ASM_EXTENDED_KEY
|
#ifndef BSAES_ASM_EXTENDED_KEY
|
||||||
add r4, sp, #0x90 @ pass key schedule
|
add r4, sp, #0x90 @ pass key schedule
|
||||||
|
|
@ -2358,7 +2340,7 @@ $code.=<<___;
|
||||||
.align 4
|
.align 4
|
||||||
.Lxts_dec_1:
|
.Lxts_dec_1:
|
||||||
mov r0, sp
|
mov r0, sp
|
||||||
veor @XMM[0], @XMM[8]
|
veor @XMM[0], @XMM[0], @XMM[8]
|
||||||
mov r1, sp
|
mov r1, sp
|
||||||
vst1.8 {@XMM[0]}, [sp,:128]
|
vst1.8 {@XMM[0]}, [sp,:128]
|
||||||
mov r5, $magic @ preserve magic
|
mov r5, $magic @ preserve magic
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue