sparcv9cap.c: reiterate CPU detection logic.

[openssl.git] / crypto / sparcv9cap.c

diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index 5f31d20bd07c47a9fdb073ec8e4141f137b002cc..bb0c8e73a912488ab8ff1dfe9d85730052e7fb9f 100644 (file)
--- a/crypto/sparcv9cap.c
+++ b/crypto/sparcv9cap.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <setjmp.h>
+#include <signal.h>
 #include <sys/time.h>
 #include <openssl/bn.h>
 
@@ -9,6 +11,7 @@
 #define SPARCV9_VIS1           (1<<2)
 #define SPARCV9_VIS2           (1<<3)  /* reserved */
 #define SPARCV9_FMADD          (1<<4)  /* reserved for SPARC64 V */
+
 static int OPENSSL_sparcv9cap_P=SPARCV9_TICK_PRIVILEGED;
 
 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)
@@ -23,10 +26,11 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U
                return bn_mul_mont_int(rp,ap,bp,np,n0,num);
        }
 
+unsigned long  _sparcv9_rdtick(void);
+unsigned long  _sparcv9_vis1_probe(void);
+
 unsigned long OPENSSL_rdtsc(void)
        {
-       unsigned long _sparcv9_rdtick(void);
-
        if (OPENSSL_sparcv9cap_P&SPARCV9_TICK_PRIVILEGED)
 #if defined(__sun) && defined(__SVR4)
                return gethrtime();
@@ -137,9 +141,15 @@ void OPENSSL_cpuid_setup(void)
 
 #else
 
+static sigjmp_buf common_jmp;
+static void common_handler(int sig) { siglongjmp(common_jmp,sig); }
+
 void OPENSSL_cpuid_setup(void)
        {
        char *e;
+       struct sigaction        common_act,ill_oact,bus_oact;
+       sigset_t                all_masked,oset;
+       int                     sig;
  
        if ((e=getenv("OPENSSL_sparcv9cap")))
                {
@@ -149,6 +159,55 @@ void OPENSSL_cpuid_setup(void)
 
        /* For now we assume that the rest supports UltraSPARC-I* only */
        OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU|SPARCV9_VIS1;
+
+       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);
+       if (sigsetjmp(common_jmp,0) == 0)
+               {
+               _sparcv9_rdtick();
+               OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
+               }
+       else
+               {
+               /* This happens on US-I&II, which have working VIS1
+                * and fast FPU... In other words we are done... */
+               OPENSSL_sparcv9cap_P |= SPARCV9_TICK_PRIVILEGED;
+               sigaction(SIGILL,&ill_oact,NULL);
+               sigprocmask(SIG_SETMASK,&oset,NULL);
+               return;
+               }
+       sigaction(SIGILL,&ill_oact,NULL);
+
+       sigaction(SIGILL,&common_act,&ill_oact);
+       sigaction(SIGBUS,&common_act,&bus_oact);/* T1 fails 16-bit ldda */
+       if ((sig=sigsetjmp(common_jmp,0)) == 0)
+               {
+               /* see sparccpud.S for details... */
+               if (_sparcv9_vis1_probe() >= 12)
+                       OPENSSL_sparcv9cap_P &= ~SPARCV9_VIS1;
+               }
+       else
+               {
+               OPENSSL_sparcv9cap_P &= ~SPARCV9_VIS1;
+               }
+       sigaction(SIGBUS,&bus_oact,NULL);
+       sigaction(SIGILL,&ill_oact,NULL);
+
+       sigprocmask(SIG_SETMASK,&oset,NULL);
        }
 
 #endif