Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aesarmv8: Reallocate registers to shave off unnecessary MOV.

Browse Source
This commit is contained in:
riastradh 2020-09-08 23:58:09 +00:00
parent f70af73535
commit c71abd7388
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/crypto/aes/arch/arm/aes_armv8_64.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: aes_armv8_64.S,v 1.14 2020/09/08 23:57:43 riastradh Exp $ */ /* $NetBSD: aes_armv8_64.S,v 1.15 2020/09/08 23:58:09 riastradh Exp $ */
/*- /*-
* Copyright (c) 2020 The NetBSD Foundation, Inc. * Copyright (c) 2020 The NetBSD Foundation, Inc.
@ -28,7 +28,7 @@
#include <aarch64/asm.h> #include <aarch64/asm.h>
RCSID("$NetBSD: aes_armv8_64.S,v 1.14 2020/09/08 23:57:43 riastradh Exp $") RCSID("$NetBSD: aes_armv8_64.S,v 1.15 2020/09/08 23:58:09 riastradh Exp $")
.arch_extension aes .arch_extension aes
@ -917,13 +917,12 @@ END(aesarmv8_cbcmac_update1)
ENTRY(aesarmv8_ccm_enc1) ENTRY(aesarmv8_ccm_enc1)
stp fp, lr, [sp, #-16]! /* push stack frame */ stp fp, lr, [sp, #-16]! /* push stack frame */
mov fp, sp mov fp, sp
ld1 {v0.16b, v1.16b}, [x4] /* q0 := auth, q2 := ctr (be) */ ld1 {v0.16b-v1.16b}, [x4] /* q0 := auth, q1 := ctr (be) */
mov v2.16b, v1.16b
adrl x11, ctr32_inc /* x11 := &ctr32_inc */ adrl x11, ctr32_inc /* x11 := &ctr32_inc */
ld1 {v5.4s}, [x11] /* q5 := (0,0,0,1) (host-endian) */ ld1 {v5.4s}, [x11] /* q5 := (0,0,0,1) (host-endian) */
mov x9, x0 /* x9 := enckey */ mov x9, x0 /* x9 := enckey */
mov x10, x3 /* x10 := nbytes */ mov x10, x3 /* x10 := nbytes */
rev32 v2.16b, v2.16b /* q2 := ctr (host-endian) */ rev32 v2.16b, v1.16b /* q2 := ctr (host-endian) */
_ALIGN_TEXT _ALIGN_TEXT
1: ld1 {v3.16b}, [x1], #0x10 /* q3 := plaintext block */ 1: ld1 {v3.16b}, [x1], #0x10 /* q3 := plaintext block */
add v2.4s, v2.4s, v5.4s /* increment ctr (32-bit) */ add v2.4s, v2.4s, v5.4s /* increment ctr (32-bit) */
@ -937,9 +936,8 @@ ENTRY(aesarmv8_ccm_enc1)
subs x10, x10, #0x10 /* count down bytes */ subs x10, x10, #0x10 /* count down bytes */
st1 {v3.16b}, [x2], #0x10 /* store ciphertext block */ st1 {v3.16b}, [x2], #0x10 /* store ciphertext block */
b.ne 1b /* repeat if more blocks */ b.ne 1b /* repeat if more blocks */
rev32 v2.16b, v2.16b /* q2 := ctr (big-endian) */ rev32 v1.16b, v2.16b /* q1 := ctr (big-endian) */
mov v1.16b, v2.16b /* store updated auth/ctr */ st1 {v0.16b-v1.16b}, [x4] /* store updated auth/ctr */
st1 {v0.16b-v1.16b}, [x4]
ldp fp, lr, [sp], #16 /* pop stack frame */ ldp fp, lr, [sp], #16 /* pop stack frame */
ret ret
END(aesarmv8_ccm_enc1) END(aesarmv8_ccm_enc1)