Restoring authorship annotation for <deshevoy@yandex-team.ru>. Commit 2 of 2.

1 files changed, 293 insertions, 293 deletions

diff --git a/contrib/libs/openssl/crypto/sparcv9cap.c b/contrib/libs/openssl/crypto/sparcv9cap.c
index ba086a765f..b3cb3d4be9 100644
--- a/contrib/libs/openssl/crypto/sparcv9cap.c
+++ b/contrib/libs/openssl/crypto/sparcv9cap.c
@@ -1,296 +1,296 @@
-/* 
+/*
  * Copyright 2005-2021 The OpenSSL Project Authors. All Rights Reserved.
- * 
- * Licensed under the OpenSSL license (the "License").  You may not use 
- * this file except in compliance with the License.  You can obtain a copy 
- * in the file LICENSE in the source distribution or at 
- * https://www.openssl.org/source/license.html 
- */ 
- 
-#include <stdio.h> 
-#include <stdlib.h> 
-#include <string.h> 
-#include <setjmp.h> 
-#include <signal.h> 
-#include <sys/time.h> 
-#include <unistd.h> 
-#include <openssl/bn.h> 
-#include "internal/cryptlib.h" 
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <openssl/bn.h>
+#include "internal/cryptlib.h"
 #include "bn/bn_local.h"    /* for definition of bn_mul_mont */
