RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2009-08-18 Sebastian Huber <Sebastian.Huber@embedded-brains.de>

Browse Source 
* score/src/heapallocatealigned.c: Change break to continue to fix
	issue encountered on ARM. Fix indentation.
This commit is contained in:
Joel Sherrill
2009-08-18 16:15:16 +00:00
parent 7ca51e389d
commit 09794266c4
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/ChangeLog
View File

@@ -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> 2009-08-18 Joel Sherrill <joel.sherrill@OARcorp.com>
* rtems/src/timerreset.c: Rework to ease analysis. * rtems/src/timerreset.c: Rework to ease analysis.

23
cpukit/score/src/heapallocatealigned.c
View File

@@ -214,27 +214,28 @@ void *_Heap_Allocate_aligned(
_Heap_Align_up_uptr(&aligned_user_addr, alignment); _Heap_Align_up_uptr(&aligned_user_addr, alignment);
if (aligned_user_addr - user_addr >= page_size) { if (aligned_user_addr - user_addr >= page_size) {
/* No, we can't use the block */ /* No, we can't use the block */
goto exit_point; continue;
}
} }
} }
}
/* The block is indeed acceptable: calculate the size of the block /* The block is indeed acceptable: calculate the size of the block
to be allocated and perform allocation. */ to be allocated and perform allocation. */
uint32_t const alloc_size = uint32_t const alloc_size =
block_end - user_addr + HEAP_BLOCK_USER_OFFSET; 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->searches += search_count + 1;
stats->allocs += 1; stats->allocs += 1;
check_result(the_heap, the_block, user_addr, check_result(the_heap, the_block, user_addr,
aligned_user_addr, size); aligned_user_addr, size);
user_ptr = (void*)aligned_user_addr; user_ptr = (void*)aligned_user_addr;
break; break;
} }
} }