diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-10-31 08:32:16 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-10-31 08:32:16 +0000 |
| commit | 4b17048a2e72369f95bd374dfa3368843ff36d8f (patch) | |
| tree | df8aa79672ff2a46a6a9ebbb478bc4a63b45a6db | |
| parent | 174883e28f50a98fe0b3c099f083066896f4c6df (diff) | |
| download | ChibiOS-4b17048a2e72369f95bd374dfa3368843ff36d8f.tar.gz ChibiOS-4b17048a2e72369f95bd374dfa3368843ff36d8f.tar.bz2 ChibiOS-4b17048a2e72369f95bd374dfa3368843ff36d8f.zip | |
Fixed bug #899.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10911 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/common/oslib/src/chheap.c | 16 | ||||
| -rw-r--r-- | readme.txt | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/os/common/oslib/src/chheap.c b/os/common/oslib/src/chheap.c index ee21b802c..2e8e4a05f 100644 --- a/os/common/oslib/src/chheap.c +++ b/os/common/oslib/src/chheap.c @@ -118,8 +118,9 @@ void _heap_init(void) { /**
* @brief Initializes a memory heap from a static memory area.
- * @pre Both the heap buffer base and the heap size must be aligned to
- * the @p heap_header_t type size.
+ * @note The heap buffer base and size are adjusted if the passed buffer
+ * is not aligned to @p CH_HEAP_ALIGNMENT. This mean that the
+ * effective heap size can be less than @p size.
*
* @param[out] heapp pointer to the memory heap descriptor to be initialized
* @param[in] buf heap buffer base
@@ -128,12 +129,15 @@ void _heap_init(void) { * @init
*/
void chHeapObjectInit(memory_heap_t *heapp, void *buf, size_t size) {
- heap_header_t *hp = buf;
+ heap_header_t *hp = (heap_header_t *)MEM_ALIGN_NEXT(buf, CH_HEAP_ALIGNMENT);
- chDbgCheck((heapp != NULL) && (size > 0U) &&
- MEM_IS_ALIGNED(buf, CH_HEAP_ALIGNMENT) &&
- MEM_IS_ALIGNED(size, CH_HEAP_ALIGNMENT));
+ chDbgCheck((heapp != NULL) && (size > 0U));
+ /* Adjusting the size in case the initial block was not correctly
+ aligned.*/
+ size -= (size_t)((uint8_t *)hp - (uint8_t *)buf);
+
+ /* Initializing the heap header.*/
heapp->provider = NULL;
H_NEXT(&heapp->header) = hp;
H_PAGES(&heapp->header) = 0;
diff --git a/readme.txt b/readme.txt index a33b4090e..81f856bfe 100644 --- a/readme.txt +++ b/readme.txt @@ -148,6 +148,8 @@ dependencies and configuration directories. This makes possible
to have multiple non-conflicting makefiles in the same project.
Updated the various platform.mk implementing "smart build" mode.
+- LIB: Fixed heap buffer alignment not enforced (bug #899)(backported
+ to 17.6.3).
- LIB: Fixed call protocol violation in chCoreAlloc() (bug #896)(backported
to 17.6.3).
- RT: Fixed trace Buffer activation bits state reversed in chconf.h
|