commit 1fb4e847ed48963e0043dc4e9dcf3540d7797e44
author Qikai <boyqikai@gmail.com> Tue Oct 05 02:15:00 2021 +0800
committer GitHub <noreply@github.com> Mon Oct 04 11:15:00 2021 -0700
tree cf466279f0198d4a64a229c32b996fdaf66fdd7c
parent 5f290e4559c651b7eb575fbb762c82ebd8f5b90e

Fix the defect that Heap_1.c may waste first portBYTE_ALIGNMENT bytes of ucHeap[] (#238)

* Fix the defect that Heap_1.c may waste first 8 bytes of ucHeap[]

* Fix the same byte waste issue in heap_2

portable/MemMang/heap_1.c

diff --git a/portable/MemMang/heap_1.c b/portable/MemMang/heap_1.c
index 68c4c5f..e17cdc7 100644
--- a/portable/MemMang/heap_1.c
+++ b/portable/MemMang/heap_1.c
@@ -96,7 +96,7 @@
         if( pucAlignedHeap == NULL )

         {

             /* Ensure the heap starts on a correctly aligned boundary. */

-            pucAlignedHeap = ( uint8_t * ) ( ( ( portPOINTER_SIZE_TYPE ) & ucHeap[ portBYTE_ALIGNMENT ] ) & ( ~( ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) ) );

+            pucAlignedHeap = ( uint8_t * ) ( ( ( portPOINTER_SIZE_TYPE ) & ucHeap[ portBYTE_ALIGNMENT - 1 ] ) & ( ~( ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) ) );

         }

 

         /* Check there is enough room left for the allocation and. */

portable/MemMang/heap_2.c

diff --git a/portable/MemMang/heap_2.c b/portable/MemMang/heap_2.c
index b16b245..afa00df 100644
--- a/portable/MemMang/heap_2.c
+++ b/portable/MemMang/heap_2.c
@@ -266,7 +266,7 @@
     uint8_t * pucAlignedHeap;

 

     /* Ensure the heap starts on a correctly aligned boundary. */

-    pucAlignedHeap = ( uint8_t * ) ( ( ( portPOINTER_SIZE_TYPE ) & ucHeap[ portBYTE_ALIGNMENT ] ) & ( ~( ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) ) );

+    pucAlignedHeap = ( uint8_t * ) ( ( ( portPOINTER_SIZE_TYPE ) & ucHeap[ portBYTE_ALIGNMENT - 1 ] ) & ( ~( ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) ) );

 

     /* xStart is used to hold a pointer to the first item in the list of free

      * blocks.  The void cast is used to prevent compiler warnings. */