From 69a8d2dcc19aed0d1116ba2ecd81cce5ae736c94 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Tue, 15 Apr 2014 13:42:55 +0000 Subject: First pass at applying KNF to the OpenSSL code, which almost makes it readable. This pass is whitespace only and can readily be verified using tr and md5. --- src/lib/libcrypto/sparcv9cap.c | 235 +++++++++++++++++++++-------------------- 1 file changed, 121 insertions(+), 114 deletions(-) (limited to 'src/lib/libcrypto/sparcv9cap.c') diff --git a/src/lib/libcrypto/sparcv9cap.c b/src/lib/libcrypto/sparcv9cap.c index 43b3ac6f81..08f7de3ec8 100644 --- a/src/lib/libcrypto/sparcv9cap.c +++ b/src/lib/libcrypto/sparcv9cap.c @@ -12,20 +12,22 @@ #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) - { - 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&(SPARCV9_PREFER_FPU|SPARCV9_VIS1)) == - (SPARCV9_PREFER_FPU|SPARCV9_VIS1)) - return bn_mul_mont_fpu(rp,ap,bp,np,n0,num); +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) +{ + 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 & (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); - } + return bn_mul_mont_int(rp, ap, bp, np, n0, num); +} unsigned long _sparcv9_rdtick(void); void _sparcv9_vis1_probe(void); @@ -33,8 +35,9 @@ unsigned long _sparcv9_vis1_instrument(void); void _sparcv9_vis2_probe(void); void _sparcv9_fmadd_probe(void); -unsigned long OPENSSL_rdtsc(void) - { +unsigned long +OPENSSL_rdtsc(void) +{ if (OPENSSL_sparcv9cap_P&SPARCV9_TICK_PRIVILEGED) #if defined(__sun) && defined(__SVR4) return gethrtime(); @@ -43,7 +46,7 @@ unsigned long OPENSSL_rdtsc(void) #endif else return _sparcv9_rdtick(); - } +} #if 0 && defined(__sun) && defined(__SVR4) /* This code path is disabled, because of incompatibility of @@ -54,21 +57,22 @@ unsigned long OPENSSL_rdtsc(void) #include #include -typedef di_node_t (*di_init_t)(const char *,uint_t); +typedef di_node_t (*di_init_t)(const char *, uint_t); typedef void (*di_fini_t)(di_node_t); typedef char * (*di_node_name_t)(di_node_t); -typedef int (*di_walk_node_t)(di_node_t,uint_t,di_node_name_t,int (*)(di_node_t,di_node_name_t)); +typedef int (*di_walk_node_t)(di_node_t, uint_t, di_node_name_t, int (*)(di_node_t, di_node_name_t)); #define DLLINK(h,name) (name=(name##_t)dlsym((h),#name)) -static int walk_nodename(di_node_t node, di_node_name_t di_node_name) - { +static int +walk_nodename(di_node_t node, di_node_name_t di_node_name) +{ char *name = (*di_node_name)(node); /* This is expected to catch all UltraSPARC flavors prior T1 */ - if (!strcmp (name,"SUNW,UltraSPARC") || + if (!strcmp (name, "SUNW, UltraSPARC") || !strncmp(name,"SUNW,UltraSPARC-I",17)) /* covers II,III,IV */ - { + { OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU|SPARCV9_VIS1; /* %tick is privileged only on UltraSPARC-I/II, but not IIe */ @@ -76,51 +80,48 @@ static int walk_nodename(di_node_t node, di_node_name_t di_node_name) OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; return DI_WALK_TERMINATE; - } + } /* This is expected to catch remaining UltraSPARCs, such as T1 */ - else if (!strncmp(name,"SUNW,UltraSPARC",15)) - { + else if (!strncmp(name, "SUNW, UltraSPARC", 15)) { OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; return DI_WALK_TERMINATE; - } + } return DI_WALK_CONTINUE; - } +} -void OPENSSL_cpuid_setup(void) - { +void +OPENSSL_cpuid_setup(void) +{ void *h; - char *e,si[256]; - static int trigger=0; + char *e, si[256]; + static int trigger = 0; - if (trigger) return; - trigger=1; + if (trigger) + return; + trigger = 1; - if ((e=getenv("OPENSSL_sparcv9cap"))) - { - OPENSSL_sparcv9cap_P=strtoul(e,NULL,0); + if ((e = getenv("OPENSSL_sparcv9cap"))) { + OPENSSL_sparcv9cap_P = strtoul(e, NULL, 0); return; - } + } - if (sysinfo(SI_MACHINE,si,sizeof(si))>0) - { - if (strcmp(si,"sun4v")) + if (sysinfo(SI_MACHINE, si, sizeof(si)) > 0) { + if (strcmp(si, "sun4v")) /* FPU is preferred for all CPUs, but US-T1/2 */ OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU; - } + } - if (sysinfo(SI_ISALIST,si,sizeof(si))>0) - { - if (strstr(si,"+vis")) + if (sysinfo(SI_ISALIST, si, sizeof(si)) > 0) { + if (strstr(si, "+vis")) OPENSSL_sparcv9cap_P |= SPARCV9_VIS1; - if (strstr(si,"+vis2")) - { + if (strstr(si, "+vis2")) { OPENSSL_sparcv9cap_P |= SPARCV9_VIS2; OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; return; - } } + } #ifdef M_KEEP /* * Solaris libdevinfo.so.1 is effectively incomatible with @@ -129,109 +130,115 @@ void OPENSSL_cpuid_setup(void) * free(3LIBMALLOC) called by di_fini. Prior call to * mallopt(M_KEEP,0) somehow helps... But not always... */ - if ((h = dlopen(NULL,RTLD_LAZY))) - { - union { void *p; int (*f)(int,int); } sym; - if ((sym.p = dlsym(h,"mallopt"))) (*sym.f)(M_KEEP,0); - dlclose(h); - } + if ((h = dlopen(NULL, RTLD_LAZY))) { + union { void *p; + int (*f)(int, int); + } sym; + if ((sym.p = dlsym(h, "mallopt"))) (*sym.f)(M_KEEP, 0); + dlclose(h); + } #endif - if ((h = dlopen("libdevinfo.so.1",RTLD_LAZY))) do - { - di_init_t di_init; - di_fini_t di_fini; - di_walk_node_t di_walk_node; - di_node_name_t di_node_name; - di_node_t root_node; - - if (!DLLINK(h,di_init)) break; - if (!DLLINK(h,di_fini)) break; - if (!DLLINK(h,di_walk_node)) break; - if (!DLLINK(h,di_node_name)) break; - - if ((root_node = (*di_init)("/",DINFOSUBTREE))!=DI_NODE_NIL) - { - (*di_walk_node)(root_node,DI_WALK_SIBFIRST, - di_node_name,walk_nodename); - (*di_fini)(root_node); + if ((h = dlopen("libdevinfo.so.1", RTLD_LAZY))) + do { + di_init_t di_init; + di_fini_t di_fini; + di_walk_node_t di_walk_node; + di_node_name_t di_node_name; + di_node_t root_node; + + if (!DLLINK(h, di_init)) + break; + if (!DLLINK(h, di_fini)) + break; + if (!DLLINK(h, di_walk_node)) + break; + if (!DLLINK(h, di_node_name)) + break; + + if ((root_node = (*di_init)("/", DINFOSUBTREE)) != + DI_NODE_NIL) { + (*di_walk_node)(root_node, DI_WALK_SIBFIRST, + di_node_name, walk_nodename); + (*di_fini)(root_node); } - } while(0); + } while (0); - if (h) dlclose(h); - } + if (h) + dlclose(h); +} #else static sigjmp_buf common_jmp; -static void common_handler(int sig) { siglongjmp(common_jmp,sig); } - -void OPENSSL_cpuid_setup(void) - { +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; - static int trigger=0; - - if (trigger) return; - trigger=1; - - if ((e=getenv("OPENSSL_sparcv9cap"))) - { - OPENSSL_sparcv9cap_P=strtoul(e,NULL,0); + 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 = strtoul(e, NULL, 0); + return; + } /* Initial value, fits UltraSPARC-I&II... */ OPENSSL_sparcv9cap_P = SPARCV9_PREFER_FPU|SPARCV9_TICK_PRIVILEGED; sigfillset(&all_masked); - sigdelset(&all_masked,SIGILL); - sigdelset(&all_masked,SIGTRAP); + sigdelset(&all_masked, SIGILL); + sigdelset(&all_masked, SIGTRAP); #ifdef SIGEMT - sigdelset(&all_masked,SIGEMT); + sigdelset(&all_masked, SIGEMT); #endif - sigdelset(&all_masked,SIGFPE); - sigdelset(&all_masked,SIGBUS); - sigdelset(&all_masked,SIGSEGV); - sigprocmask(SIG_SETMASK,&all_masked,&oset); + 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)); + memset(&common_act, 0, sizeof(common_act)); common_act.sa_handler = common_handler; - common_act.sa_mask = all_masked; + common_act.sa_mask = all_masked; - sigaction(SIGILL,&common_act,&ill_oact); + 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) - { + if (sigsetjmp(common_jmp, 1) == 0) { _sparcv9_rdtick(); OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; - } + } - if (sigsetjmp(common_jmp,1) == 0) - { + if (sigsetjmp(common_jmp, 1) == 0) { _sparcv9_vis1_probe(); OPENSSL_sparcv9cap_P |= SPARCV9_VIS1; /* detect UltraSPARC-Tx, see sparccpud.S for details... */ if (_sparcv9_vis1_instrument() >= 12) OPENSSL_sparcv9cap_P &= ~(SPARCV9_VIS1|SPARCV9_PREFER_FPU); - else - { + else { _sparcv9_vis2_probe(); OPENSSL_sparcv9cap_P |= SPARCV9_VIS2; - } } + } - if (sigsetjmp(common_jmp,1) == 0) - { + if (sigsetjmp(common_jmp, 1) == 0) { _sparcv9_fmadd_probe(); OPENSSL_sparcv9cap_P |= SPARCV9_FMADD; - } + } - sigaction(SIGBUS,&bus_oact,NULL); - sigaction(SIGILL,&ill_oact,NULL); + sigaction(SIGBUS, &bus_oact, NULL); + sigaction(SIGILL, &ill_oact, NULL); - sigprocmask(SIG_SETMASK,&oset,NULL); - } + sigprocmask(SIG_SETMASK, &oset, NULL); +} #endif -- cgit v1.2.3-55-g6feb