len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-09-01 11:53:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add proper 8 byte alignment support.

Browse source
This commit is contained in:
Richard Barry 2009-06-30 16:32:36 +00:00
parent 0b86cb1e2c
commit 0a9fddb5d4
4 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/portable/MemMang/heap_1.c
View file

@ -49,19 +49,6 @@
licensing and training services.
*/
/*
Changes between V2.5.1 and V2.5.1
+ The memory pool has been defined within a struct to ensure correct memory
alignment on 32bit systems.
Changes between V2.6.1 and V3.0.0
+ An overflow check has been added to ensure the next free byte variable
does not wrap around.
*/
/*
* The simplest possible implementation of pvPortMalloc(). Note that this
@ -100,7 +87,11 @@ Changes between V2.6.1 and V3.0.0
alignment without using any non-portable code. */
static union xRTOS_HEAP
{
volatile unsigned portLONG ulDummy;
#if portBYTE_ALIGNMENT == 8
volatile portDOUBLE dDummy;
#else
volatile unsigned portLONG ulDummy;
#endif
unsigned portCHAR ucHeap[ configTOTAL_HEAP_SIZE ];
} xHeap;

8
Source/portable/MemMang/heap_2.c
View file

@ -88,7 +88,11 @@
alignment without using any non-portable code. */
static union xRTOS_HEAP
{
volatile unsigned portLONG ulDummy;
#if portBYTE_ALIGNMENT == 8
volatile portDOUBLE dDummy;
#else
volatile unsigned portLONG ulDummy;
#endif
unsigned portCHAR ucHeap[ configTOTAL_HEAP_SIZE ];
} xHeap;
@ -101,7 +105,7 @@ typedef struct A_BLOCK_LINK
} xBlockLink;
static const unsigned portSHORT heapSTRUCT_SIZE = ( sizeof( xBlockLink ) + ( sizeof( xBlockLink ) % portBYTE_ALIGNMENT ) );
static const unsigned portSHORT heapSTRUCT_SIZE = ( sizeof( xBlockLink ) + portBYTE_ALIGNMENT - ( sizeof( xBlockLink ) % portBYTE_ALIGNMENT ) );
#define heapMINIMUM_BLOCK_SIZE ( ( size_t ) ( heapSTRUCT_SIZE * 2 ) )
/* Create a couple of list links to mark the start and end of the list. */