From 2e2a38cd10e11d3e085c62149440dddb474ea7bf Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 6 Jan 2019 15:45:01 +0000 Subject: chFifoObjectInit() renamed to chFifoObjectInitAligned(). Added a new chFifoObjectInit() without the alignment parameter. Stricter alignment checks in memory pools. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12535 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- ...L476RG-NUCLEO64 (OpenOCD, Flash and Run).launch | 104 ++++++++++----------- os/lib/include/chobjfifos.h | 33 ++++++- os/lib/src/chfactory.c | 4 +- os/lib/src/chmempools.c | 15 ++- readme.txt | 3 + 5 files changed, 97 insertions(+), 62 deletions(-) diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/debug/RT-STM32L476RG-NUCLEO64 (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32L476RG-NUCLEO64/debug/RT-STM32L476RG-NUCLEO64 (OpenOCD, Flash and Run).launch index 2031665ef..b9f5693fe 100644 --- a/demos/STM32/RT-STM32L476RG-NUCLEO64/debug/RT-STM32L476RG-NUCLEO64 (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/debug/RT-STM32L476RG-NUCLEO64 (OpenOCD, Flash and Run).launch @@ -1,52 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/os/lib/include/chobjfifos.h b/os/lib/include/chobjfifos.h index a422bf81d..c75937eb7 100644 --- a/os/lib/include/chobjfifos.h +++ b/os/lib/include/chobjfifos.h @@ -125,15 +125,42 @@ extern "C" { * * @init */ -static inline void chFifoObjectInit(objects_fifo_t *ofp, size_t objsize, - size_t objn, unsigned objalign, - void *objbuf, msg_t *msgbuf) { +static inline void chFifoObjectInitAligned(objects_fifo_t *ofp, size_t objsize, + size_t objn, unsigned objalign, + void *objbuf, msg_t *msgbuf) { + + chDbgCheck((objsize >= objalign) && (objsize % objalign == 0U)); chGuardedPoolObjectInitAligned(&ofp->free, objsize, objalign); chGuardedPoolLoadArray(&ofp->free, objbuf, objn); chMBObjectInit(&ofp->mbx, msgbuf, objn); } +/** + * @brief Initializes a FIFO object. + * @pre The messages size must be a multiple of the alignment + * requirement. + * + * @param[out] ofp pointer to a @p objects_fifo_t structure + * @param[in] objsize size of objects + * @param[in] objn number of objects available + * @param[in] objbuf pointer to the buffer of objects, it must be able + * to hold @p objn objects of @p objsize size with + * @p objealign alignment + * @param[in] msgbuf pointer to the buffer of messages, it must be able + * to hold @p objn messages + * + * @init + */ +static inline void chFifoObjectInit(objects_fifo_t *ofp, size_t objsize, + size_t objn, void *objbuf, + msg_t *msgbuf) { + + chFifoObjectInitAligned(ofp, objsize, objn, + PORT_NATURAL_ALIGN, + objbuf, msgbuf); +} + /** * @brief Allocates a free object. * diff --git a/os/lib/src/chfactory.c b/os/lib/src/chfactory.c index a40984ac4..61d607e79 100644 --- a/os/lib/src/chfactory.c +++ b/os/lib/src/chfactory.c @@ -668,8 +668,8 @@ dyn_objects_fifo_t *chFactoryCreateObjectsFIFO(const char *name, (objn * objsize)); if (dofp != NULL) { /* Initializing mailbox object data.*/ - chFifoObjectInit(&dofp->fifo, objsize, objn, objalign, - (void *)&dofp->msgbuf[objn], dofp->msgbuf); + chFifoObjectInitAligned(&dofp->fifo, objsize, objn, objalign, + (void *)&dofp->msgbuf[objn], dofp->msgbuf); } F_UNLOCK(); diff --git a/os/lib/src/chmempools.c b/os/lib/src/chmempools.c index 2fcd0cb3b..996b66329 100644 --- a/os/lib/src/chmempools.c +++ b/os/lib/src/chmempools.c @@ -77,7 +77,10 @@ void chPoolObjectInitAligned(memory_pool_t *mp, size_t size, unsigned align, memgetfunc_t provider) { - chDbgCheck((mp != NULL) && (size >= sizeof(void *))); + chDbgCheck((mp != NULL) && + (size >= sizeof(void *)) && + (align >= PORT_NATURAL_ALIGN) && + MEM_IS_VALID_ALIGNMENT(align)); mp->next = NULL; mp->object_size = size; @@ -136,6 +139,9 @@ void *chPoolAllocI(memory_pool_t *mp) { } else if (mp->provider != NULL) { objp = mp->provider(mp->object_size, mp->align); + + chDbgAssert(MEM_IS_ALIGNED(objp, mp->align), + "returned object not aligned"); } /*lint -restore*/ @@ -178,10 +184,9 @@ void chPoolFreeI(memory_pool_t *mp, void *objp) { struct pool_header *php = objp; chDbgCheckClassI(); - chDbgCheck((mp != NULL) && (objp != NULL)); - - chDbgAssert(((size_t)objp & MEM_ALIGN_MASK(mp->align)) == 0U, - "unaligned object"); + chDbgCheck((mp != NULL) && + (objp != NULL) && + MEM_IS_ALIGNED(objp, mp->align)); php->next = mp->next; mp->next = php; diff --git a/readme.txt b/readme.txt index 0b7fe19eb..8673b5db9 100644 --- a/readme.txt +++ b/readme.txt @@ -75,6 +75,9 @@ ***************************************************************************** *** Next *** +- CHG: chFifoObjectInit() renamed to chFifoObjectInitAligned(). Added a new + chFifoObjectInit() without the alignment parameter. +- NEW: Stricter alignment checks in memory pools. - NEW: Added chvsnprintf(). - NEW: Event enable check API added to PAL driver. - NEW: Now it is possible to define separate directories for each -- cgit v1.2.3