wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix unwind info in crypto/rc4/asm/rc4-x86_64.pl

Browse source 
Move .cfi_startproc to the right place for RC4.  Add missing
.cfi_startproc and .cfi_endproc to RC4_options.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/10872)

(cherry picked from commit 967ef73013becef2aec3439f8c45204b24121018)
This commit is contained in:
H.J. Lu 2020-01-16 13:37:14 -08:00 committed by Bernd Edlinger
parent 609d24bbd7
commit d6116a9850
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crypto/rc4/asm/rc4-x86_64.pl
View file

@ -138,11 +138,12 @@ $code=<<___;
.globl RC4 .globl RC4
.type RC4,\@function,4 .type RC4,\@function,4
.align 16 .align 16
RC4: or $len,$len RC4:
.cfi_startproc
or $len,$len
jne .Lentry jne .Lentry
ret ret
.Lentry: .Lentry:
.cfi_startproc
push %rbx push %rbx
.cfi_push %rbx .cfi_push %rbx
push %r12 push %r12
@ -527,6 +528,7 @@ RC4_set_key:
.type RC4_options,\@abi-omnipotent .type RC4_options,\@abi-omnipotent
.align 16 .align 16
RC4_options: RC4_options:
.cfi_startproc
lea .Lopts(%rip),%rax lea .Lopts(%rip),%rax
mov OPENSSL_ia32cap_P(%rip),%edx mov OPENSSL_ia32cap_P(%rip),%edx
bt \$20,%edx bt \$20,%edx
@ -539,6 +541,7 @@ RC4_options:
add \$12,%rax add \$12,%rax
.Ldone: .Ldone:
ret ret
.cfi_endproc
.align 64 .align 64
.Lopts: .Lopts:
.asciz "rc4(8x,int)" .asciz "rc4(8x,int)"