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

* winbase.h: Semi-reinstantiate to workaround lack inline assembler

Browse Source 
implementation of InterlockedCompareExchange for i686 in Mingw64
	headers.
	* pinfo.cc (pinfo::init): Remove unused variable mapaddr.
This commit is contained in:
Corinna Vinschen 2012-11-11 10:56:01 +00:00
parent 3211d6c91f
commit 0d963613b0
3 changed files with 45 additions and 8 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 @@
2012-11-11 Corinna Vinschen <corinna@vinschen.de>
* winbase.h: Semi-reinstantiate to workaround lack inline assembler
implementation of InterlockedCompareExchange for i686 in Mingw64
headers.
* pinfo.cc (pinfo::init): Remove unused variable mapaddr.
2012-11-08 Corinna Vinschen <corinna@vinschen.de> 2012-11-08 Corinna Vinschen <corinna@vinschen.de>
* sigproc.cc (proc_subproc): Delete unused variable child. * sigproc.cc (proc_subproc): Delete unused variable child.

11
winsup/cygwin/pinfo.cc
View File

@ -242,7 +242,6 @@ pinfo::init (pid_t n, DWORD flag, HANDLE h0)
return; return;
} }
void *mapaddr;
int createit = flag & (PID_IN_USE | PID_EXECED); int createit = flag & (PID_IN_USE | PID_EXECED);
DWORD access = FILE_MAP_READ DWORD access = FILE_MAP_READ
| (flag & (PID_IN_USE | PID_EXECED | PID_MAP_RW) | (flag & (PID_IN_USE | PID_EXECED | PID_MAP_RW)
@ -284,13 +283,9 @@ pinfo::init (pid_t n, DWORD flag, HANDLE h0)
if (exit_state) if (exit_state)
return; return;
switch (GetLastError ()) if (GetLastError () == ERROR_INVALID_HANDLE)
{ api_fatal ("MapViewOfFileEx h0 %p, i %d failed, %E", h0, i);
case ERROR_INVALID_HANDLE:
api_fatal ("MapViewOfFileEx h0 %p, i %d failed, %E", h0, i);
case ERROR_INVALID_ADDRESS:
mapaddr = NULL;
}
debug_printf ("MapViewOfFileEx h0 %p, i %d failed, %E", h0, i); debug_printf ("MapViewOfFileEx h0 %p, i %d failed, %E", h0, i);
yield (); yield ();
continue; continue;

35
winsup/cygwin/winbase.h Normal file
View File

@ -0,0 +1,35 @@
/* winbase.h
Copyright 2002, 2003, 2004, 2008, 2009, 2012 Red Hat, Inc.
This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
#include_next "winbase.h"
#ifndef _WINBASE2_H
#define _WINBASE2_H
#ifndef __x86_64__
extern __inline__ LONG
ilockcmpexch (volatile LONG *t, LONG v, LONG c)
{
return
({
register LONG ret __asm ("%eax");
__asm __volatile ("lock cmpxchgl %2, %1"
: "=a" (ret), "=m" (*t)
: "r" (v), "m" (*t), "0" (c)
: "memory");
ret;
});
}
#undef InterlockedCompareExchange
#define InterlockedCompareExchange ilockcmpexch
#undef InterlockedCompareExchangePointer
#define InterlockedCompareExchangePointer(d,e,c) \
(PVOID)InterlockedCompareExchange((LONG volatile *)(d),(LONG)(e),(LONG)(c))
#endif /* !__x86_64 */
#endif /*_WINBASE2_H*/