diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-18 16:15:16 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-18 16:15:16 +0000 |
| commit | 09794266c414a013b7100fdeb287237069eac77e (patch) | |
| tree | 984c53d75d335dc817020a7df0e41d61942ae305 /cpukit | |
| parent | 2009-08-18 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-09794266c414a013b7100fdeb287237069eac77e.tar.bz2 | |
2009-08-18 Sebastian Huber <Sebastian.Huber@embedded-brains.de>
* score/src/heapallocatealigned.c: Change break to continue to fix
issue encountered on ARM. Fix indentation.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/src/heapallocatealigned.c | 23 |
2 files changed, 17 insertions, 11 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 3abd82fcd4..43eb9fce45 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2009-08-18 Sebastian Huber <Sebastian.Huber@embedded-brains.de> + + * score/src/heapallocatealigned.c: Change break to continue to fix + issue encountered on ARM. Fix indentation. + 2009-08-18 Joel Sherrill <joel.sherrill@OARcorp.com> * rtems/src/timerreset.c: Rework to ease analysis. diff --git a/cpukit/score/src/heapallocatealigned.c b/cpukit/score/src/heapallocatealigned.c index 5e6c2c7841..5f1a941c01 100644 --- a/cpukit/score/src/heapallocatealigned.c +++ b/cpukit/score/src/heapallocatealigned.c @@ -214,27 +214,28 @@ void *_Heap_Allocate_aligned( _Heap_Align_up_uptr(&aligned_user_addr, alignment); if (aligned_user_addr - user_addr >= page_size) { /* No, we can't use the block */ - goto exit_point; + continue; + } } } - } - /* The block is indeed acceptable: calculate the size of the block - to be allocated and perform allocation. */ - uint32_t const alloc_size = - block_end - user_addr + HEAP_BLOCK_USER_OFFSET; + /* The block is indeed acceptable: calculate the size of the block + to be allocated and perform allocation. */ + uint32_t const alloc_size = + block_end - user_addr + HEAP_BLOCK_USER_OFFSET; - _HAssert(_Heap_Is_aligned_ptr((void*)aligned_user_addr, alignment)); + _HAssert(_Heap_Is_aligned_ptr((void*)aligned_user_addr, alignment)); - the_block = block_allocate(the_heap, the_block, alloc_size); + the_block = block_allocate(the_heap, the_block, alloc_size); - stats->searches += search_count + 1; - stats->allocs += 1; + stats->searches += search_count + 1; + stats->allocs += 1; - check_result(the_heap, the_block, user_addr, + check_result(the_heap, the_block, user_addr, aligned_user_addr, size); user_ptr = (void*)aligned_user_addr; + break; } } |