- 
-#include "sparc_arch.h" 
- 
-#if defined(__GNUC__) && defined(__linux) 
-__attribute__ ((visibility("hidden"))) 
-#endif 
-unsigned int OPENSSL_sparcv9cap_P[2] = { SPARCV9_TICK_PRIVILEGED, 0 }; 
- 
-int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, 
-                const BN_ULONG *np, const BN_ULONG *n0, int num) 
-{ 
-    int bn_mul_mont_vis3(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, 
-                         const BN_ULONG *np, const BN_ULONG *n0, int num); 
-    int bn_mul_mont_fpu(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, 
-                        const BN_ULONG *np, const BN_ULONG *n0, int num); 
-    int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, 
-                        const BN_ULONG *np, const BN_ULONG *n0, int num); 
- 
-    if (!(num & 1) && num >= 6) { 
-        if ((num & 15) == 0 && num <= 64 && 
-            (OPENSSL_sparcv9cap_P[1] & (CFR_MONTMUL | CFR_MONTSQR)) == 
-            (CFR_MONTMUL | CFR_MONTSQR)) { 
-            typedef int (*bn_mul_mont_f) (BN_ULONG *rp, const BN_ULONG *ap, 
-                                          const BN_ULONG *bp, 
-                                          const BN_ULONG *np, 
-                                          const BN_ULONG *n0); 
-            int bn_mul_mont_t4_8(BN_ULONG *rp, const BN_ULONG *ap, 
-                                 const BN_ULONG *bp, const BN_ULONG *np, 
-                                 const BN_ULONG *n0); 
-            int bn_mul_mont_t4_16(BN_ULONG *rp, const BN_ULONG *ap, 
-                                  const BN_ULONG *bp, const BN_ULONG *np, 
-                                  const BN_ULONG *n0); 
-            int bn_mul_mont_t4_24(BN_ULONG *rp, const BN_ULONG *ap, 
-                                  const BN_ULONG *bp, const BN_ULONG *np, 
-                                  const BN_ULONG *n0); 
-            int bn_mul_mont_t4_32(BN_ULONG *rp, const BN_ULONG *ap, 
-                                  const BN_ULONG *bp, const BN_ULONG *np, 
-                                  const BN_ULONG *n0); 
-            static const bn_mul_mont_f funcs[4] = { 
-                bn_mul_mont_t4_8, bn_mul_mont_t4_16, 
-                bn_mul_mont_t4_24, bn_mul_mont_t4_32 
-            }; 
-            bn_mul_mont_f worker = funcs[num / 16 - 1]; 
- 
-            if ((*worker) (rp, ap, bp, np, n0)) 
-                return 1; 
-            /* retry once and fall back */ 
-            if ((*worker) (rp, ap, bp, np, n0)) 
-                return 1; 
-            return bn_mul_mont_vis3(rp, ap, bp, np, n0, num); 
-        } 
-        if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3)) 
-            return bn_mul_mont_vis3(rp, ap, bp, np, n0, num); 
-        else if (num >= 8 && 
-                 /* 
-                  * bn_mul_mont_fpu doesn't use FMADD, we just use the 
-                  * flag to detect when FPU path is preferable in cases 
-                  * when current heuristics is unreliable. [it works 
-                  * out because FMADD-capable processors where FPU 
-                  * code path is undesirable are also VIS3-capable and 
-                  * VIS3 code path takes precedence.] 
-                  */ 
-                 ( (OPENSSL_sparcv9cap_P[0] & SPARCV9_FMADD) || 
-                   (OPENSSL_sparcv9cap_P[0] & 
-                    (SPARCV9_PREFER_FPU | SPARCV9_VIS1)) == 
-                   (SPARCV9_PREFER_FPU | SPARCV9_VIS1) )) 
-            return bn_mul_mont_fpu(rp, ap, bp, np, n0, num); 
-    } 
-    return bn_mul_mont_int(rp, ap, bp, np, n0, num); 
-} 
- 
-unsigned long _sparcv9_rdtick(void); 
-void _sparcv9_vis1_probe(void); 
-unsigned long _sparcv9_vis1_instrument(void); 
-void _sparcv9_vis2_probe(void); 
-void _sparcv9_fmadd_probe(void); 
-unsigned long _sparcv9_rdcfr(void); 
-void _sparcv9_vis3_probe(void); 
-void _sparcv9_fjaesx_probe(void); 
-unsigned long _sparcv9_random(void); 
-size_t _sparcv9_vis1_instrument_bus(unsigned int *, size_t); 
-size_t _sparcv9_vis1_instrument_bus2(unsigned int *, size_t, size_t); 
- 
-uint32_t OPENSSL_rdtsc(void) 
-{ 
-    if (OPENSSL_sparcv9cap_P[0] & SPARCV9_TICK_PRIVILEGED) 
-#if defined(__sun) && defined(__SVR4) 
-        return gethrtime(); 
-#else 
-        return 0; 
-#endif 
-    else 
-        return _sparcv9_rdtick(); 
-} 
- 
-size_t OPENSSL_instrument_bus(unsigned int *out, size_t cnt) 
-{ 
-    if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) == 
-        SPARCV9_BLK) 
-        return _sparcv9_vis1_instrument_bus(out, cnt); 
-    else 
-        return 0; 
-} 
- 
-size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max) 
-{ 
-    if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) == 
-        SPARCV9_BLK) 
-        return _sparcv9_vis1_instrument_bus2(out, cnt, max); 
-    else 
-        return 0; 
-} 
- 
-static sigjmp_buf common_jmp; 
-static void common_handler(int sig) 
-{ 
-    siglongjmp(common_jmp, sig); 
-} 
- 
-#if defined(__sun) && defined(__SVR4) 
-# if defined(__GNUC__) && __GNUC__>=2 
-extern unsigned int getisax(unsigned int vec[], unsigned int sz) __attribute__ ((weak)); 
-# elif defined(__SUNPRO_C) 
-#pragma weak getisax 
-extern unsigned int getisax(unsigned int vec[], unsigned int sz); 
-# else 
-static unsigned int (*getisax) (unsigned int vec[], unsigned int sz) = NULL; 
-# endif 
-#endif 
- 
-void OPENSSL_cpuid_setup(void) 
-{ 
-    char *e; 
-    struct sigaction common_act, ill_oact, bus_oact; 
-    sigset_t all_masked, oset; 
-    static int trigger = 0; 
- 
-    if (trigger) 
-        return; 
-    trigger = 1; 
- 
-    if ((e = getenv("OPENSSL_sparcv9cap"))) { 
-        OPENSSL_sparcv9cap_P[0] = strtoul(e, NULL, 0); 
-        if ((e = strchr(e, ':'))) 
-            OPENSSL_sparcv9cap_P[1] = strtoul(e + 1, NULL, 0); 
-        return; 
-    } 
- 
-#if defined(__sun) && defined(__SVR4) 
-    if (getisax != NULL) { 
-        unsigned int vec[2] = { 0, 0 }; 
- 
-        if (getisax (vec,2)) { 
-            if (vec[0]&0x00020) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1; 
-            if (vec[0]&0x00040) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2; 
-            if (vec[0]&0x00080) OPENSSL_sparcv9cap_P[0] |= SPARCV9_BLK; 
-            if (vec[0]&0x00100) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD; 
-            if (vec[0]&0x00400) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3; 
-            if (vec[0]&0x01000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJHPCACE; 
-            if (vec[0]&0x02000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJDESX; 
-            if (vec[0]&0x08000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_IMA; 
-            if (vec[0]&0x10000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJAESX; 
-            if (vec[1]&0x00008) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS4; 
- 
-            /* reconstruct %cfr copy */ 
-            OPENSSL_sparcv9cap_P[1] = (vec[0]>>17)&0x3ff; 
-            OPENSSL_sparcv9cap_P[1] |= (OPENSSL_sparcv9cap_P[1]&CFR_MONTMUL)<<1; 
-            if (vec[0]&0x20000000) OPENSSL_sparcv9cap_P[1] |= CFR_CRC32C; 
-            if (vec[1]&0x00000020) OPENSSL_sparcv9cap_P[1] |= CFR_XMPMUL; 
-            if (vec[1]&0x00000040) 
-                OPENSSL_sparcv9cap_P[1] |= CFR_XMONTMUL|CFR_XMONTSQR; 
- 
-            /* Some heuristics */ 
-            /* all known VIS2-capable CPUs have unprivileged tick counter */ 
-            if (OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS2) 
-                OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED; 
- 
-            OPENSSL_sparcv9cap_P[0] |= SPARCV9_PREFER_FPU; 
- 
-            /* detect UltraSPARC-Tx, see sparccpud.S for details... */ 
-            if ((OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS1) && 
-                _sparcv9_vis1_instrument() >= 12) 
-                OPENSSL_sparcv9cap_P[0] &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU); 
-        } 
- 
-        if (sizeof(size_t) == 8) 
-            OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK; 
- 
-        return; 
-    } 
-#endif 
- 
-    /* Initial value, fits UltraSPARC-I&II... */ 
-    OPENSSL_sparcv9cap_P[0] = SPARCV9_PREFER_FPU | SPARCV9_TICK_PRIVILEGED; 
- 
-    sigfillset(&all_masked); 
-    sigdelset(&all_masked, SIGILL); 
-    sigdelset(&all_masked, SIGTRAP); 
-# ifdef SIGEMT 
-    sigdelset(&all_masked, SIGEMT); 
-# endif 
-    sigdelset(&all_masked, SIGFPE); 
-    sigdelset(&all_masked, SIGBUS); 
-    sigdelset(&all_masked, SIGSEGV); 
-    sigprocmask(SIG_SETMASK, &all_masked, &oset); 
- 
-    memset(&common_act, 0, sizeof(common_act)); 
-    common_act.sa_handler = common_handler; 
-    common_act.sa_mask = all_masked; 
- 
-    sigaction(SIGILL, &common_act, &ill_oact); 
-    sigaction(SIGBUS, &common_act, &bus_oact); /* T1 fails 16-bit ldda [on 
-                                                * Linux] */ 
- 
-    if (sigsetjmp(common_jmp, 1) == 0) { 
-        _sparcv9_rdtick(); 
-        OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED; 
-    } 
- 
-    if (sigsetjmp(common_jmp, 1) == 0) { 
-        _sparcv9_vis1_probe(); 
-        OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1 | SPARCV9_BLK; 
-        /* detect UltraSPARC-Tx, see sparccpud.S for details... */ 
-        if (_sparcv9_vis1_instrument() >= 12) 
-            OPENSSL_sparcv9cap_P[0] &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU); 
-        else { 
-            _sparcv9_vis2_probe(); 
-            OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2; 
-        } 
-    } 
- 
-    if (sigsetjmp(common_jmp, 1) == 0) { 
-        _sparcv9_fmadd_probe(); 
-        OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD; 
-    } 
- 
-    /* 
-     * VIS3 flag is tested independently from VIS1, unlike VIS2 that is, 
-     * because VIS3 defines even integer instructions. 
-     */ 
-    if (sigsetjmp(common_jmp, 1) == 0) { 
-        _sparcv9_vis3_probe(); 
-        OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3; 
-    } 
- 
-    if (sigsetjmp(common_jmp, 1) == 0) { 
-        _sparcv9_fjaesx_probe(); 
-        OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJAESX; 
-    } 
- 
-    /* 
-     * In wait for better solution _sparcv9_rdcfr is masked by 
+
+#include "sparc_arch.h"
+
+#if defined(__GNUC__) && defined(__linux)
+__attribute__ ((visibility("hidden")))
+#endif
+unsigned int OPENSSL_sparcv9cap_P[2] = { SPARCV9_TICK_PRIVILEGED, 0 };
+
+int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
+                const BN_ULONG *np, const BN_ULONG *n0, int num)
+{
+    int bn_mul_mont_vis3(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
+                         const BN_ULONG *np, const BN_ULONG *n0, int num);
+    int bn_mul_mont_fpu(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
+                        const BN_ULONG *np, const BN_ULONG *n0, int num);
+    int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
+                        const BN_ULONG *np, const BN_ULONG *n0, int num);
+
+    if (!(num & 1) && num >= 6) {
+        if ((num & 15) == 0 && num <= 64 &&
+            (OPENSSL_sparcv9cap_P[1] & (CFR_MONTMUL | CFR_MONTSQR)) ==
+            (CFR_MONTMUL | CFR_MONTSQR)) {
+            typedef int (*bn_mul_mont_f) (BN_ULONG *rp, const BN_ULONG *ap,
+                                          const BN_ULONG *bp,
+                                          const BN_ULONG *np,
+                                          const BN_ULONG *n0);
+            int bn_mul_mont_t4_8(BN_ULONG *rp, const BN_ULONG *ap,
+                                 const BN_ULONG *bp, const BN_ULONG *np,
+                                 const BN_ULONG *n0);
+            int bn_mul_mont_t4_16(BN_ULONG *rp, const BN_ULONG *ap,
+                                  const BN_ULONG *bp, const BN_ULONG *np,
+                                  const BN_ULONG *n0);
+            int bn_mul_mont_t4_24(BN_ULONG *rp, const BN_ULONG *ap,
+                                  const BN_ULONG *bp, const BN_ULONG *np,
+                                  const BN_ULONG *n0);
+            int bn_mul_mont_t4_32(BN_ULONG *rp, const BN_ULONG *ap,
+                                  const BN_ULONG *bp, const BN_ULONG *np,
+                                  const BN_ULONG *n0);
+            static const bn_mul_mont_f funcs[4] = {
+                bn_mul_mont_t4_8, bn_mul_mont_t4_16,
+                bn_mul_mont_t4_24, bn_mul_mont_t4_32
+            };
+            bn_mul_mont_f worker = funcs[num / 16 - 1];
+
+            if ((*worker) (rp, ap, bp, np, n0))
+                return 1;
+            /* retry once and fall back */
+            if ((*worker) (rp, ap, bp, np, n0))
+                return 1;
+            return bn_mul_mont_vis3(rp, ap, bp, np, n0, num);
+        }
+        if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3))
+            return bn_mul_mont_vis3(rp, ap, bp, np, n0, num);
+        else if (num >= 8 &&
+                 /*
+                  * bn_mul_mont_fpu doesn't use FMADD, we just use the
+                  * flag to detect when FPU path is preferable in cases
+                  * when current heuristics is unreliable. [it works
+                  * out because FMADD-capable processors where FPU
+                  * code path is undesirable are also VIS3-capable and
+                  * VIS3 code path takes precedence.]
+                  */
+                 ( (OPENSSL_sparcv9cap_P[0] & SPARCV9_FMADD) ||
+                   (OPENSSL_sparcv9cap_P[0] &
+                    (SPARCV9_PREFER_FPU | SPARCV9_VIS1)) ==
+                   (SPARCV9_PREFER_FPU | SPARCV9_VIS1) ))
+            return bn_mul_mont_fpu(rp, ap, bp, np, n0, num);
+    }
+    return bn_mul_mont_int(rp, ap, bp, np, n0, num);
+}
+
+unsigned long _sparcv9_rdtick(void);
+void _sparcv9_vis1_probe(void);
+unsigned long _sparcv9_vis1_instrument(void);
+void _sparcv9_vis2_probe(void);
+void _sparcv9_fmadd_probe(void);
+unsigned long _sparcv9_rdcfr(void);
+void _sparcv9_vis3_probe(void);
+void _sparcv9_fjaesx_probe(void);
+unsigned long _sparcv9_random(void);
+size_t _sparcv9_vis1_instrument_bus(unsigned int *, size_t);
+size_t _sparcv9_vis1_instrument_bus2(unsigned int *, size_t, size_t);
+
+uint32_t OPENSSL_rdtsc(void)
+{
+    if (OPENSSL_sparcv9cap_P[0] & SPARCV9_TICK_PRIVILEGED)
+#if defined(__sun) && defined(__SVR4)
+        return gethrtime();
+#else
+        return 0;
+#endif
+    else
+        return _sparcv9_rdtick();
+}
+
+size_t OPENSSL_instrument_bus(unsigned int *out, size_t cnt)
+{
+    if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) ==
+        SPARCV9_BLK)
+        return _sparcv9_vis1_instrument_bus(out, cnt);
+    else
+        return 0;
+}
+
+size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
+{
+    if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) ==
+        SPARCV9_BLK)
+        return _sparcv9_vis1_instrument_bus2(out, cnt, max);
+    else
+        return 0;
+}
+
+static sigjmp_buf common_jmp;
+static void common_handler(int sig)
+{
+    siglongjmp(common_jmp, sig);
+}
+
+#if defined(__sun) && defined(__SVR4)
+# if defined(__GNUC__) && __GNUC__>=2
+extern unsigned int getisax(unsigned int vec[], unsigned int sz) __attribute__ ((weak));
+# elif defined(__SUNPRO_C)
+#pragma weak getisax
+extern unsigned int getisax(unsigned int vec[], unsigned int sz);
+# else
+static unsigned int (*getisax) (unsigned int vec[], unsigned int sz) = NULL;
+# endif
+#endif
+
+void OPENSSL_cpuid_setup(void)
+{
+    char *e;
+    struct sigaction common_act, ill_oact, bus_oact;
+    sigset_t all_masked, oset;
+    static int trigger = 0;
+
+    if (trigger)
+        return;
+    trigger = 1;
+
+    if ((e = getenv("OPENSSL_sparcv9cap"))) {
+        OPENSSL_sparcv9cap_P[0] = strtoul(e, NULL, 0);
+        if ((e = strchr(e, ':')))
+            OPENSSL_sparcv9cap_P[1] = strtoul(e + 1, NULL, 0);
+        return;
+    }
+
+#if defined(__sun) && defined(__SVR4)
+    if (getisax != NULL) {
+        unsigned int vec[2] = { 0, 0 };
+
+        if (getisax (vec,2)) {
+            if (vec[0]&0x00020) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1;
+            if (vec[0]&0x00040) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2;
+            if (vec[0]&0x00080) OPENSSL_sparcv9cap_P[0] |= SPARCV9_BLK;
+            if (vec[0]&0x00100) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD;
+            if (vec[0]&0x00400) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3;
+            if (vec[0]&0x01000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJHPCACE;
+            if (vec[0]&0x02000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJDESX;
+            if (vec[0]&0x08000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_IMA;
+            if (vec[0]&0x10000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJAESX;
+            if (vec[1]&0x00008) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS4;
+
+            /* reconstruct %cfr copy */
+            OPENSSL_sparcv9cap_P[1] = (vec[0]>>17)&0x3ff;
+            OPENSSL_sparcv9cap_P[1] |= (OPENSSL_sparcv9cap_P[1]&CFR_MONTMUL)<<1;
+            if (vec[0]&0x20000000) OPENSSL_sparcv9cap_P[1] |= CFR_CRC32C;
+            if (vec[1]&0x00000020) OPENSSL_sparcv9cap_P[1] |= CFR_XMPMUL;
+            if (vec[1]&0x00000040)
+                OPENSSL_sparcv9cap_P[1] |= CFR_XMONTMUL|CFR_XMONTSQR;
+
+            /* Some heuristics */
+            /* all known VIS2-capable CPUs have unprivileged tick counter */
+            if (OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS2)
+                OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED;
+
+            OPENSSL_sparcv9cap_P[0] |= SPARCV9_PREFER_FPU;
+
+            /* detect UltraSPARC-Tx, see sparccpud.S for details... */
+            if ((OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS1) &&
+                _sparcv9_vis1_instrument() >= 12)
+                OPENSSL_sparcv9cap_P[0] &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU);
+        }
+
+        if (sizeof(size_t) == 8)
+            OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK;
+
+        return;
+    }
+#endif
+
+    /* Initial value, fits UltraSPARC-I&II... */
+    OPENSSL_sparcv9cap_P[0] = SPARCV9_PREFER_FPU | SPARCV9_TICK_PRIVILEGED;
+
+    sigfillset(&all_masked);
+    sigdelset(&all_masked, SIGILL);
+    sigdelset(&all_masked, SIGTRAP);
+# ifdef SIGEMT
+    sigdelset(&all_masked, SIGEMT);
+# endif
+    sigdelset(&all_masked, SIGFPE);
+    sigdelset(&all_masked, SIGBUS);
+    sigdelset(&all_masked, SIGSEGV);
+    sigprocmask(SIG_SETMASK, &all_masked, &oset);
+
+    memset(&common_act, 0, sizeof(common_act));
+    common_act.sa_handler = common_handler;
+    common_act.sa_mask = all_masked;
+
+    sigaction(SIGILL, &common_act, &ill_oact);
+    sigaction(SIGBUS, &common_act, &bus_oact); /* T1 fails 16-bit ldda [on
+                                                * Linux] */
+
+    if (sigsetjmp(common_jmp, 1) == 0) {
+        _sparcv9_rdtick();
+        OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED;
+    }
+
+    if (sigsetjmp(common_jmp, 1) == 0) {
+        _sparcv9_vis1_probe();
+        OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1 | SPARCV9_BLK;
+        /* detect UltraSPARC-Tx, see sparccpud.S for details... */
+        if (_sparcv9_vis1_instrument() >= 12)
+            OPENSSL_sparcv9cap_P[0] &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU);
+        else {
+            _sparcv9_vis2_probe();
+            OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2;
+        }
+    }
+
+    if (sigsetjmp(common_jmp, 1) == 0) {
+        _sparcv9_fmadd_probe();
+        OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD;
+    }
+
+    /*
+     * VIS3 flag is tested independently from VIS1, unlike VIS2 that is,
+     * because VIS3 defines even integer instructions.
+     */
+    if (sigsetjmp(common_jmp, 1) == 0) {
+        _sparcv9_vis3_probe();
+        OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3;
+    }
+
+    if (sigsetjmp(common_jmp, 1) == 0) {
+        _sparcv9_fjaesx_probe();
+        OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJAESX;
+    }
+
+    /*
+     * In wait for better solution _sparcv9_rdcfr is masked by
      * VIS3 flag, because it goes to uninterruptible endless
-     * loop on UltraSPARC II running Solaris. Things might be 
-     * different on Linux... 
-     */ 
-    if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3) && 
-        sigsetjmp(common_jmp, 1) == 0) { 
-        OPENSSL_sparcv9cap_P[1] = (unsigned int)_sparcv9_rdcfr(); 
-    } 
- 
-    sigaction(SIGBUS, &bus_oact, NULL); 
-    sigaction(SIGILL, &ill_oact, NULL); 
- 
-    sigprocmask(SIG_SETMASK, &oset, NULL); 
- 
-    if (sizeof(size_t) == 8) 
-        OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK; 
-# ifdef __linux 
-    else { 
-        int ret = syscall(340); 
- 
-        if (ret >= 0 && ret & 1) 
-            OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK; 
-    } 
-# endif 
-} 
+     * loop on UltraSPARC II running Solaris. Things might be
+     * different on Linux...
+     */
+    if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3) &&
+        sigsetjmp(common_jmp, 1) == 0) {
+        OPENSSL_sparcv9cap_P[1] = (unsigned int)_sparcv9_rdcfr();
+    }
+
+    sigaction(SIGBUS, &bus_oact, NULL);
+    sigaction(SIGILL, &ill_oact, NULL);
+
+    sigprocmask(SIG_SETMASK, &oset, NULL);
+
+    if (sizeof(size_t) == 8)
+        OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK;
+# ifdef __linux
+    else {
+        int ret = syscall(340);
+
+        if (ret >= 0 && ret & 1)
+            OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK;
+    }
+# endif
+}