From dea3eccb38b556b04552219e00b7abd656587278 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 6 Sep 2009 15:24:08 +0000 Subject: 2009-09-06 Sebastian Huber * libcsupport/src/free.c, libmisc/stackchk/check.c, rtems/include/rtems/rtems/region.h, rtems/src/regioncreate.c, rtems/src/regionextend.c, rtems/src/regiongetinfo.c, rtems/src/regiongetsegment.c, rtems/src/regiongetsegmentsize.c, rtems/src/regionresizesegment.c, score/src/pheapallocate.c, score/src/pheapallocatealigned.c, score/src/pheapextend.c, score/src/pheapfree.c, score/src/pheapgetblocksize.c, score/src/pheapgetfreeinfo.c, score/src/pheapgetinfo.c, score/src/pheapgetsize.c, score/src/pheapinit.c, score/src/pheapresizeblock.c, score/src/pheapwalk.c: Update for heap API changes. * score/include/rtems/score/apimutex.h, score/include/rtems/score/object.h: Documentation. * score/include/rtems/score/heap.h, score/include/rtems/score/protectedheap.h, score/inline/rtems/score/heap.inl, score/src/heap.c, score/src/heapallocate.c, score/src/heapallocatealigned.c, score/src/heapextend.c, score/src/heapfree.c, score/src/heapgetfreeinfo.c, score/src/heapgetinfo.c, score/src/heapresizeblock.c, score/src/heapsizeofuserarea.c, score/src/heapwalk.c: Overall cleanup. Added boundary constraint to allocation function. More changes follow. --- cpukit/rtems/include/rtems/rtems/region.h | 24 ++++++++++++------------ cpukit/rtems/src/regioncreate.c | 4 ++-- cpukit/rtems/src/regionextend.c | 4 ++-- cpukit/rtems/src/regiongetinfo.c | 7 ++----- cpukit/rtems/src/regiongetsegment.c | 2 +- cpukit/rtems/src/regiongetsegmentsize.c | 2 +- cpukit/rtems/src/regionresizesegment.c | 8 ++++---- 7 files changed, 24 insertions(+), 27 deletions(-) (limited to 'cpukit/rtems') diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h index 938be4e77d..905a580ec1 100644 --- a/cpukit/rtems/include/rtems/rtems/region.h +++ b/cpukit/rtems/include/rtems/rtems/region.h @@ -69,9 +69,9 @@ typedef struct { Objects_Control Object; Thread_queue_Control Wait_queue; /* waiting threads */ void *starting_address; /* physical start addr */ - intptr_t length; /* physical length(bytes) */ - uint32_t page_size; /* in bytes */ - intptr_t maximum_segment_size; /* in bytes */ + uintptr_t length; /* physical length(bytes) */ + uintptr_t page_size; /* in bytes */ + uintptr_t maximum_segment_size; /* in bytes */ rtems_attribute attribute_set; uint32_t number_of_used_blocks; /* blocks allocated */ Heap_Control Memory; @@ -104,9 +104,9 @@ void _Region_Manager_initialization(void); rtems_status_code rtems_region_create( rtems_name name, void *starting_address, - intptr_t length, - uint32_t page_size, - rtems_attribute attribute_set, + uintptr_t length, + uintptr_t page_size, + rtems_attribute attribute_set, Objects_Id *id ); @@ -121,7 +121,7 @@ rtems_status_code rtems_region_create( rtems_status_code rtems_region_extend( Objects_Id id, void *starting_address, - intptr_t length + uintptr_t length ); /** @@ -184,10 +184,10 @@ rtems_status_code rtems_region_delete( */ rtems_status_code rtems_region_get_segment( Objects_Id id, - intptr_t size, + uintptr_t size, rtems_option option_set, rtems_interval timeout, - void **segment + void **segment ); /** @@ -199,7 +199,7 @@ rtems_status_code rtems_region_get_segment( rtems_status_code rtems_region_get_segment_size( Objects_Id id, void *segment, - intptr_t *size + uintptr_t *size ); /** @@ -241,8 +241,8 @@ rtems_status_code rtems_region_return_segment( rtems_status_code rtems_region_resize_segment( Objects_Id id, void *segment, - intptr_t size, - intptr_t *old_size + uintptr_t size, + uintptr_t *old_size ); #ifndef __RTEMS_APPLICATION__ diff --git a/cpukit/rtems/src/regioncreate.c b/cpukit/rtems/src/regioncreate.c index 98c29bb94a..66beec13fd 100644 --- a/cpukit/rtems/src/regioncreate.c +++ b/cpukit/rtems/src/regioncreate.c @@ -50,8 +50,8 @@ rtems_status_code rtems_region_create( rtems_name name, void *starting_address, - intptr_t length, - uint32_t page_size, + uintptr_t length, + uintptr_t page_size, rtems_attribute attribute_set, Objects_Id *id ) diff --git a/cpukit/rtems/src/regionextend.c b/cpukit/rtems/src/regionextend.c index cf02444b56..a198aabebc 100644 --- a/cpukit/rtems/src/regionextend.c +++ b/cpukit/rtems/src/regionextend.c @@ -45,10 +45,10 @@ rtems_status_code rtems_region_extend( Objects_Id id, void *starting_address, - intptr_t length + uintptr_t length ) { - intptr_t amount_extended; + uintptr_t amount_extended; Heap_Extend_status heap_status; Objects_Locations location; rtems_status_code return_status; diff --git a/cpukit/rtems/src/regiongetinfo.c b/cpukit/rtems/src/regiongetinfo.c index 2fad55dcff..31d5166e0d 100644 --- a/cpukit/rtems/src/regiongetinfo.c +++ b/cpukit/rtems/src/regiongetinfo.c @@ -60,11 +60,8 @@ rtems_status_code rtems_region_get_information( switch ( location ) { case OBJECTS_LOCAL: - if ( _Heap_Get_information( &the_region->Memory, the_info ) != - HEAP_GET_INFORMATION_SUCCESSFUL ) - return_status = RTEMS_INVALID_ADDRESS; - else - return_status = RTEMS_SUCCESSFUL; + _Heap_Get_information( &the_region->Memory, the_info ); + return_status = RTEMS_SUCCESSFUL; break; #if defined(RTEMS_MULTIPROCESSING) diff --git a/cpukit/rtems/src/regiongetsegment.c b/cpukit/rtems/src/regiongetsegment.c index e060a8a4e9..af70ead300 100644 --- a/cpukit/rtems/src/regiongetsegment.c +++ b/cpukit/rtems/src/regiongetsegment.c @@ -47,7 +47,7 @@ rtems_status_code rtems_region_get_segment( Objects_Id id, - intptr_t size, + uintptr_t size, rtems_option option_set, rtems_interval timeout, void **segment diff --git a/cpukit/rtems/src/regiongetsegmentsize.c b/cpukit/rtems/src/regiongetsegmentsize.c index 203ce4c09a..fda11d0bc8 100644 --- a/cpukit/rtems/src/regiongetsegmentsize.c +++ b/cpukit/rtems/src/regiongetsegmentsize.c @@ -45,7 +45,7 @@ rtems_status_code rtems_region_get_segment_size( Objects_Id id, void *segment, - intptr_t *size + uintptr_t *size ) { Objects_Locations location; diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c index 2bbca2bae5..922641039f 100644 --- a/cpukit/rtems/src/regionresizesegment.c +++ b/cpukit/rtems/src/regionresizesegment.c @@ -46,13 +46,13 @@ rtems_status_code rtems_region_resize_segment( Objects_Id id, void *segment, - intptr_t size, - intptr_t *old_size + uintptr_t size, + uintptr_t *old_size ) { - intptr_t avail_size; + uintptr_t avail_size; Objects_Locations location; - intptr_t osize; + uintptr_t osize; rtems_status_code return_status = RTEMS_INTERNAL_ERROR; Heap_Resize_status status; register Region_Control *the_region; -- cgit v1.2.3