libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup in dcrt0.cc and fork.cc 

* dcrt0.cc (child_info_fork::alloc_stack): Fix formatting.
        * fork.cc (frok::parent): Fix formatting.
        (child_copy): Change type of res to BOOL.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-12-03 12:59:56 +01:00
parent 111f32f4ba
commit 81e6c7515d
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2015-12-03 Corinna Vinschen <corinna@vinschen.de>
* dcrt0.cc (child_info_fork::alloc_stack): Fix formatting.
* fork.cc (frok::parent): Fix formatting.
(child_copy): Change type of res to BOOL.
2015-12-03 Corinna Vinschen <corinna@vinschen.de>
* crt0.cc (dll_crt0_1): Always restore the TEB stack info. Especially

6
winsup/cygwin/dcrt0.cc
View File

@ -472,9 +472,9 @@ child_info_fork::alloc_stack ()
/* Fork has been called from main thread. Simply commit the region
of the stack commited in the parent but not yet commited in the
child and create new guardpages. */
if (NtCurrentTeb()->Tib.StackLimit > stacklimit)
if (NtCurrentTeb ()->Tib.StackLimit > stacklimit)
{
SIZE_T commitsize = (PBYTE) NtCurrentTeb()->Tib.StackLimit
SIZE_T commitsize = (PBYTE) NtCurrentTeb ()->Tib.StackLimit
- (PBYTE) stacklimit;
if (!VirtualAlloc (stacklimit, commitsize, MEM_COMMIT, PAGE_READWRITE))
api_fatal ("can't commit child memory for stack %p(%ly), %E",
@ -484,7 +484,7 @@ child_info_fork::alloc_stack ()
MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD))
api_fatal ("fork: couldn't allocate new stack guard page %p, %E",
guardpage);
NtCurrentTeb()->Tib.StackLimit = stacklimit;
NtCurrentTeb ()->Tib.StackLimit = stacklimit;
}
/* This only affects forked children of a process started from a native
64 bit process, but it doesn't hurt to do it unconditionally. Fix

6
winsup/cygwin/fork.cc
View File

@ -308,7 +308,7 @@ frok::parent (volatile char * volatile stack_here)
ch.forker_finished = forker_finished;
ch.from_main = &_my_tls == _main_tls;
ch.stackbase = NtCurrentTeb()->Tib.StackBase;
ch.stackbase = NtCurrentTeb ()->Tib.StackBase;
ch.stackaddr = NtCurrentTeb ()->DeallocationStack;
if (!ch.stackaddr)
{
@ -316,7 +316,7 @@ frok::parent (volatile char * volatile stack_here)
stack. If so, the entire stack is committed anyway and StackLimit
points to the allocation address of the stack. Mark in guardsize that
we must not set up guard pages. */
ch.stackaddr = ch.stacklimit = NtCurrentTeb()->Tib.StackLimit;
ch.stackaddr = ch.stacklimit = NtCurrentTeb ()->Tib.StackLimit;
ch.guardsize = (size_t) -1;
}
else
@ -683,7 +683,7 @@ child_copy (HANDLE hp, bool write, ...)
SIZE_T done = 0;
if (here + todo > high)
todo = high - here;
int res;
BOOL res;
if (write)
res = WriteProcessMemory (hp, here, here, todo, &done);
else