riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys/newlib/syscalls.c: Clean up _sbrk_r implementation

Browse Source
This commit is contained in:
Joakim Gebart 2015-08-04 21:05:08 +02:00
parent e7bb223eaa
commit 05fd5c16eb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/newlib/syscalls.c
View File

@ -43,7 +43,7 @@
*/ */
extern char _sheap; /* start of the heap */ extern char _sheap; /* start of the heap */
extern char _eheap; /* end of the heap */ extern char _eheap; /* end of the heap */
caddr_t heap_top = (caddr_t)&_sheap + 4; char *heap_top = &_sheap + 4;
/** /**
* @brief Initialize NewLib, called by __libc_init_array() from the startup script * @brief Initialize NewLib, called by __libc_init_array() from the startup script
@ -85,15 +85,14 @@ void _exit(int n)
* *
* @return [description] * @return [description]
*/ */
caddr_t _sbrk_r(struct _reent *r, ptrdiff_t incr) void *_sbrk_r(struct _reent *r, ptrdiff_t incr)
{ {
unsigned int state = disableIRQ(); unsigned int state = disableIRQ();
caddr_t res = heap_top; void *res = heap_top;
if (((incr > 0) && ((heap_top + incr > &_eheap) || (heap_top + incr < res))) || if ((heap_top + incr > &_eheap) || (heap_top + incr < &_sheap)) {
((incr < 0) && ((heap_top + incr < &_sheap) || (heap_top + incr > res)))) {
r->_errno = ENOMEM; r->_errno = ENOMEM;
res = (void *) -1; res = (void *)-1;
} }
else { else {
heap_top += incr; heap_top += incr;