diff options
-rw-r--r-- | libbb/hash_md5_sha_x86-32_shaNI.S | 8 | ||||
-rw-r--r-- | libbb/hash_md5_sha_x86-64.S | 14 | ||||
-rwxr-xr-x | libbb/hash_md5_sha_x86-64.S.sh | 14 | ||||
-rw-r--r-- | libbb/hash_md5_sha_x86-64_shaNI.S | 8 |
4 files changed, 22 insertions, 22 deletions
diff --git a/libbb/hash_md5_sha_x86-32_shaNI.S b/libbb/hash_md5_sha_x86-32_shaNI.S index 6b12d1462..166cfd38a 100644 --- a/libbb/hash_md5_sha_x86-32_shaNI.S +++ b/libbb/hash_md5_sha_x86-32_shaNI.S | |||
@@ -18,11 +18,11 @@ | |||
18 | #define shuf128_32 shufps | 18 | #define shuf128_32 shufps |
19 | 19 | ||
20 | #define extr128_32 pextrd | 20 | #define extr128_32 pextrd |
21 | //#define extr128_32 extractps # not shorter | 21 | //#define extr128_32 extractps # not shorter |
22 | 22 | ||
23 | .section .text.sha1_process_block64_shaNI,"ax",@progbits | 23 | .section .text.sha1_process_block64_shaNI,"ax",@progbits |
24 | .globl sha1_process_block64_shaNI | 24 | .globl sha1_process_block64_shaNI |
25 | .hidden sha1_process_block64_shaNI | 25 | .hidden sha1_process_block64_shaNI |
26 | .type sha1_process_block64_shaNI, @function | 26 | .type sha1_process_block64_shaNI, @function |
27 | 27 | ||
28 | #define ABCD %xmm0 | 28 | #define ABCD %xmm0 |
@@ -221,7 +221,7 @@ sha1_process_block64_shaNI: | |||
221 | movl %ebp, %esp | 221 | movl %ebp, %esp |
222 | popl %ebp | 222 | popl %ebp |
223 | ret | 223 | ret |
224 | .size sha1_process_block64_shaNI, .-sha1_process_block64_shaNI | 224 | .size sha1_process_block64_shaNI, .-sha1_process_block64_shaNI |
225 | 225 | ||
226 | .section .rodata.cst16.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 16 | 226 | .section .rodata.cst16.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 16 |
227 | .align 16 | 227 | .align 16 |
diff --git a/libbb/hash_md5_sha_x86-64.S b/libbb/hash_md5_sha_x86-64.S index ff78fc049..87fb616a1 100644 --- a/libbb/hash_md5_sha_x86-64.S +++ b/libbb/hash_md5_sha_x86-64.S | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__) | 3 | #if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__) |
4 | .section .text.sha1_process_block64,"ax",@progbits | 4 | .section .text.sha1_process_block64,"ax",@progbits |
5 | .globl sha1_process_block64 | 5 | .globl sha1_process_block64 |
6 | .hidden sha1_process_block64 | 6 | .hidden sha1_process_block64 |
7 | .type sha1_process_block64, @function | 7 | .type sha1_process_block64, @function |
8 | 8 | ||
9 | .balign 8 # allow decoders to fetch at least 5 first insns | 9 | .balign 8 # allow decoders to fetch at least 5 first insns |
@@ -1273,15 +1273,15 @@ sha1_process_block64: | |||
1273 | 1273 | ||
1274 | popq %rdi # | 1274 | popq %rdi # |
1275 | popq %r12 # | 1275 | popq %r12 # |
1276 | addl %eax, 80(%rdi) # ctx->hash[0] += a | 1276 | addl %eax, 80(%rdi) # ctx->hash[0] += a |
1277 | popq %r13 # | 1277 | popq %r13 # |
1278 | addl %ebx, 84(%rdi) # ctx->hash[1] += b | 1278 | addl %ebx, 84(%rdi) # ctx->hash[1] += b |
1279 | popq %r14 # | 1279 | popq %r14 # |
1280 | addl %ecx, 88(%rdi) # ctx->hash[2] += c | 1280 | addl %ecx, 88(%rdi) # ctx->hash[2] += c |
1281 | popq %r15 # | 1281 | popq %r15 # |
1282 | addl %edx, 92(%rdi) # ctx->hash[3] += d | 1282 | addl %edx, 92(%rdi) # ctx->hash[3] += d |
1283 | popq %rbx # | 1283 | popq %rbx # |
1284 | addl %ebp, 96(%rdi) # ctx->hash[4] += e | 1284 | addl %ebp, 96(%rdi) # ctx->hash[4] += e |
1285 | popq %rbp # | 1285 | popq %rbp # |
1286 | 1286 | ||
1287 | ret | 1287 | ret |
diff --git a/libbb/hash_md5_sha_x86-64.S.sh b/libbb/hash_md5_sha_x86-64.S.sh index 7e50b64fb..eef009590 100755 --- a/libbb/hash_md5_sha_x86-64.S.sh +++ b/libbb/hash_md5_sha_x86-64.S.sh | |||
@@ -11,8 +11,8 @@ echo \ | |||
11 | 11 | ||
12 | #if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__) | 12 | #if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__) |
13 | .section .text.sha1_process_block64,"ax",@progbits | 13 | .section .text.sha1_process_block64,"ax",@progbits |
14 | .globl sha1_process_block64 | 14 | .globl sha1_process_block64 |
15 | .hidden sha1_process_block64 | 15 | .hidden sha1_process_block64 |
16 | .type sha1_process_block64, @function | 16 | .type sha1_process_block64, @function |
17 | 17 | ||
18 | .balign 8 # allow decoders to fetch at least 5 first insns | 18 | .balign 8 # allow decoders to fetch at least 5 first insns |
@@ -265,15 +265,15 @@ RD2 ax bx cx dx bp 75; RD2 bp ax bx cx dx 76; RD2 dx bp ax bx cx 77; RD2 cx dx b | |||
265 | echo " | 265 | echo " |
266 | popq %rdi # | 266 | popq %rdi # |
267 | popq %r12 # | 267 | popq %r12 # |
268 | addl %eax, 80(%rdi) # ctx->hash[0] += a | 268 | addl %eax, 80(%rdi) # ctx->hash[0] += a |
269 | popq %r13 # | 269 | popq %r13 # |
270 | addl %ebx, 84(%rdi) # ctx->hash[1] += b | 270 | addl %ebx, 84(%rdi) # ctx->hash[1] += b |
271 | popq %r14 # | 271 | popq %r14 # |
272 | addl %ecx, 88(%rdi) # ctx->hash[2] += c | 272 | addl %ecx, 88(%rdi) # ctx->hash[2] += c |
273 | popq %r15 # | 273 | popq %r15 # |
274 | addl %edx, 92(%rdi) # ctx->hash[3] += d | 274 | addl %edx, 92(%rdi) # ctx->hash[3] += d |
275 | popq %rbx # | 275 | popq %rbx # |
276 | addl %ebp, 96(%rdi) # ctx->hash[4] += e | 276 | addl %ebp, 96(%rdi) # ctx->hash[4] += e |
277 | popq %rbp # | 277 | popq %rbp # |
278 | 278 | ||
279 | ret | 279 | ret |
diff --git a/libbb/hash_md5_sha_x86-64_shaNI.S b/libbb/hash_md5_sha_x86-64_shaNI.S index e2e5357e0..33cc3bf7f 100644 --- a/libbb/hash_md5_sha_x86-64_shaNI.S +++ b/libbb/hash_md5_sha_x86-64_shaNI.S | |||
@@ -18,11 +18,11 @@ | |||
18 | #define shuf128_32 shufps | 18 | #define shuf128_32 shufps |
19 | 19 | ||
20 | #define extr128_32 pextrd | 20 | #define extr128_32 pextrd |
21 | //#define extr128_32 extractps # not shorter | 21 | //#define extr128_32 extractps # not shorter |
22 | 22 | ||
23 | .section .text.sha1_process_block64_shaNI,"ax",@progbits | 23 | .section .text.sha1_process_block64_shaNI,"ax",@progbits |
24 | .globl sha1_process_block64_shaNI | 24 | .globl sha1_process_block64_shaNI |
25 | .hidden sha1_process_block64_shaNI | 25 | .hidden sha1_process_block64_shaNI |
26 | .type sha1_process_block64_shaNI, @function | 26 | .type sha1_process_block64_shaNI, @function |
27 | 27 | ||
28 | #define ABCD %xmm0 | 28 | #define ABCD %xmm0 |
@@ -215,7 +215,7 @@ sha1_process_block64_shaNI: | |||
215 | extr128_32 $3, E0, 80+4*4(%rdi) | 215 | extr128_32 $3, E0, 80+4*4(%rdi) |
216 | 216 | ||
217 | ret | 217 | ret |
218 | .size sha1_process_block64_shaNI, .-sha1_process_block64_shaNI | 218 | .size sha1_process_block64_shaNI, .-sha1_process_block64_shaNI |
219 | 219 | ||
220 | .section .rodata.cst16.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 16 | 220 | .section .rodata.cst16.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 16 |
221 | .align 16 | 221 | .align 16 |