aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2017-06-01 16:34:51 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2017-06-01 16:41:29 +0200
commit4065fd1f157f0c032d08dd18934d24aefa215a2c (patch)
treed4051cae94bc2dfaca8495595f06b1eaadb3c6d0
parentdevice: do-while assignment style (diff)
downloadwireguard-monolithic-historical-4065fd1f157f0c032d08dd18934d24aefa215a2c.tar.xz
wireguard-monolithic-historical-4065fd1f157f0c032d08dd18934d24aefa215a2c.zip
curve25519: use more standard label convention in asm
-rw-r--r--src/crypto/curve25519-avx-x86_64.S24
-rw-r--r--src/crypto/curve25519-neon-arm.S24
2 files changed, 24 insertions, 24 deletions
diff --git a/src/crypto/curve25519-avx-x86_64.S b/src/crypto/curve25519-avx-x86_64.S
index bd660ef..81d0c74 100644
--- a/src/crypto/curve25519-avx-x86_64.S
+++ b/src/crypto/curve25519-avx-x86_64.S
@@ -225,7 +225,7 @@ ENTRY(curve25519_sandy2x_fe51_nsquare)
mov %rdx,%rsi
.align 16
- ._loop:
+ .Lloop:
sub $1,%rsi
mov %rcx,%rax
mul %rcx
@@ -337,7 +337,7 @@ ENTRY(curve25519_sandy2x_fe51_nsquare)
and %rdx,%r10
movq %r10,32(%rdi)
cmp $0,%rsi
- jne ._loop
+ jne .Lloop
movq %rcx,0(%rdi)
movq %r8,8(%rdi)
@@ -370,7 +370,7 @@ ENTRY(curve25519_sandy2x_fe51_pack)
mov $3,%r11
.align 16
- ._reduceloop:
+ .Lreduceloop:
mov %rdx,%r12
shr $51,%r12
and %rax,%rdx
@@ -393,7 +393,7 @@ ENTRY(curve25519_sandy2x_fe51_pack)
imulq $19, %r12,%r12
add %r12,%rdx
sub $1,%r11
- ja ._reduceloop
+ ja .Lreduceloop
mov $1,%r12
cmp %r10,%rdx
@@ -654,7 +654,7 @@ ENTRY(curve25519_sandy2x_ladder)
mov $64,%rax
.align 16
- ._ladder_small_loop:
+ .Lladder_small_loop:
mov %rdx,%r10
mov %rcx,%r11
mov %r8,%r12
@@ -677,12 +677,12 @@ ENTRY(curve25519_sandy2x_ladder)
movl %r13d,768(%rsi)
add $4,%rsi
sub $1,%rax
- jne ._ladder_small_loop
+ jne .Lladder_small_loop
mov $255,%rdx
add $760,%rsi
.align 16
- ._ladder_loop:
+ .Lladder_loop:
sub $1,%rdx
vbroadcastss 0(%rsi),%xmm10
sub $4,%rsi
@@ -1961,7 +1961,7 @@ ENTRY(curve25519_sandy2x_ladder)
vpunpckhqdq %xmm14,%xmm13,%xmm9
vpunpcklqdq %xmm14,%xmm13,%xmm8
cmp $0,%rdx
- jne ._ladder_loop
+ jne .Lladder_loop
vmovdqu %xmm1,160(%rdi)
vmovdqu %xmm0,80(%rdi)
vmovdqu %xmm3,176(%rdi)
@@ -2028,7 +2028,7 @@ ENTRY(curve25519_sandy2x_ladder_base)
mov $64,%rax
.align 16
- ._ladder_base_small_loop:
+ .Lladder_base_small_loop:
mov %rdx,%r10
mov %rcx,%r11
mov %r8,%r12
@@ -2051,12 +2051,12 @@ ENTRY(curve25519_sandy2x_ladder_base)
movl %r13d,768(%rsi)
add $4,%rsi
sub $1,%rax
- jne ._ladder_base_small_loop
+ jne .Lladder_base_small_loop
mov $255,%rdx
add $760,%rsi
.align 16
- ._ladder_base_loop:
+ .Lladder_base_loop:
sub $1,%rdx
vbroadcastss 0(%rsi),%xmm10
sub $4,%rsi
@@ -3240,7 +3240,7 @@ ENTRY(curve25519_sandy2x_ladder_base)
vpunpckhqdq %xmm14,%xmm13,%xmm9
vpunpcklqdq %xmm14,%xmm13,%xmm8
cmp $0,%rdx
- jne ._ladder_base_loop
+ jne .Lladder_base_loop
vmovdqu %xmm1,80(%rdi)
vmovdqu %xmm0,0(%rdi)
vmovdqu %xmm3,96(%rdi)
diff --git a/src/crypto/curve25519-neon-arm.S b/src/crypto/curve25519-neon-arm.S
index 338ea92..1fd7331 100644
--- a/src/crypto/curve25519-neon-arm.S
+++ b/src/crypto/curve25519-neon-arm.S
@@ -210,7 +210,7 @@ ENTRY(curve25519_asm_neon)
vst1.8 {d0-d1},[r6,: 128]!
vst1.8 {d2-d3},[r6,: 128]!
vst1.8 d4,[r6,: 64]
- ._mainloop:
+ .Lmainloop:
mov r2,r5,LSR #3
and r6,r5,#7
ldrb r2,[r1,r2]
@@ -1542,7 +1542,7 @@ ENTRY(curve25519_asm_neon)
ldr r2,[sp,#488]
ldr r4,[sp,#492]
subs r5,r2,#1
- bge ._mainloop
+ bge .Lmainloop
add r1,r3,#144
add r2,r3,#336
vld1.8 {d0-d1},[r1,: 128]!
@@ -1552,7 +1552,7 @@ ENTRY(curve25519_asm_neon)
vst1.8 {d2-d3},[r2,: 128]!
vst1.8 d4,[r2,: 64]
ldr r1,=0
- ._invertloop:
+ .Linvertloop:
add r2,r3,#144
ldr r4,=0
ldr r5,=2
@@ -1596,8 +1596,8 @@ ENTRY(curve25519_asm_neon)
vst1.8 {d2-d3},[r7,: 128]!
vst1.8 d4,[r7,: 64]
cmp r5,#0
- beq ._skipsquaringloop
- ._squaringloop:
+ beq .Lskipsquaringloop
+ .Lsquaringloop:
add r6,r3,#288
add r7,r3,#288
add r8,r3,#288
@@ -1787,8 +1787,8 @@ ENTRY(curve25519_asm_neon)
sub r6,r6,#32
vst1.8 d4,[r6,: 64]
subs r5,r5,#1
- bhi ._squaringloop
- ._skipsquaringloop:
+ bhi .Lsquaringloop
+ .Lskipsquaringloop:
mov r2,r2
add r5,r3,#288
add r6,r3,#144
@@ -1978,7 +1978,7 @@ ENTRY(curve25519_asm_neon)
sub r2,r2,#32
vst1.8 d4,[r2,: 64]
cmp r4,#0
- beq ._skippostcopy
+ beq .Lskippostcopy
add r2,r3,#144
mov r4,r4
vld1.8 {d0-d1},[r2,: 128]!
@@ -1987,9 +1987,9 @@ ENTRY(curve25519_asm_neon)
vst1.8 {d0-d1},[r4,: 128]!
vst1.8 {d2-d3},[r4,: 128]!
vst1.8 d4,[r4,: 64]
- ._skippostcopy:
+ .Lskippostcopy:
cmp r1,#1
- bne ._skipfinalcopy
+ bne .Lskipfinalcopy
add r2,r3,#288
add r4,r3,#144
vld1.8 {d0-d1},[r2,: 128]!
@@ -1998,10 +1998,10 @@ ENTRY(curve25519_asm_neon)
vst1.8 {d0-d1},[r4,: 128]!
vst1.8 {d2-d3},[r4,: 128]!
vst1.8 d4,[r4,: 64]
- ._skipfinalcopy:
+ .Lskipfinalcopy:
add r1,r1,#1
cmp r1,#12
- blo ._invertloop
+ blo .Linvertloop
add r1,r3,#144
ldr r2,[r1],#4
ldr r3,[r1],#4