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

* exceptions.cc (sigreturn): Don't clobber ebp in recursive signal calls.

Browse Source
This commit is contained in:
Christopher Faylor 2003-08-22 19:25:56 +00:00
parent 9fc9e1c916
commit 897c6b5231
4 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2003-08-20 Pierre Humblet <pierre.humblet@ieee.org>
* exceptions.cc (sigreturn): Don't clobber ebp in recursive signal
calls.
2003-08-22 Christopher Faylor <cgf@redhat.com> 2003-08-22 Christopher Faylor <cgf@redhat.com>
* exceptions.cc (sig_handle): Change so that default signals indicate * exceptions.cc (sig_handle): Change so that default signals indicate

1
winsup/cygwin/cygheap.h
View File

@ -234,6 +234,7 @@ struct user_heap_info
void *base; void *base;
void *ptr; void *ptr;
void *top; void *top;
void *max;
unsigned chunk; unsigned chunk;
}; };

6
winsup/cygwin/exceptions.cc
View File

@ -1225,8 +1225,7 @@ _sigreturn: \n\
cmpl $0,%4 # Did a signal come in? \n\ cmpl $0,%4 # Did a signal come in? \n\
jz 1f # No, if zero \n\ jz 1f # No, if zero \n\
movl %2,%%eax \n\ movl %2,%%eax \n\
movl %%esp,%%ebp \n\ movl %%eax,36(%%esp) # Restore return address \n\
movl %%eax,36(%%ebp) # Restore return address \n\
jmp 3f \n\ jmp 3f \n\
\n\ \n\
1: popl %%eax # saved errno \n\ 1: popl %%eax # saved errno \n\
@ -1275,7 +1274,8 @@ _sigdelayed0: \n\
__no_sig_end: \n\ __no_sig_end: \n\
" : "=m" (sigsave.sig): "X" ((char *) &_impure_ptr->_errno), " : "=m" (sigsave.sig): "X" ((char *) &_impure_ptr->_errno),
"g" (sigsave.retaddr), "g" (sigsave.oldmask), "g" (sigsave.sig), "g" (sigsave.retaddr), "g" (sigsave.oldmask), "g" (sigsave.sig),
"g" (sigsave.func), "g" (sigsave.saved_errno), "g" (sigsave.newmask) "g" (sigsave.func), "g" (sigsave.saved_errno), "g" (sigsave.newmask),
"g" (sigsave.retaddr_on_stack)
); );
} }
} }

33
winsup/cygwin/heap.cc
View File

@ -56,6 +56,7 @@ heap_init ()
if (cygheap->user_heap.base == NULL) if (cygheap->user_heap.base == NULL)
api_fatal ("unable to allocate heap, heap_chunk_size %d, %E", api_fatal ("unable to allocate heap, heap_chunk_size %d, %E",
cygheap->user_heap.chunk); cygheap->user_heap.chunk);
cygheap->user_heap.max = (char *) cygheap->user_heap.base + cygheap->user_heap.chunk;
} }
else else
{ {
@ -101,7 +102,7 @@ sbrk (int n)
unsigned commitbytes, newbrksize; unsigned commitbytes, newbrksize;
if (n == 0) if (n == 0)
return cygheap->user_heap.ptr; /* Just wanted to find current cygheap->user_heap.ptr address */ return cygheap->user_heap.ptr; /* Just wanted to find current cygheap->user_heap.ptr address */
newbrk = (char *) cygheap->user_heap.ptr + n; /* Where new cygheap->user_heap.ptr will be */ newbrk = (char *) cygheap->user_heap.ptr + n; /* Where new cygheap->user_heap.ptr will be */
newtop = (char *) pround (newbrk); /* Actual top of allocated memory - newtop = (char *) pround (newbrk); /* Actual top of allocated memory -
@ -122,23 +123,33 @@ sbrk (int n)
assert (newtop > cygheap->user_heap.top); assert (newtop > cygheap->user_heap.top);
/* Need to grab more pages from the OS. If this fails it may be because /* Find the number of bytes to commit, rounded up to the nearest page. */
* we have used up previously reserved memory. Or, we're just plumb out
* of memory. */
commitbytes = pround (newtop - (char *) cygheap->user_heap.top); commitbytes = pround (newtop - (char *) cygheap->user_heap.top);
if (VirtualAlloc (cygheap->user_heap.top, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL)
goto good; /* Need to grab more pages from the OS. If this fails it may be because
we have used up previously reserved memory. Or, we're just plumb out
of memory. Only attempt to commit memory that we know we've previously
reserved. */
if (newtop <= cygheap->user_heap.max)
{
if (VirtualAlloc (cygheap->user_heap.top, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL)
goto good;
}
/* Couldn't allocate memory. Maybe we can reserve some more. /* Couldn't allocate memory. Maybe we can reserve some more.
Reserve either the maximum of the standard cygwin_shared->heap_chunk_size () or the requested Reserve either the maximum of the standard cygwin_shared->heap_chunk_size ()
amount. Then attempt to actually allocate it. */ or the requested amount. Then attempt to actually allocate it. */
if ((newbrksize = cygheap->user_heap.chunk) < commitbytes) if ((newbrksize = cygheap->user_heap.chunk) < commitbytes)
newbrksize = commitbytes; newbrksize = commitbytes;
if ((VirtualAlloc (cygheap->user_heap.top, newbrksize, MEM_RESERVE, PAGE_NOACCESS) != NULL) && if ((VirtualAlloc (cygheap->user_heap.top, newbrksize, MEM_RESERVE, PAGE_NOACCESS)
(VirtualAlloc (cygheap->user_heap.top, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL)) || VirtualAlloc (cygheap->user_heap.top, newbrksize = commitbytes, MEM_RESERVE, PAGE_NOACCESS))
goto good; && VirtualAlloc (cygheap->user_heap.top, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL)
{
(char *) cygheap->user_heap.max += newbrksize;
goto good;
}
err: err:
set_errno (ENOMEM); set_errno (ENOMEM);