Changeset 71fb5ac in mainline

Timestamp:

2018-11-13T16:48:08Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fdc190f

Parents:

b60615b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-11 17:49:01)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 16:48:08)

Message:

Swap ordering of alignment and size, to match standard aligned_alloc()

File:

• kernel/generic/src/mm/malloc.c (modified) (5 diffs)

kernel/generic/src/mm/malloc.c

@@ -82 +82 @@
 }
 
-static void _check_sizes(size_t *size, size_t *alignment)
+static void _check_sizes(size_t *alignment, size_t *size)
 {
         assert(size);
@@ -121 +121 @@
 static void *mem_alloc(size_t, size_t) __attribute__((malloc));
 
-static void *mem_alloc(size_t size, size_t alignment)
+static void *mem_alloc(size_t alignment, size_t size)
 {
-        _check_sizes(&size, &alignment);
+        _check_sizes(&alignment, &size);
 
         if (size > (1 << SLAB_MAX_MALLOC_W)) {
@@ -141 +141 @@
  * @param alignment  Alignment used to call mem_alloc().
  */
-static void mem_free(void *ptr, size_t size, size_t alignment)
+static void mem_free(void *ptr, size_t alignment, size_t size)
 {
         if (!ptr)
                 return;
 
-        _check_sizes(&size, &alignment);
+        _check_sizes(&alignment, &size);
 
         if (size > (1 << SLAB_MAX_MALLOC_W)) {
@@ -160 +160 @@
 void *malloc(size_t size)
 {
-        void *obj = mem_alloc(size + _offset, alignof(max_align_t)) + _offset;
+        void *obj = mem_alloc(alignof(max_align_t), size + _offset) + _offset;
 
         /* Remember the allocation size just before the object. */
@@ -176 +176 @@
          */
         size_t size = ((size_t *) obj)[-1];
-        mem_free(obj - _offset, size + _offset, alignof(max_align_t));
+        mem_free(obj - _offset, alignof(max_align_t), size + _offset);
 }