Remove OPENSSL_instrument_halt and OPENSSL_far_spin, which both might

have been used under DJGPP in the previous century (if at all).

2 files changed, 0 insertions, 140 deletions

diff --git a/src/lib/libcrypto/x86cpuid.pl b/src/lib/libcrypto/x86cpuid.pl
index 47df147a83..8a96cda6e6 100644
--- a/src/lib/libcrypto/x86cpuid.pl
+++ b/src/lib/libcrypto/x86cpuid.pl
@@ -143,76 +143,6 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
 
 &external_label("OPENSSL_ia32cap_P");
 
-# This works in Ring 0 only [read DJGPP+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");
-        &picmeup("ecx","OPENSSL_ia32cap_P");
-        &bt     (&DWP(0,"ecx"),4);
-        &jnc    (&label("nohalt"));     # no TSC
-
-        &data_word(0x9058900e);         # push %cs; pop %eax
-        &and    ("eax",3);
-        &jnz    (&label("nohalt"));     # not enough privileges
-
-        &pushf  ();
-        &pop    ("eax");
-        &bt     ("eax",9);
-        &jnc    (&label("nohalt"));     # interrupts are disabled
-
-        &rdtsc  ();
-        &push   ("edx");
-        &push   ("eax");
-        &halt   ();
-        &rdtsc  ();
-
-        &sub    ("eax",&DWP(0,"esp"));
-        &sbb    ("edx",&DWP(4,"esp"));
-        &add    ("esp",8);
-        &ret    ();
-
-&set_label("nohalt");
-        &xor    ("eax","eax");
-        &xor    ("edx","edx");
-        &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");
         &xor    ("edx","edx");
diff --git a/src/lib/libssl/src/crypto/x86cpuid.pl b/src/lib/libssl/src/crypto/x86cpuid.pl
index 47df147a83..8a96cda6e6 100644
--- a/src/lib/libssl/src/crypto/x86cpuid.pl
+++ b/src/lib/libssl/src/crypto/x86cpuid.pl
@@ -143,76 +143,6 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
 
 &external_label("OPENSSL_ia32cap_P");
 
-# This works in Ring 0 only [read DJGPP+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");
-        &picmeup("ecx","OPENSSL_ia32cap_P");
-        &bt     (&DWP(0,"ecx"),4);
-        &jnc    (&label("nohalt"));     # no TSC
-
-        &data_word(0x9058900e);         # push %cs; pop %eax
-        &and    ("eax",3);
-        &jnz    (&label("nohalt"));     # not enough privileges
-
-        &pushf  ();
-        &pop    ("eax");
-        &bt     ("eax",9);
-        &jnc    (&label("nohalt"));     # interrupts are disabled
-
-        &rdtsc  ();
-        &push   ("edx");
-        &push   ("eax");
-        &halt   ();
-        &rdtsc  ();
-
-        &sub    ("eax",&DWP(0,"esp"));
-        &sbb    ("edx",&DWP(4,"esp"));
-        &add    ("esp",8);
-        &ret    ();
-
-&set_label("nohalt");
-        &xor    ("eax","eax");
-        &xor    ("edx","edx");
-        &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");
         &xor    ("edx","edx");