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@

2 files changed, 10 insertions, 8 deletions

diff --git a/src/lib/libcrypto/rc4/asm/rc4-586.pl b/src/lib/libcrypto/rc4/asm/rc4-586.pl
index 84f1a798cb..03f0cff467 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-586.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-586.pl
@@ -189,7 +189,8 @@ if ($alt=0) {
         &jz     (&label("go4loop4"));
 
         &picmeup($out,"OPENSSL_ia32cap_P");
-        &bt     (&DWP(0,$out),26);      # check SSE2 bit [could have been MMX]
+        # check SSE2 bit [could have been MMX]
+        &bt     (&DWP(0,$out),"\$IA32CAP_BIT0_SSE2");
         &jnc    (&label("go4loop4"));
 
         &mov    ($out,&wparam(3))       if (!$alt);
@@ -312,7 +313,7 @@ $idx="edx";
         &xor    ("eax","eax");
         &mov    (&DWP(-4,$out),$idi);           # borrow key->y
 
-        &bt     (&DWP(0,$idx),20);              # check for bit#20
+        &bt     (&DWP(0,$idx),"\$IA32CAP_BIT0_INTELP4");
         &jc     (&label("c1stloop"));
 
 &set_label("w1stloop",16);
@@ -388,9 +389,9 @@ $idx="edx";
         &lea    ("eax",&DWP(&label("opts")."-".&label("pic_point"),"eax"));
         &picmeup("edx","OPENSSL_ia32cap_P");
         &mov    ("edx",&DWP(0,"edx"));
-        &bt     ("edx",20);
+        &bt     ("edx","\$IA32CAP_BIT0_INTELP4");
         &jc     (&label("1xchar"));
-        &bt     ("edx",26);
+        &bt     ("edx","\$IA32CAP_BIT0_SSE2");
         &jnc    (&label("ret"));
         &add    ("eax",25);
         &ret    ();
diff --git a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
index 197749dda7..2135b38ef8 100755
--- a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
@@ -122,6 +122,7 @@ $out="%rcx";	    # arg4
 $code=<<___;
 .text
 .extern OPENSSL_ia32cap_P
+.hidden OPENSSL_ia32cap_P
 
 .globl  RC4
 .type   RC4,\@function,4
@@ -164,7 +165,7 @@ $code.=<<___;
         movl    ($dat,$XX[0],4),$TX[0]#d
         test    \$-16,$len
         jz      .Lloop1
-        bt      \$30,%r8d       # Intel CPU?
+        bt      \$IA32CAP_BIT0_INTEL,%r8d       # Intel CPU?
         jc      .Lintel
         and     \$7,$TX[1]
         lea     1($XX[0]),$XX[1]
@@ -442,7 +443,7 @@ RC4_set_key:
         xor     %r11,%r11
 
         mov     OPENSSL_ia32cap_P(%rip),$idx#d
-        bt      \$20,$idx#d     # RC4_CHAR?
+        bt      \$IA32CAP_BIT0_INTELP4,$idx#d   # RC4_CHAR?
         jc      .Lc1stloop
         jmp     .Lw1stloop
 
@@ -506,9 +507,9 @@ RC4_set_key:
 RC4_options:
         lea     .Lopts(%rip),%rax
         mov     OPENSSL_ia32cap_P(%rip),%edx
-        bt      \$20,%edx
+        bt      \$IA32CAP_BIT0_INTELP4,%edx
         jc      .L8xchar
-        bt      \$30,%edx
+        bt      \$IA32CAP_BIT0_INTEL,%edx
         jnc     .Ldone
         add     \$25,%rax
         ret