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

score: use new alignment routine in object extend information.

Browse Source
This commit is contained in:
Gedare Bloom
2013-02-12 10:22:52 -05:00
parent a24bd4696a
commit 9bd26e99c4
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cpukit/score/src/objectextendinformation.c
View File

@@ -117,6 +117,8 @@ void _Objects_Extend_information(
Objects_Control **local_table; Objects_Control **local_table;
void *old_tables; void *old_tables;
size_t block_size; size_t block_size;
uintptr_t object_blocks_size;
uintptr_t inactive_per_block_size;
/* /*
* Growing the tables means allocating a new area, doing a copy and * Growing the tables means allocating a new area, doing a copy and
@@ -142,15 +144,21 @@ void _Objects_Extend_information(
/* /*
* Allocate the tables and break it up. The tables are: * Allocate the tables and break it up. The tables are:
* 1. object_locks : void* * 1. object_blocks : void*
* 2. inactive_per_blocks : uint32_t * 2. inactive_per_blocks : uint32_t
* 3. local_table : Objects_Name* * 3. local_table : Objects_Name*
*/ */
#define ALIGN_BLOCK_SIZE(_s) \ object_blocks_size = (uintptr_t)_Addresses_Align_up(
(((_s) + (CPU_ALIGNMENT - 1)) & ~(CPU_ALIGNMENT - 1)) (void*)(block_count * sizeof(void*)),
block_size = ALIGN_BLOCK_SIZE( block_count * sizeof(void*) ) + CPU_ALIGNMENT
ALIGN_BLOCK_SIZE( block_count * sizeof(uint32_t) ) + );
((maximum + minimum_index) * sizeof(Objects_Control *)); inactive_per_block_size =
(uintptr_t)_Addresses_Align_up(
(void*)(block_count * sizeof(uint32_t)),
CPU_ALIGNMENT
);
block_size = object_blocks_size + inactive_per_block_size +
((maximum + minimum_index) * sizeof(Objects_Control *));
if ( information->auto_extend ) { if ( information->auto_extend ) {
object_blocks = _Workspace_Allocate( block_size ); object_blocks = _Workspace_Allocate( block_size );
if ( !object_blocks ) { if ( !object_blocks ) {
@@ -166,16 +174,12 @@ void _Objects_Extend_information(
*/ */
inactive_per_block = (uint32_t *) _Addresses_Add_offset( inactive_per_block = (uint32_t *) _Addresses_Add_offset(
object_blocks, object_blocks,
ALIGN_BLOCK_SIZE( block_count * sizeof(void*) ) object_blocks_size
); );
local_table = (Objects_Control **) _Addresses_Add_offset( local_table = (Objects_Control **) _Addresses_Add_offset(
inactive_per_block, inactive_per_block,
ALIGN_BLOCK_SIZE( block_count * sizeof(uint32_t) ) inactive_per_block_size
); );
if ( !_Addresses_Is_aligned( local_table ) ) {
local_table = (Objects_Control **)
(((uintptr_t)local_table + CPU_ALIGNMENT - 1) & ~(CPU_ALIGNMENT - 1));
}
/* /*
* Take the block count down. Saves all the (block_count - 1) * Take the block count down. Saves all the (block_count - 1)