JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* autoload.cc (dll_chain1): Rename to dll_chain. Remove old dll_chain code.

Browse Source 
(wsock_init): Avoid unneeded winsock_active tests.
* winsup.h (winsock_active): Delete.
This commit is contained in:
Christopher Faylor 2004-04-15 17:38:02 +00:00
parent 703b16e3ab
commit ee0afa428a
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2004-04-15 Christopher Faylor <cgf@alum.bu.edu>
* autoload.cc (dll_chain1): Rename to dll_chain. Remove old dll_chain
code.
(wsock_init): Avoid unneeded winsock_active tests.
* winsup.h (winsock_active): Delete.
2004-04-15 Corinna Vinschen <corinna@vinschen.de> 2004-04-15 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (fhandler_disk_file::fchmo): Try opening * fhandler_disk_file.cc (fhandler_disk_file::fchmo): Try opening

17
winsup/cygwin/autoload.cc
View File

@ -106,9 +106,6 @@ extern "C" void dll_func_load () __asm__ ("dll_func_load");
functions from this DLL. */ functions from this DLL. */
extern "C" void dll_chain () __asm__ ("dll_chain"); extern "C" void dll_chain () __asm__ ("dll_chain");
/* called by the secondary initialization function to call dll_func_load. */
extern "C" void dll_chain1 () __asm__ ("dll_chain1");
extern "C" { extern "C" {
/* FIXME: This is not thread-safe? */ /* FIXME: This is not thread-safe? */
@ -164,12 +161,6 @@ gotit: \n\
\n\ \n\
.global dll_chain \n\ .global dll_chain \n\
dll_chain: \n\ dll_chain: \n\
pushl %eax # Restore 'return address' \n\
movl (%eax),%eax # Get address of DLL info block \n\
movl $dll_func_load,(%eax) # Just load func now \n\
jmp *%edx # Jump to next init function \n\
\n\
dll_chain1: \n\
pushl %eax # Restore 'return address' \n\ pushl %eax # Restore 'return address' \n\
jmp *%edx # Jump to next init function \n\ jmp *%edx # Jump to next init function \n\
"); ");
@ -264,7 +255,7 @@ wsock_init ()
low_priority_sleep (0); low_priority_sleep (0);
} }
if (!wsock_started && (winsock_active || winsock2_active)) if (!wsock_started)
{ {
/* Don't use autoload to load WSAStartup to eliminate recursion. */ /* Don't use autoload to load WSAStartup to eliminate recursion. */
int (*wsastartup) (int, WSADATA *); int (*wsastartup) (int, WSADATA *);
@ -290,13 +281,13 @@ wsock_init ()
InterlockedDecrement (&here); InterlockedDecrement (&here);
/* Kludge alert. Redirects the return address to dll_chain1. */ /* Kludge alert. Redirects the return address to dll_chain. */
__asm__ __volatile__ (" \n\ __asm__ __volatile__ (" \n\
movl $dll_chain1,4(%ebp) \n\ movl $dll_chain,4(%ebp) \n\
"); ");
volatile retchain ret; volatile retchain ret;
/* Set "arguments for dll_chain1. */ /* Set "arguments for dll_chain. */
ret.low = (long) dll_func_load; ret.low = (long) dll_func_load;
ret.high = (long) func; ret.high = (long) func;
return ret.ll; return ret.ll;