From 41eb1e40900196835f903485a6f81637e6b2210f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 14 Dec 2008 22:48:54 +0000 Subject: 2008-12-14 Joel Sherrill * libcsupport/src/realloc.c, rtems/include/rtems/rtems/region.h, rtems/src/regioncreate.c, rtems/src/regionextend.c, rtems/src/regiongetsegment.c, rtems/src/regiongetsegmentsize.c, rtems/src/regionmp.c, rtems/src/regionresizesegment.c, sapi/include/rtems/config.h, score/include/rtems/score/heap.h, score/include/rtems/score/protectedheap.h, score/src/heap.c, score/src/heapallocate.c, score/src/heapallocatealigned.c, score/src/heapextend.c, score/src/heapresizeblock.c, score/src/heapsizeofuserarea.c, score/src/pheapallocate.c, score/src/pheapallocatealigned.c, score/src/pheapextend.c, score/src/pheapgetblocksize.c, score/src/pheapresizeblock.c: Change sizes of heap/region and allocated objects in heap to intptr_t so they can be larger than a single allocatable object (e.g. size_t). --- cpukit/rtems/include/rtems/rtems/region.h | 16 ++++++++-------- cpukit/rtems/src/regioncreate.c | 2 +- cpukit/rtems/src/regionextend.c | 4 ++-- cpukit/rtems/src/regiongetsegment.c | 2 +- cpukit/rtems/src/regiongetsegmentsize.c | 2 +- cpukit/rtems/src/regionmp.c | 2 +- cpukit/rtems/src/regionresizesegment.c | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'cpukit/rtems') diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h index 74d66ea334..085b317a2c 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 */ - uint32_t length; /* physical length(bytes) */ + intptr_t length; /* physical length(bytes) */ uint32_t page_size; /* in bytes */ - uint32_t maximum_segment_size; /* in bytes */ + intptr_t maximum_segment_size; /* in bytes */ rtems_attribute attribute_set; uint32_t number_of_used_blocks; /* blocks allocated */ Heap_Control Memory; @@ -106,7 +106,7 @@ void _Region_Manager_initialization( rtems_status_code rtems_region_create( rtems_name name, void *starting_address, - uint32_t length, + intptr_t length, uint32_t page_size, rtems_attribute attribute_set, Objects_Id *id @@ -123,7 +123,7 @@ rtems_status_code rtems_region_create( rtems_status_code rtems_region_extend( Objects_Id id, void *starting_address, - uint32_t length + intptr_t length ); /** @@ -186,7 +186,7 @@ rtems_status_code rtems_region_delete( */ rtems_status_code rtems_region_get_segment( Objects_Id id, - uint32_t size, + intptr_t size, rtems_option option_set, rtems_interval timeout, void **segment @@ -201,7 +201,7 @@ rtems_status_code rtems_region_get_segment( rtems_status_code rtems_region_get_segment_size( Objects_Id id, void *segment, - size_t *size + intptr_t *size ); /** @@ -243,8 +243,8 @@ rtems_status_code rtems_region_return_segment( rtems_status_code rtems_region_resize_segment( Objects_Id id, void *segment, - size_t size, - size_t *old_size + intptr_t size, + intptr_t *old_size ); #ifndef __RTEMS_APPLICATION__ diff --git a/cpukit/rtems/src/regioncreate.c b/cpukit/rtems/src/regioncreate.c index ec305b71a3..98c29bb94a 100644 --- a/cpukit/rtems/src/regioncreate.c +++ b/cpukit/rtems/src/regioncreate.c @@ -50,7 +50,7 @@ rtems_status_code rtems_region_create( rtems_name name, void *starting_address, - uint32_t length, + intptr_t length, uint32_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 d8ad00b55c..7f29109e61 100644 --- a/cpukit/rtems/src/regionextend.c +++ b/cpukit/rtems/src/regionextend.c @@ -46,10 +46,10 @@ rtems_status_code rtems_region_extend( Objects_Id id, void *starting_address, - uint32_t length + intptr_t length ) { - uint32_t amount_extended; + intptr_t amount_extended; Heap_Extend_status heap_status; Objects_Locations location; rtems_status_code return_status = RTEMS_INTERNAL_ERROR; diff --git a/cpukit/rtems/src/regiongetsegment.c b/cpukit/rtems/src/regiongetsegment.c index c8b7d46233..e060a8a4e9 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, - uint32_t size, + intptr_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 7d70b6188b..fd5f3c50e6 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, - size_t *size + intptr_t *size ) { Objects_Locations location; diff --git a/cpukit/rtems/src/regionmp.c b/cpukit/rtems/src/regionmp.c index 48148cc726..94d0104ae9 100644 --- a/cpukit/rtems/src/regionmp.c +++ b/cpukit/rtems/src/regionmp.c @@ -83,7 +83,7 @@ rtems_status_code _Region_MP_Send_request_packet ( Region_MP_Remote_operations operation, Objects_Id region_id, void *segment, - uint32_t size, + intptr_t size, rtems_option option_set, rtems_interval timeout ) diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c index 43cb302afd..2bbca2bae5 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, - size_t size, - size_t *old_size + intptr_t size, + intptr_t *old_size ) { - uint32_t avail_size; + intptr_t avail_size; Objects_Locations location; - uint32_t osize; + intptr_t osize; rtems_status_code return_status = RTEMS_INTERNAL_ERROR; Heap_Resize_status status; register Region_Control *the_region; -- cgit v1.2.3