New ctrl to set current certificate.

[openssl.git] / crypto / sparcv9cap.c

diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index 149eb5232d8f16f11ddfb225200c0044836d3cf9..7ee6769120b21702dc248e9083326459a3db46e1 100644 (file)
--- a/crypto/sparcv9cap.c
+++ b/crypto/sparcv9cap.c
@@ -4,6 +4,7 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <sys/time.h>
+#include <unistd.h>
 #include <openssl/bn.h>
 
 #include "sparc_arch.h"
@@ -15,15 +16,39 @@ 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>=8 && !(num&1) &&
-           (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);
-       else
-               return bn_mul_mont_int(rp,ap,bp,np,n0,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 &&
+                       (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);
@@ -35,7 +60,7 @@ unsigned long _sparcv9_rdcfr(void);
 void           _sparcv9_vis3_probe(void);
 unsigned long  _sparcv9_random(void);
 size_t                 _sparcv9_vis1_instrument_bus(unsigned int *,size_t);
-size_t         _sparcv8_vis1_instrument_bus2(unsigned int *,size_t,size_t);
+size_t         _sparcv9_vis1_instrument_bus2(unsigned int *,size_t,size_t);
 
 unsigned long OPENSSL_rdtsc(void)
        {
@@ -51,7 +76,7 @@ unsigned long OPENSSL_rdtsc(void)
 
 size_t OPENSSL_instrument_bus(unsigned int *out,size_t cnt)
        {
-       if (OPENSSL_sparcv9cap_P[0]&(SPARCV9_TICK_PRIVILEGED|SPARCV9_BLK) ==
+       if ((OPENSSL_sparcv9cap_P[0]&(SPARCV9_TICK_PRIVILEGED|SPARCV9_BLK)) ==
                        SPARCV9_BLK)
                return _sparcv9_vis1_instrument_bus(out,cnt);
        else
@@ -60,7 +85,7 @@ size_t OPENSSL_instrument_bus(unsigned int *out,size_t cnt)
 
 size_t OPENSSL_instrument_bus2(unsigned int *out,size_t cnt,size_t max)
        {
-       if (OPENSSL_sparcv9cap_P[0]&(SPARCV9_TICK_PRIVILEGED|SPARCV9_BLK) ==
+       if ((OPENSSL_sparcv9cap_P[0]&(SPARCV9_TICK_PRIVILEGED|SPARCV9_BLK)) ==
                        SPARCV9_BLK)
                return _sparcv9_vis1_instrument_bus2(out,cnt,max);
        else
@@ -262,11 +287,13 @@ void OPENSSL_cpuid_setup(void)
                OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3;
                }
 
+#if 0  /* was planned at some point but never implemented in hardware */
        if (sigsetjmp(common_jmp,1) == 0)
                {
                (void)_sparcv9_random();
                OPENSSL_sparcv9cap_P[0] |= SPARCV9_RANDOM;
                }
+#endif
 
        /*
         * In wait for better solution _sparcv9_rdcfr is masked by
@@ -284,6 +311,18 @@ void OPENSSL_cpuid_setup(void)
        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
        }
 
 #endif