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

2007-10-01 Patrick Mansfield <patmans@us.ibm.com> 

* spu/sbrk.c: Use the current stack pointer value rather than the
        maximum available memory to determine the amount of heap space
        left. Without this change calling sbrk() can allocate space that
        is currently in use on the stack.
This commit is contained in:
Jeff Johnston 2007-10-01 18:22:50 +00:00
parent 5716854549
commit eae493d8a8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgloss/ChangeLog
View File

@ -1,3 +1,10 @@
2007-10-01 Patrick Mansfield <patmans@us.ibm.com>
* spu/sbrk.c: Use the current stack pointer value rather than the
maximum available memory to determine the amount of heap space
left. Without this change calling sbrk() can allocate space that
is currently in use on the stack.
2007-09-26 Patrick Mansfield <patmans@us.ibm.com> 2007-09-26 Patrick Mansfield <patmans@us.ibm.com>
* spu/sched_yield.c: New file (missed on 2007-09-21). * spu/sched_yield.c: New file (missed on 2007-09-21).

5
libgloss/spu/sbrk.c
View File

@ -37,7 +37,6 @@ Author: Andreas Neukoetter (ti95neuk@de.ibm.com)
extern int errno; extern int errno;
extern caddr_t _end; extern caddr_t _end;
#define RAMSIZE 262144
#define STACKSIZE 4096 #define STACKSIZE 4096
void * void *
@ -47,6 +46,7 @@ sbrk (ptrdiff_t increment)
caddr_t base; caddr_t base;
vector unsigned int sp_reg, sp_delta; vector unsigned int sp_reg, sp_delta;
vector unsigned int *sp_ptr; vector unsigned int *sp_ptr;
caddr_t sps;
/* The stack pointer register. */ /* The stack pointer register. */
volatile register vector unsigned int sp_r1 __asm__("1"); volatile register vector unsigned int sp_r1 __asm__("1");
@ -54,7 +54,8 @@ sbrk (ptrdiff_t increment)
if (heap_ptr == NULL) if (heap_ptr == NULL)
heap_ptr = (caddr_t) & _end; heap_ptr = (caddr_t) & _end;
if (((RAMSIZE - STACKSIZE) - (int) heap_ptr) >= increment) sps = (caddr_t) spu_extract (sp_r1, 0);
if (((int) sps - STACKSIZE - (int) heap_ptr) >= increment)
{ {
base = heap_ptr; base = heap_ptr;
heap_ptr += increment; heap_ptr += increment;