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

2 files changed, 12 insertions, 7 deletions

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;