Remove DJGPP (and therefore WATT32) #ifdef's.

[openssl.git] / crypto / x86cpuid.pl

diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
index e8a75181afce09206f72fd82bb77db5f7b1493ab..dca37e7cd265878d04a77d6dea0235add06e4c74 100644 (file)
--- a/crypto/x86cpuid.pl
+++ b/crypto/x86cpuid.pl
@@ -81,6 +81,16 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
        &jmp    (&label("generic"));
        
 &set_label("intel");
+       &cmp    ("edi",7);
+       &jb     (&label("cacheinfo"));
+
+       &mov    ("esi",&wparam(0));
+       &mov    ("eax",7);
+       &xor    ("ecx","ecx");
+       &cpuid  ();
+       &mov    (&DWP(8,"esi"),"ebx");
+
+&set_label("cacheinfo");
        &cmp    ("edi",4);
        &mov    ("edi",-1);
        &jb     (&label("nocacheinfo"));
@@ -92,15 +102,6 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
        &shr    ("edi",14);
        &and    ("edi",0xfff);          # number of cores -1 per L1D
 
-       &cmp    ("edi",7);
-       &jb     (&label("nocacheinfo"));
-
-       &mov    ("esi",&wparam(0));
-       &mov    ("eax",7);
-       &xor    ("ecx","ecx");
-       &cpuid  ();
-       &mov    (&DWP(8,"esi"),"ebx");
-
 &set_label("nocacheinfo");
        &mov    ("eax",1);
        &xor    ("ecx","ecx");
@@ -167,7 +168,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
        &ret    ();
 &function_end_B("OPENSSL_rdtsc");
 
-# This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host],
+# This works in Ring 0 only [read MS-DOS+privileged DPMI host],
 # but it's safe to call it on any [supported] 32-bit platform...
 # Just check for [non-]zero return value...
 &function_begin_B("OPENSSL_instrument_halt","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
@@ -201,41 +202,6 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
        &ret    ();
 &function_end_B("OPENSSL_instrument_halt");
 
-# Essentially there is only one use for this function. Under DJGPP:
-#
-#      #include <go32.h>
-#      ...
-#      i=OPENSSL_far_spin(_dos_ds,0x46c);
-#      ...
-# to obtain the number of spins till closest timer interrupt.
-
-&function_begin_B("OPENSSL_far_spin");
-       &pushf  ();
-       &pop    ("eax");
-       &bt     ("eax",9);
-       &jnc    (&label("nospin"));     # interrupts are disabled
-
-       &mov    ("eax",&DWP(4,"esp"));
-       &mov    ("ecx",&DWP(8,"esp"));
-       &data_word (0x90d88e1e);        # push %ds, mov %eax,%ds
-       &xor    ("eax","eax");
-       &mov    ("edx",&DWP(0,"ecx"));
-       &jmp    (&label("spin"));
-
-       &align  (16);
-&set_label("spin");
-       &inc    ("eax");
-       &cmp    ("edx",&DWP(0,"ecx"));
-       &je     (&label("spin"));
-
-       &data_word (0x1f909090);        # pop   %ds
-       &ret    ();
-
-&set_label("nospin");
-       &xor    ("eax","eax");
-       &xor    ("edx","edx");
-       &ret    ();
-&function_end_B("OPENSSL_far_spin");
 
 &function_begin_B("OPENSSL_wipe_cpu","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
        &xor    ("eax","eax");
@@ -468,6 +434,18 @@ my $max = "ebp";
        &ret    ();
 &function_end_B("OPENSSL_ia32_rdrand");
 
+&function_begin_B("OPENSSL_ia32_rdseed");
+       &mov    ("ecx",8);
+&set_label("loop");
+       &rdseed ("eax");
+       &jc     (&label("break"));
+       &loop   (&label("loop"));
+&set_label("break");
+       &cmp    ("eax",0);
+       &cmove  ("eax","ecx");
+       &ret    ();
+&function_end_B("OPENSSL_ia32_rdseed");
+
 &initseg("OPENSSL_cpuid_setup");
 
 &hidden("OPENSSL_cpuid_setup");