Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix {x,}chacha_{armv6,neon} to follow arm calling convention #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix {x,}chacha_{armv6,neon} to follow arm calling convention #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions app/extensions/chacha/chacha_armv6-32.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,27 +426,27 @@ FN_END hchacha_armv6
.ltorg

GLOBAL_HIDDEN_FN chacha_armv6
stmfd sp!, {r4-r7, lr}
stmfd sp!, {r4-r8, lr}
mov r12, sp
sub sp, sp, #64
and sp, sp, #0xffffff80
mov r8, sp
ldmia r0!, {r4-r7}
stmia sp!, {r4-r7}
stmia r8!, {r4-r7}
ldmia r0!, {r4-r7}
stmia sp!, {r4-r7}
stmia r8!, {r4-r7}
eor r4, r4, r4
eor r5, r5, r5
mov r7, r12
stmia sp!, {r4-r5}
stmia r8!, {r4-r5}
ldmia r1!, {r4-r5}
stmia sp!, {r4-r5}
ldr r4, [r7, #24]
str r4, [sp]
sub sp, sp, #48
stmia r8!, {r4-r5}
ldr r4, [r7, #28]
str r4, [r8]
mov r0, sp
mov r1, r2
mov r2, r3
ldr r3, [r7, #20]
ldr r3, [r7, #24]
bl chacha_blocks_armv6_local
eor r0, r0, r0
eor r1, r1, r1
Expand All @@ -456,35 +456,34 @@ stmia sp!, {r0-r3}
stmia sp!, {r0-r3}
stmia sp!, {r0-r3}
mov sp, r7
ldmfd sp!, {r4-r7, lr}
ldmfd sp!, {r4-r8, lr}
bx lr
FN_END chacha_armv6


GLOBAL_HIDDEN_FN xchacha_armv6
stmfd sp!, {r4-r6, lr}
stmfd sp!, {r4-r8, lr}
mov r7, sp
sub sp, sp, #64
and sp, sp, #0xffffff80
mov r4, r2
mov r5, r3
add r6, r1, #16
mov r2, sp
ldr r3, [r7, #20]
ldr r3, [r7, #28]
bl hchacha_armv6_local
eor r0, r0, r0
eor r1, r1, r1
add sp, sp, #32
stmia sp!, {r0-r1}
add r8, sp, #32
stmia r8!, {r0-r1}
ldm r6, {r0-r1}
stmia sp!, {r0-r1}
ldr r2, [r7, #20]
str r2, [sp]
sub sp, sp, #48
stmia r8!, {r0-r1}
ldr r2, [r7, #28]
str r2, [r8]
mov r0, sp
mov r1, r4
mov r2, r5
ldr r3, [r7, #16]
ldr r3, [r7, #24]
bl chacha_blocks_armv6_local
eor r0, r0, r0
eor r1, r1, r1
Expand All @@ -494,7 +493,7 @@ stmia sp!, {r0-r3}
stmia sp!, {r0-r3}
stmia sp!, {r0-r3}
mov sp, r7
ldmfd sp!, {r4-r6, lr}
ldmfd sp!, {r4-r8, lr}
bx lr
FN_END xchacha_armv6

39 changes: 19 additions & 20 deletions app/extensions/chacha/chacha_neon-32.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,27 +821,27 @@ FN_END hchacha_neon
.ltorg

GLOBAL_HIDDEN_FN chacha_neon
stmfd sp!, {r4-r7, lr}
stmfd sp!, {r4-r8, lr}
mov r12, sp
sub sp, sp, #64
and sp, sp, #0xffffff80
mov r8, sp
ldmia r0!, {r4-r7}
stmia sp!, {r4-r7}
stmia r8!, {r4-r7}
ldmia r0!, {r4-r7}
stmia sp!, {r4-r7}
stmia r8!, {r4-r7}
eor r4, r4, r4
eor r5, r5, r5
mov r7, r12
stmia sp!, {r4-r5}
stmia r8!, {r4-r5}
ldmia r1!, {r4-r5}
stmia sp!, {r4-r5}
ldr r4, [r7, #24]
str r4, [sp]
sub sp, sp, #48
stmia r8!, {r4-r5}
ldr r4, [r7, #28]
str r4, [r8]
mov r0, sp
mov r1, r2
mov r2, r3
ldr r3, [r7, #20]
ldr r3, [r7, #24]
bl chacha_blocks_neon_local
eor r0, r0, r0
eor r1, r1, r1
Expand All @@ -851,35 +851,34 @@ stmia sp!, {r0-r3}
stmia sp!, {r0-r3}
stmia sp!, {r0-r3}
mov sp, r7
ldmfd sp!, {r4-r7, lr}
ldmfd sp!, {r4-r8, lr}
bx lr
FN_END chacha_neon


GLOBAL_HIDDEN_FN xchacha_neon
stmfd sp!, {r4-r6, lr}
stmfd sp!, {r4-r8, lr}
mov r7, sp
sub sp, sp, #64
and sp, sp, #0xffffff80
mov r4, r2
mov r5, r3
add r6, r1, #16
mov r2, sp
ldr r3, [r7, #20]
ldr r3, [r7, #28]
bl hchacha_neon_local
eor r0, r0, r0
eor r1, r1, r1
add sp, sp, #32
stmia sp!, {r0-r1}
add r8, sp, #32
stmia r8!, {r0-r1}
ldm r6, {r0-r1}
stmia sp!, {r0-r1}
ldr r2, [r7, #20]
str r2, [sp]
sub sp, sp, #48
stmia r8!, {r0-r1}
ldr r2, [r7, #28]
str r2, [r8]
mov r0, sp
mov r1, r4
mov r2, r5
ldr r3, [r7, #16]
ldr r3, [r7, #24]
bl chacha_blocks_neon_local
eor r0, r0, r0
eor r1, r1, r1
Expand All @@ -889,7 +888,7 @@ stmia sp!, {r0-r3}
stmia sp!, {r0-r3}
stmia sp!, {r0-r3}
mov sp, r7
ldmfd sp!, {r4-r6, lr}
ldmfd sp!, {r4-r8, lr}
bx lr
FN_END xchacha_neon