Buglet fixes and minor optimization in aes-x86_86 assembler.

[oweals/openssl.git] / crypto / x86_64cpuid.pl

diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
index 2f657ca9d8d7de7b1e8303673b5013b9572820f5..e29792a1573d7d131aca055d1ff04d855c07c63a 100644 (file)
--- a/crypto/x86_64cpuid.pl
+++ b/crypto/x86_64cpuid.pl
@@ -134,8 +134,6 @@ OPENSSL_ia32_cpuid:
 
        mov     \$1,%eax
        cpuid
-       bt      \$28,%edx               # test hyper-threading bit
-       jnc     .Ldone
        cmp     \$0,%r9d
        jne     .Lnotintel
        or      \$1<<20,%edx            # use reserved bit to engage RC4_CHAR
@@ -144,6 +142,8 @@ OPENSSL_ia32_cpuid:
        je      .Lnotintel
        or      \$1<<30,%edx            # use reserved bit to skip unrolled loop
 .Lnotintel:
+       bt      \$28,%edx               # test hyper-threading bit
+       jnc     .Ldone
        shr     \$16,%ebx
        cmp     \$1,%bl                 # see if cache is shared
        ja      .Ldone
@@ -188,3 +188,4 @@ OPENSSL_cleanse:
        ret
 .size  OPENSSL_cleanse,.-OPENSSL_cleanse
 ___
+close STDOUT;  # flush