From 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 24 Sep 2015 10:57:52 -0700 Subject: external/boringssl: sync with upstream. This change imports the current version of BoringSSL. The only local change now is that |BORINGSSL_201509| is defined in base.h. This allows this change to be made without (hopefully) breaking the build. This change will need https://android-review.googlesource.com/172744 to be landed afterwards to update a test. Change-Id: I6d1f463f7785a2423bd846305af91c973c326104 --- mac-x86_64/crypto/cpu-x86_64-asm.S | 143 ------------------------------------- 1 file changed, 143 deletions(-) delete mode 100644 mac-x86_64/crypto/cpu-x86_64-asm.S (limited to 'mac-x86_64/crypto/cpu-x86_64-asm.S') diff --git a/mac-x86_64/crypto/cpu-x86_64-asm.S b/mac-x86_64/crypto/cpu-x86_64-asm.S deleted file mode 100644 index 0dde04d..0000000 --- a/mac-x86_64/crypto/cpu-x86_64-asm.S +++ /dev/null @@ -1,143 +0,0 @@ -#if defined(__x86_64__) -.text - -.globl _OPENSSL_ia32_cpuid -.private_extern _OPENSSL_ia32_cpuid - -.p2align 4 -_OPENSSL_ia32_cpuid: - - - movq %rdi,%rdi - movq %rbx,%r8 - - xorl %eax,%eax - movl %eax,8(%rdi) - cpuid - movl %eax,%r11d - - xorl %eax,%eax - cmpl $1970169159,%ebx - setne %al - movl %eax,%r9d - cmpl $1231384169,%edx - setne %al - orl %eax,%r9d - cmpl $1818588270,%ecx - setne %al - orl %eax,%r9d - jz L$intel - - cmpl $1752462657,%ebx - setne %al - movl %eax,%r10d - cmpl $1769238117,%edx - setne %al - orl %eax,%r10d - cmpl $1145913699,%ecx - setne %al - orl %eax,%r10d - jnz L$intel - - - - - movl $2147483648,%eax - cpuid - - - cmpl $2147483649,%eax - jb L$intel - movl %eax,%r10d - movl $2147483649,%eax - cpuid - - - orl %ecx,%r9d - andl $2049,%r9d - - cmpl $2147483656,%r10d - jb L$intel - - movl $2147483656,%eax - cpuid - - movzbq %cl,%r10 - incq %r10 - - movl $1,%eax - cpuid - - btl $28,%edx - jnc L$generic - shrl $16,%ebx - cmpb %r10b,%bl - ja L$generic - andl $4026531839,%edx - jmp L$generic - -L$intel: - cmpl $4,%r11d - movl $-1,%r10d - jb L$nocacheinfo - - movl $4,%eax - movl $0,%ecx - cpuid - movl %eax,%r10d - shrl $14,%r10d - andl $4095,%r10d - - cmpl $7,%r11d - jb L$nocacheinfo - - movl $7,%eax - xorl %ecx,%ecx - cpuid - movl %ebx,8(%rdi) - -L$nocacheinfo: - movl $1,%eax - cpuid - - andl $3220176895,%edx - cmpl $0,%r9d - jne L$notintel - orl $1073741824,%edx -L$notintel: - btl $28,%edx - jnc L$generic - andl $4026531839,%edx - cmpl $0,%r10d - je L$generic - - orl $268435456,%edx - shrl $16,%ebx - cmpb $1,%bl - ja L$generic - andl $4026531839,%edx -L$generic: - andl $2048,%r9d - andl $4294965247,%ecx - orl %ecx,%r9d - - movl %edx,%r10d - btl $27,%r9d - jnc L$clear_avx - xorl %ecx,%ecx -.byte 0x0f,0x01,0xd0 - andl $6,%eax - cmpl $6,%eax - je L$done -L$clear_avx: - movl $4026525695,%eax - andl %eax,%r9d - andl $4294967263,8(%rdi) -L$done: - movl %r9d,4(%rdi) - movl %r10d,0(%rdi) - movq %r8,%rbx - .byte 0xf3,0xc3 - - -#endif -- cgit v1.1 From a04d78d392463df4e69a64360c952ffa5abd22f7 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 00:26:37 +0000 Subject: Revert "external/boringssl: sync with upstream." This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3. This breaks some x86 builds. Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25 --- mac-x86_64/crypto/cpu-x86_64-asm.S | 143 +++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 mac-x86_64/crypto/cpu-x86_64-asm.S (limited to 'mac-x86_64/crypto/cpu-x86_64-asm.S') diff --git a/mac-x86_64/crypto/cpu-x86_64-asm.S b/mac-x86_64/crypto/cpu-x86_64-asm.S new file mode 100644 index 0000000..0dde04d --- /dev/null +++ b/mac-x86_64/crypto/cpu-x86_64-asm.S @@ -0,0 +1,143 @@ +#if defined(__x86_64__) +.text + +.globl _OPENSSL_ia32_cpuid +.private_extern _OPENSSL_ia32_cpuid + +.p2align 4 +_OPENSSL_ia32_cpuid: + + + movq %rdi,%rdi + movq %rbx,%r8 + + xorl %eax,%eax + movl %eax,8(%rdi) + cpuid + movl %eax,%r11d + + xorl %eax,%eax + cmpl $1970169159,%ebx + setne %al + movl %eax,%r9d + cmpl $1231384169,%edx + setne %al + orl %eax,%r9d + cmpl $1818588270,%ecx + setne %al + orl %eax,%r9d + jz L$intel + + cmpl $1752462657,%ebx + setne %al + movl %eax,%r10d + cmpl $1769238117,%edx + setne %al + orl %eax,%r10d + cmpl $1145913699,%ecx + setne %al + orl %eax,%r10d + jnz L$intel + + + + + movl $2147483648,%eax + cpuid + + + cmpl $2147483649,%eax + jb L$intel + movl %eax,%r10d + movl $2147483649,%eax + cpuid + + + orl %ecx,%r9d + andl $2049,%r9d + + cmpl $2147483656,%r10d + jb L$intel + + movl $2147483656,%eax + cpuid + + movzbq %cl,%r10 + incq %r10 + + movl $1,%eax + cpuid + + btl $28,%edx + jnc L$generic + shrl $16,%ebx + cmpb %r10b,%bl + ja L$generic + andl $4026531839,%edx + jmp L$generic + +L$intel: + cmpl $4,%r11d + movl $-1,%r10d + jb L$nocacheinfo + + movl $4,%eax + movl $0,%ecx + cpuid + movl %eax,%r10d + shrl $14,%r10d + andl $4095,%r10d + + cmpl $7,%r11d + jb L$nocacheinfo + + movl $7,%eax + xorl %ecx,%ecx + cpuid + movl %ebx,8(%rdi) + +L$nocacheinfo: + movl $1,%eax + cpuid + + andl $3220176895,%edx + cmpl $0,%r9d + jne L$notintel + orl $1073741824,%edx +L$notintel: + btl $28,%edx + jnc L$generic + andl $4026531839,%edx + cmpl $0,%r10d + je L$generic + + orl $268435456,%edx + shrl $16,%ebx + cmpb $1,%bl + ja L$generic + andl $4026531839,%edx +L$generic: + andl $2048,%r9d + andl $4294965247,%ecx + orl %ecx,%r9d + + movl %edx,%r10d + btl $27,%r9d + jnc L$clear_avx + xorl %ecx,%ecx +.byte 0x0f,0x01,0xd0 + andl $6,%eax + cmpl $6,%eax + je L$done +L$clear_avx: + movl $4026525695,%eax + andl %eax,%r9d + andl $4294967263,8(%rdi) +L$done: + movl %r9d,4(%rdi) + movl %r10d,0(%rdi) + movq %r8,%rbx + .byte 0xf3,0xc3 + + +#endif -- cgit v1.1 From b8494591d1b1a143f3b192d845c238bbf3bc629d Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 02:29:14 +0000 Subject: Revert "Revert "external/boringssl: sync with upstream."" This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7. Underlying issue was fixed. Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88 --- mac-x86_64/crypto/cpu-x86_64-asm.S | 143 ------------------------------------- 1 file changed, 143 deletions(-) delete mode 100644 mac-x86_64/crypto/cpu-x86_64-asm.S (limited to 'mac-x86_64/crypto/cpu-x86_64-asm.S') diff --git a/mac-x86_64/crypto/cpu-x86_64-asm.S b/mac-x86_64/crypto/cpu-x86_64-asm.S deleted file mode 100644 index 0dde04d..0000000 --- a/mac-x86_64/crypto/cpu-x86_64-asm.S +++ /dev/null @@ -1,143 +0,0 @@ -#if defined(__x86_64__) -.text - -.globl _OPENSSL_ia32_cpuid -.private_extern _OPENSSL_ia32_cpuid - -.p2align 4 -_OPENSSL_ia32_cpuid: - - - movq %rdi,%rdi - movq %rbx,%r8 - - xorl %eax,%eax - movl %eax,8(%rdi) - cpuid - movl %eax,%r11d - - xorl %eax,%eax - cmpl $1970169159,%ebx - setne %al - movl %eax,%r9d - cmpl $1231384169,%edx - setne %al - orl %eax,%r9d - cmpl $1818588270,%ecx - setne %al - orl %eax,%r9d - jz L$intel - - cmpl $1752462657,%ebx - setne %al - movl %eax,%r10d - cmpl $1769238117,%edx - setne %al - orl %eax,%r10d - cmpl $1145913699,%ecx - setne %al - orl %eax,%r10d - jnz L$intel - - - - - movl $2147483648,%eax - cpuid - - - cmpl $2147483649,%eax - jb L$intel - movl %eax,%r10d - movl $2147483649,%eax - cpuid - - - orl %ecx,%r9d - andl $2049,%r9d - - cmpl $2147483656,%r10d - jb L$intel - - movl $2147483656,%eax - cpuid - - movzbq %cl,%r10 - incq %r10 - - movl $1,%eax - cpuid - - btl $28,%edx - jnc L$generic - shrl $16,%ebx - cmpb %r10b,%bl - ja L$generic - andl $4026531839,%edx - jmp L$generic - -L$intel: - cmpl $4,%r11d - movl $-1,%r10d - jb L$nocacheinfo - - movl $4,%eax - movl $0,%ecx - cpuid - movl %eax,%r10d - shrl $14,%r10d - andl $4095,%r10d - - cmpl $7,%r11d - jb L$nocacheinfo - - movl $7,%eax - xorl %ecx,%ecx - cpuid - movl %ebx,8(%rdi) - -L$nocacheinfo: - movl $1,%eax - cpuid - - andl $3220176895,%edx - cmpl $0,%r9d - jne L$notintel - orl $1073741824,%edx -L$notintel: - btl $28,%edx - jnc L$generic - andl $4026531839,%edx - cmpl $0,%r10d - je L$generic - - orl $268435456,%edx - shrl $16,%ebx - cmpb $1,%bl - ja L$generic - andl $4026531839,%edx -L$generic: - andl $2048,%r9d - andl $4294965247,%ecx - orl %ecx,%r9d - - movl %edx,%r10d - btl $27,%r9d - jnc L$clear_avx - xorl %ecx,%ecx -.byte 0x0f,0x01,0xd0 - andl $6,%eax - cmpl $6,%eax - je L$done -L$clear_avx: - movl $4026525695,%eax - andl %eax,%r9d - andl $4294967263,8(%rdi) -L$done: - movl %r9d,4(%rdi) - movl %r10d,0(%rdi) - movq %r8,%rbx - .byte 0xf3,0xc3 - - -#endif -- cgit v1.1