summaryrefslogtreecommitdiffstats
path: root/cpukit/score
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-10-02 20:56:55 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-10-02 20:56:55 +0000
commit4c09f4b3fefc7ba5c5868a97ad00c1ee14a06677 (patch)
tree30ce362448a1d4d367e6532beac8b428315be09d /cpukit/score
parent2008-10-02 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-4c09f4b3fefc7ba5c5868a97ad00c1ee14a06677.tar.bz2
2008-10-02 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/src/malloc_statistics_helpers.c, libcsupport/src/realloc.c, rtems/include/rtems/rtems/region.h, rtems/include/rtems/rtems/support.h, rtems/src/regiongetsegmentsize.c, rtems/src/regionresizesegment.c, rtems/src/workspace.c, sapi/include/confdefs.h, score/include/rtems/score/heap.h, score/include/rtems/score/protectedheap.h, score/include/rtems/score/wkspace.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/pheapgetblocksize.c, score/src/wkspace.c: Change size_t to ssize_t on all Heap, Workspace and Region calls. On 16-bit architectures, size_t can be 16-bits which would limit sizes to 64K.
Diffstat (limited to 'cpukit/score')
-rw-r--r--cpukit/score/include/rtems/score/heap.h18
-rw-r--r--cpukit/score/include/rtems/score/protectedheap.h4
-rw-r--r--cpukit/score/include/rtems/score/wkspace.h6
-rw-r--r--cpukit/score/src/heap.c11
-rw-r--r--cpukit/score/src/heapallocate.c2
-rw-r--r--cpukit/score/src/heapallocatealigned.c2
-rw-r--r--cpukit/score/src/heapextend.c2
-rw-r--r--cpukit/score/src/heapresizeblock.c2
-rw-r--r--cpukit/score/src/heapsizeofuserarea.c2
-rw-r--r--cpukit/score/src/pheapgetblocksize.c2
-rw-r--r--cpukit/score/src/wkspace.c6
11 files changed, 29 insertions, 28 deletions
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h
index 0587852d78..78c15522fd 100644
--- a/cpukit/score/include/rtems/score/heap.h
+++ b/cpukit/score/include/rtems/score/heap.h
@@ -31,6 +31,8 @@
#ifndef _RTEMS_SCORE_HEAP_H
#define _RTEMS_SCORE_HEAP_H
+#include <sys/types.h>
+
/**
* @defgroup ScoreHeap Heap Handler
*
@@ -262,7 +264,7 @@ typedef struct {
uint32_t _Heap_Initialize(
Heap_Control *the_heap,
void *starting_address,
- size_t size,
+ ssize_t size,
uint32_t page_size
);
@@ -281,7 +283,7 @@ uint32_t _Heap_Initialize(
Heap_Extend_status _Heap_Extend(
Heap_Control *the_heap,
void *starting_address,
- size_t size,
+ ssize_t size,
uint32_t *amount_extended
);
@@ -296,7 +298,7 @@ Heap_Extend_status _Heap_Extend(
*/
void *_Heap_Allocate(
Heap_Control *the_heap,
- size_t size
+ ssize_t size
);
/**
@@ -315,7 +317,7 @@ void *_Heap_Allocate(
*/
void *_Heap_Allocate_aligned(
Heap_Control *the_heap,
- size_t size,
+ ssize_t size,
uint32_t alignment
);
@@ -336,7 +338,7 @@ void *_Heap_Allocate_aligned(
bool _Heap_Size_of_user_area(
Heap_Control *the_heap,
void *starting_address,
- size_t *size
+ ssize_t *size
);
/**
@@ -364,7 +366,7 @@ bool _Heap_Size_of_user_area(
Heap_Resize_status _Heap_Resize_block(
Heap_Control *the_heap,
void *starting_address,
- size_t size,
+ ssize_t size,
uint32_t *old_mem_size,
uint32_t *avail_mem_size
);
@@ -449,8 +451,8 @@ void _Heap_Get_free_information(
*
* @return This method returns block size on success, 0 if overflow occured.
*/
-extern size_t _Heap_Calc_block_size(
- size_t size,
+extern ssize_t _Heap_Calc_block_size(
+ ssize_t size,
uint32_t page_size,
uint32_t min_size
);
diff --git a/cpukit/score/include/rtems/score/protectedheap.h b/cpukit/score/include/rtems/score/protectedheap.h
index 78c2abc3d2..508e548354 100644
--- a/cpukit/score/include/rtems/score/protectedheap.h
+++ b/cpukit/score/include/rtems/score/protectedheap.h
@@ -54,7 +54,7 @@ extern "C" {
static inline uint32_t _Protected_heap_Initialize(
Heap_Control *the_heap,
void *starting_address,
- size_t size,
+ ssize_t size,
uint32_t page_size
)
{
@@ -128,7 +128,7 @@ void *_Protected_heap_Allocate_aligned(
bool _Protected_heap_Get_block_size(
Heap_Control *the_heap,
void *starting_address,
- size_t *size
+ ssize_t *size
);
/**
diff --git a/cpukit/score/include/rtems/score/wkspace.h b/cpukit/score/include/rtems/score/wkspace.h
index b4047c56fa..36fa34b420 100644
--- a/cpukit/score/include/rtems/score/wkspace.h
+++ b/cpukit/score/include/rtems/score/wkspace.h
@@ -52,7 +52,7 @@ SCORE_EXTERN Heap_Control _Workspace_Area; /* executive heap header */
*/
void _Workspace_Handler_initialization(
void *starting_address,
- size_t size
+ ssize_t size
);
/** @brief Allocate Memory from Workspace
@@ -66,7 +66,7 @@ void _Workspace_Handler_initialization(
* @return a pointer to the requested memory or NULL.
*/
void *_Workspace_Allocate(
- size_t size
+ ssize_t size
);
/** @brief Free Memory to the Workspace
@@ -94,7 +94,7 @@ bool _Workspace_Free(
* @return If successful, the starting address of the allocated memory
*/
void *_Workspace_Allocate_or_fatal_error(
- size_t size
+ ssize_t size
);
#ifndef __RTEMS_APPLICATION__
diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c
index 042dc6d604..8c55b06ecd 100644
--- a/cpukit/score/src/heap.c
+++ b/cpukit/score/src/heap.c
@@ -111,11 +111,10 @@ static uint32_t instance = 0;
* +--------------------------------+ <- end = begin + size
*
*/
-
uint32_t _Heap_Initialize(
Heap_Control *the_heap,
void *starting_address,
- size_t size,
+ ssize_t size,
uint32_t page_size
)
{
@@ -207,10 +206,10 @@ uint32_t _Heap_Initialize(
* Convert user requested 'size' of memory block to the block size.
* Return block size on success, 0 if overflow occured
*/
-size_t _Heap_Calc_block_size(
- size_t size,
- uint32_t page_size,
- uint32_t min_size)
+ssize_t _Heap_Calc_block_size(
+ ssize_t size,
+ uint32_t page_size,
+ uint32_t min_size)
{
uint32_t block_size = size + HEAP_BLOCK_USED_OVERHEAD;
_Heap_Align_up(&block_size, page_size);
diff --git a/cpukit/score/src/heapallocate.c b/cpukit/score/src/heapallocate.c
index 418ee758fc..6432556fc5 100644
--- a/cpukit/score/src/heapallocate.c
+++ b/cpukit/score/src/heapallocate.c
@@ -36,7 +36,7 @@
void *_Heap_Allocate(
Heap_Control *the_heap,
- size_t size
+ ssize_t size
)
{
uint32_t the_size;
diff --git a/cpukit/score/src/heapallocatealigned.c b/cpukit/score/src/heapallocatealigned.c
index 3fda404490..6ac1425063 100644
--- a/cpukit/score/src/heapallocatealigned.c
+++ b/cpukit/score/src/heapallocatealigned.c
@@ -131,7 +131,7 @@ Heap_Block *block_allocate(
void *_Heap_Allocate_aligned(
Heap_Control *the_heap,
- size_t size,
+ ssize_t size,
uint32_t alignment
)
{
diff --git a/cpukit/score/src/heapextend.c b/cpukit/score/src/heapextend.c
index 73eb91f127..0e0329f4e6 100644
--- a/cpukit/score/src/heapextend.c
+++ b/cpukit/score/src/heapextend.c
@@ -38,7 +38,7 @@
Heap_Extend_status _Heap_Extend(
Heap_Control *the_heap,
void *starting_address,
- size_t size,
+ ssize_t size,
uint32_t *amount_extended
)
{
diff --git a/cpukit/score/src/heapresizeblock.c b/cpukit/score/src/heapresizeblock.c
index 49460f9767..760d49bc39 100644
--- a/cpukit/score/src/heapresizeblock.c
+++ b/cpukit/score/src/heapresizeblock.c
@@ -47,7 +47,7 @@
Heap_Resize_status _Heap_Resize_block(
Heap_Control *the_heap,
void *starting_address,
- size_t size,
+ ssize_t size,
uint32_t *old_mem_size,
uint32_t *avail_mem_size
)
diff --git a/cpukit/score/src/heapsizeofuserarea.c b/cpukit/score/src/heapsizeofuserarea.c
index c1555d2ccc..136389e878 100644
--- a/cpukit/score/src/heapsizeofuserarea.c
+++ b/cpukit/score/src/heapsizeofuserarea.c
@@ -42,7 +42,7 @@
bool _Heap_Size_of_user_area(
Heap_Control *the_heap,
void *starting_address,
- size_t *size
+ ssize_t *size
)
{
Heap_Block *the_block;
diff --git a/cpukit/score/src/pheapgetblocksize.c b/cpukit/score/src/pheapgetblocksize.c
index 029ef7b2c7..6baa8f5632 100644
--- a/cpukit/score/src/pheapgetblocksize.c
+++ b/cpukit/score/src/pheapgetblocksize.c
@@ -19,7 +19,7 @@
bool _Protected_heap_Get_block_size(
Heap_Control *the_heap,
void *starting_address,
- size_t *size
+ ssize_t *size
)
{
bool status;
diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c
index ebb71f3297..591427cb64 100644
--- a/cpukit/score/src/wkspace.c
+++ b/cpukit/score/src/wkspace.c
@@ -27,7 +27,7 @@
*/
void _Workspace_Handler_initialization(
void *starting_address,
- size_t size
+ ssize_t size
)
{
uint32_t memory_available;
@@ -61,7 +61,7 @@ void _Workspace_Handler_initialization(
* _Workspace_Allocate
*/
void *_Workspace_Allocate(
- size_t size
+ ssize_t size
)
{
return _Heap_Allocate( &_Workspace_Area, size );
@@ -81,7 +81,7 @@ bool _Workspace_Free(
* _Workspace_Allocate_or_fatal_error
*/
void *_Workspace_Allocate_or_fatal_error(
- size_t size
+ ssize_t size
)
{
void *memory;