Remove OPENSSL_indirect_call()
authorBenjamin Kaduk <bkaduk@akamai.com>
Tue, 28 Feb 2017 22:32:51 +0000 (16:32 -0600)
committerRich Salz <rsalz@openssl.org>
Wed, 1 Mar 2017 01:14:31 +0000 (20:14 -0500)
It's undocumented and unused in the tree.  The idea seems to have
never gained much traction, and can be removed without breaking
ABI compatibility.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2800)

crypto/x86cpuid.pl

index 176e8e38c8d6f21a260c91abb594e4c7dcbb7c61..d3e7ade9b0596b47372ddb85757bedcda089fb92 100644 (file)
@@ -292,45 +292,6 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
        &ret    ();
 &function_end_B("OPENSSL_atomic_add");
 
-# This function can become handy under Win32 in situations when
-# we don't know which calling convention, __stdcall or __cdecl(*),
-# indirect callee is using. In C it can be deployed as
-#
-#ifdef OPENSSL_CPUID_OBJ
-#      type OPENSSL_indirect_call(void *f,...);
-#      ...
-#      OPENSSL_indirect_call(func,[up to $max arguments]);
-#endif
-#
-# (*)  it's designed to work even for __fastcall if number of
-#      arguments is 1 or 2!
-&function_begin_B("OPENSSL_indirect_call");
-       {
-       my ($max,$i)=(7,);      # $max has to be chosen as 4*n-1
-                               # in order to preserve eventual
-                               # stack alignment
-       &push   ("ebp");
-       &mov    ("ebp","esp");
-       &sub    ("esp",$max*4);
-       &mov    ("ecx",&DWP(12,"ebp"));
-       &mov    (&DWP(0,"esp"),"ecx");
-       &mov    ("edx",&DWP(16,"ebp"));
-       &mov    (&DWP(4,"esp"),"edx");
-       for($i=2;$i<$max;$i++)
-               {
-               # Some copies will be redundant/bogus...
-               &mov    ("eax",&DWP(12+$i*4,"ebp"));
-               &mov    (&DWP(0+$i*4,"esp"),"eax");
-               }
-       &call_ptr       (&DWP(8,"ebp"));# make the call...
-       &mov    ("esp","ebp");  # ... and just restore the stack pointer
-                               # without paying attention to what we called,
-                               # (__cdecl *func) or (__stdcall *one).
-       &pop    ("ebp");
-       &ret    ();
-       }
-&function_end_B("OPENSSL_indirect_call");
-
 &function_begin_B("OPENSSL_cleanse");
        &mov    ("edx",&wparam(0));
        &mov    ("ecx",&wparam(1));