Replace all uses of magic numbers when operating on OPENSSL_ia32_P[] by

meaningful constants in a private header file, so that reviewers can actually
get a chance to figure out what the code is attempting to do without knowing
all cpuid bits.

While there, turn it from an array of two 32-bit ints into a properly aligned
64-bit int.

Use of OPENSSL_ia32_P is now restricted to the assembler parts. C code will
now always use OPENSSL_cpu_caps() and check for the proper bits in the
whole 64-bit word it returns.

i386 tests and ok jsing@

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/libcrypto/bn/asm/bn-586.pl b/src/lib/libcrypto/bn/asm/bn-586.pl
index 332ef3e91d..c4e2baa6c5 100644
--- a/src/lib/libcrypto/bn/asm/bn-586.pl
+++ b/src/lib/libcrypto/bn/asm/bn-586.pl
@@ -25,7 +25,7 @@ sub bn_mul_add_words
         {
         local($name)=@_;
 
-        &function_begin_B($name,$sse2?"EXTRN\t_OPENSSL_ia32cap_P:DWORD":"");
+        &function_begin_B($name,"");
 
         $r="eax";
         $a="edx";
@@ -33,7 +33,7 @@ sub bn_mul_add_words
 
         if ($sse2) {
                 &picmeup("eax","OPENSSL_ia32cap_P");
-                &bt(&DWP(0,"eax"),26);
+                &bt(&DWP(0,"eax"),"\$IA32CAP_BIT0_SSE2");
                 &jnc(&label("maw_non_sse2"));
 
                 &mov($r,&wparam(0));
@@ -211,7 +211,7 @@ sub bn_mul_words
         {
         local($name)=@_;
 
-        &function_begin_B($name,$sse2?"EXTRN\t_OPENSSL_ia32cap_P:DWORD":"");
+        &function_begin_B($name,"");
 
         $r="eax";
         $a="edx";
@@ -219,7 +219,7 @@ sub bn_mul_words
 
         if ($sse2) {
                 &picmeup("eax","OPENSSL_ia32cap_P");
-                &bt(&DWP(0,"eax"),26);
+                &bt(&DWP(0,"eax"),"\$IA32CAP_BIT0_SSE2");
                 &jnc(&label("mw_non_sse2"));
 
                 &mov($r,&wparam(0));
@@ -322,7 +322,7 @@ sub bn_sqr_words
         {
         local($name)=@_;
 
-        &function_begin_B($name,$sse2?"EXTRN\t_OPENSSL_ia32cap_P:DWORD":"");
+        &function_begin_B($name,"");
 
         $r="eax";
         $a="edx";
@@ -330,7 +330,7 @@ sub bn_sqr_words
 
         if ($sse2) {
                 &picmeup("eax","OPENSSL_ia32cap_P");
-                &bt(&DWP(0,"eax"),26);
+                &bt(&DWP(0,"eax"),"\$IA32CAP_BIT0_SSE2");
                 &jnc(&label("sqr_non_sse2"));
 
                 &mov($r,&wparam(0));