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/score/include/rtems/score/heap.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'cpukit/score/include/rtems/score/heap.h') diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h index 0587852d78..286205dffc 100644 --- a/cpukit/score/include/rtems/score/heap.h +++ b/cpukit/score/include/rtems/score/heap.h @@ -145,11 +145,11 @@ typedef struct { /** instance number of this heap */ uint32_t instance; /** the size of the memory for heap */ - uint32_t size; + intptr_t size; /** current free size */ - uint32_t free_size; + intptr_t free_size; /** minimum free size ever */ - uint32_t min_free_size; + intptr_t min_free_size; /** current number of free blocks */ uint32_t free_blocks; /** maximum number of free blocks ever */ @@ -262,7 +262,7 @@ typedef struct { uint32_t _Heap_Initialize( Heap_Control *the_heap, void *starting_address, - size_t size, + intptr_t size, uint32_t page_size ); @@ -281,8 +281,8 @@ uint32_t _Heap_Initialize( Heap_Extend_status _Heap_Extend( Heap_Control *the_heap, void *starting_address, - size_t size, - uint32_t *amount_extended + intptr_t size, + intptr_t *amount_extended ); /** @@ -296,7 +296,7 @@ Heap_Extend_status _Heap_Extend( */ void *_Heap_Allocate( Heap_Control *the_heap, - size_t size + intptr_t size ); /** @@ -315,7 +315,7 @@ void *_Heap_Allocate( */ void *_Heap_Allocate_aligned( Heap_Control *the_heap, - size_t size, + intptr_t size, uint32_t alignment ); @@ -336,7 +336,7 @@ void *_Heap_Allocate_aligned( bool _Heap_Size_of_user_area( Heap_Control *the_heap, void *starting_address, - size_t *size + intptr_t *size ); /** @@ -364,9 +364,9 @@ bool _Heap_Size_of_user_area( Heap_Resize_status _Heap_Resize_block( Heap_Control *the_heap, void *starting_address, - size_t size, - uint32_t *old_mem_size, - uint32_t *avail_mem_size + intptr_t size, + intptr_t *old_mem_size, + intptr_t *avail_mem_size ); /** -- cgit v1.2.3