diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-06-06 10:26:34 -0700 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-06-06 15:04:40 -0700 |
commit | f82652e68eebdc513ebb78137ecce9e1393c2c4c (patch) | |
tree | 8e2e89b4888e1bd8fe62bd48b80650e96075e443 | |
parent | 737ba482cb9394eaea6c2bdcb4e69195edcccfce (diff) | |
download | node-f82652e68eebdc513ebb78137ecce9e1393c2c4c.tar.gz |
openssl: regenerate asm
-rw-r--r-- | deps/openssl/asm/x64-elf-gas/aes/aes-x86_64.s | 4 | ||||
-rw-r--r-- | deps/openssl/asm/x64-macosx-gas/aes/aes-x86_64.s | 4 | ||||
-rw-r--r-- | deps/openssl/asm/x64-macosx-gas/md5/md5-x86_64.s | 1 | ||||
-rw-r--r-- | deps/openssl/asm/x64-macosx-gas/rc4/rc4-x86_64.s | 1 | ||||
-rw-r--r-- | deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s | 1 | ||||
-rw-r--r-- | deps/openssl/asm/x64-win32-masm/aes/aes-x86_64.asm | 4 | ||||
-rw-r--r-- | deps/openssl/asm/x86-elf-gas/aes/aes-586.s | 2 | ||||
-rw-r--r-- | deps/openssl/asm/x86-elf-gas/x86cpuid.s | 2 | ||||
-rw-r--r-- | deps/openssl/asm/x86-macosx-gas/aes/aes-586.s | 2 | ||||
-rw-r--r-- | deps/openssl/asm/x86-macosx-gas/x86cpuid.s | 2 | ||||
-rw-r--r-- | deps/openssl/asm/x86-win32-masm/aes/aes-586.asm | 2 | ||||
-rw-r--r-- | deps/openssl/asm/x86-win32-masm/x86cpuid.asm | 2 |
12 files changed, 18 insertions, 9 deletions
diff --git a/deps/openssl/asm/x64-elf-gas/aes/aes-x86_64.s b/deps/openssl/asm/x64-elf-gas/aes/aes-x86_64.s index d7feffbfa..dec624ea5 100644 --- a/deps/openssl/asm/x64-elf-gas/aes/aes-x86_64.s +++ b/deps/openssl/asm/x64-elf-gas/aes/aes-x86_64.s @@ -1326,8 +1326,8 @@ AES_cbc_encrypt: jb .Lcbc_slow_prologue testq $15,%rdx jnz .Lcbc_slow_prologue - - + btl $28,%r10d + jc .Lcbc_slow_prologue leaq -88-248(%rsp),%r15 diff --git a/deps/openssl/asm/x64-macosx-gas/aes/aes-x86_64.s b/deps/openssl/asm/x64-macosx-gas/aes/aes-x86_64.s index d42e1ea79..b072f5ae7 100644 --- a/deps/openssl/asm/x64-macosx-gas/aes/aes-x86_64.s +++ b/deps/openssl/asm/x64-macosx-gas/aes/aes-x86_64.s @@ -1326,8 +1326,8 @@ L$cbc_picked_te: jb L$cbc_slow_prologue testq $15,%rdx jnz L$cbc_slow_prologue - - + btl $28,%r10d + jc L$cbc_slow_prologue leaq -88-248(%rsp),%r15 diff --git a/deps/openssl/asm/x64-macosx-gas/md5/md5-x86_64.s b/deps/openssl/asm/x64-macosx-gas/md5/md5-x86_64.s index 96f6ea16c..cdecac7b4 100644 --- a/deps/openssl/asm/x64-macosx-gas/md5/md5-x86_64.s +++ b/deps/openssl/asm/x64-macosx-gas/md5/md5-x86_64.s @@ -668,4 +668,3 @@ L$end: addq $40,%rsp L$epilogue: .byte 0xf3,0xc3 - diff --git a/deps/openssl/asm/x64-macosx-gas/rc4/rc4-x86_64.s b/deps/openssl/asm/x64-macosx-gas/rc4/rc4-x86_64.s index 41183cebe..d7926a690 100644 --- a/deps/openssl/asm/x64-macosx-gas/rc4/rc4-x86_64.s +++ b/deps/openssl/asm/x64-macosx-gas/rc4/rc4-x86_64.s @@ -427,4 +427,3 @@ L$opts: .byte 114,99,52,40,49,120,44,99,104,97,114,41,0 .byte 82,67,52,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .p2align 6 - diff --git a/deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s b/deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s index a1670e38e..13417d4d4 100644 --- a/deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s +++ b/deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s @@ -192,4 +192,3 @@ _OPENSSL_wipe_cpu: xorq %r11,%r11 leaq 8(%rsp),%rax .byte 0xf3,0xc3 - diff --git a/deps/openssl/asm/x64-win32-masm/aes/aes-x86_64.asm b/deps/openssl/asm/x64-win32-masm/aes/aes-x86_64.asm index 2c590b94f..ad2e5cd03 100644 --- a/deps/openssl/asm/x64-win32-masm/aes/aes-x86_64.asm +++ b/deps/openssl/asm/x64-win32-masm/aes/aes-x86_64.asm @@ -1386,8 +1386,8 @@ $L$cbc_picked_te:: jb $L$cbc_slow_prologue test rdx,15 jnz $L$cbc_slow_prologue - - + bt r10d,28 + jc $L$cbc_slow_prologue lea r15,QWORD PTR[((-88-248))+rsp] diff --git a/deps/openssl/asm/x86-elf-gas/aes/aes-586.s b/deps/openssl/asm/x86-elf-gas/aes/aes-586.s index 34c90a068..dca6d0d20 100644 --- a/deps/openssl/asm/x86-elf-gas/aes/aes-586.s +++ b/deps/openssl/asm/x86-elf-gas/aes/aes-586.s @@ -2252,6 +2252,8 @@ AES_cbc_encrypt: jb .L015slow_way testl $15,%ecx jnz .L015slow_way + btl $28,(%eax) + jc .L015slow_way leal -324(%esp),%esi andl $-64,%esi movl %ebp,%eax diff --git a/deps/openssl/asm/x86-elf-gas/x86cpuid.s b/deps/openssl/asm/x86-elf-gas/x86cpuid.s index 56a92bfcb..406c2ff40 100644 --- a/deps/openssl/asm/x86-elf-gas/x86cpuid.s +++ b/deps/openssl/asm/x86-elf-gas/x86cpuid.s @@ -54,6 +54,7 @@ OPENSSL_ia32_cpuid: movzbl %cl,%esi incl %esi movl $1,%eax + xorl %ecx,%ecx .byte 0x0f,0xa2 btl $28,%edx jnc .L000done @@ -75,6 +76,7 @@ OPENSSL_ia32_cpuid: andl $4095,%edi .L002nocacheinfo: movl $1,%eax + xorl %ecx,%ecx .byte 0x0f,0xa2 cmpl $0,%ebp jne .L003notP4 diff --git a/deps/openssl/asm/x86-macosx-gas/aes/aes-586.s b/deps/openssl/asm/x86-macosx-gas/aes/aes-586.s index ff56a4bef..771782560 100644 --- a/deps/openssl/asm/x86-macosx-gas/aes/aes-586.s +++ b/deps/openssl/asm/x86-macosx-gas/aes/aes-586.s @@ -2219,6 +2219,8 @@ L014picked_te: jb L015slow_way testl $15,%ecx jnz L015slow_way + btl $28,(%eax) + jc L015slow_way leal -324(%esp),%esi andl $-64,%esi movl %ebp,%eax diff --git a/deps/openssl/asm/x86-macosx-gas/x86cpuid.s b/deps/openssl/asm/x86-macosx-gas/x86cpuid.s index b5e80f83a..b00b0488f 100644 --- a/deps/openssl/asm/x86-macosx-gas/x86cpuid.s +++ b/deps/openssl/asm/x86-macosx-gas/x86cpuid.s @@ -53,6 +53,7 @@ L_OPENSSL_ia32_cpuid_begin: movzbl %cl,%esi incl %esi movl $1,%eax + xorl %ecx,%ecx .byte 0x0f,0xa2 btl $28,%edx jnc L000done @@ -74,6 +75,7 @@ L001intel: andl $4095,%edi L002nocacheinfo: movl $1,%eax + xorl %ecx,%ecx .byte 0x0f,0xa2 cmpl $0,%ebp jne L003notP4 diff --git a/deps/openssl/asm/x86-win32-masm/aes/aes-586.asm b/deps/openssl/asm/x86-win32-masm/aes/aes-586.asm index 22dd21fbc..10c9add7a 100644 --- a/deps/openssl/asm/x86-win32-masm/aes/aes-586.asm +++ b/deps/openssl/asm/x86-win32-masm/aes/aes-586.asm @@ -2241,6 +2241,8 @@ $L014picked_te: jb $L015slow_way test ecx,15 jnz $L015slow_way + bt DWORD PTR [eax],28 + jc $L015slow_way lea esi,DWORD PTR [esp-324] and esi,-64 mov eax,ebp diff --git a/deps/openssl/asm/x86-win32-masm/x86cpuid.asm b/deps/openssl/asm/x86-win32-masm/x86cpuid.asm index 7e663d664..eeeac4d47 100644 --- a/deps/openssl/asm/x86-win32-masm/x86cpuid.asm +++ b/deps/openssl/asm/x86-win32-masm/x86cpuid.asm @@ -62,6 +62,7 @@ $L_OPENSSL_ia32_cpuid_begin:: movzx esi,cl inc esi mov eax,1 + xor ecx,ecx cpuid bt edx,28 jnc $L000done @@ -83,6 +84,7 @@ $L001intel: and edi,4095 $L002nocacheinfo: mov eax,1 + xor ecx,ecx cpuid cmp ebp,0 jne $L003notP4 |