Changeset ffccdff0 in mainline

Timestamp:

2020-06-15T13:29:29Z (4 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4f663f3e

Parents:

128359eb

Message:

Unify alignment handling

Use the C11 alignof() operator. Make sure the allocation alignment is
sufficient.

Files:

• boot/generic/src/balloc.c (modified) (2 diffs)
• uspace/lib/c/generic/malloc.c (modified) (2 diffs)
• uspace/lib/c/generic/rtld/module.c (modified) (3 diffs)
• uspace/lib/c/generic/thread/tls.c (modified) (4 diffs)
• uspace/lib/virtio/virtio.c (modified) (2 diffs)

boot/generic/src/balloc.c

@@ -28 +28 @@
 
 #include <balloc.h>
+#include <stdalign.h>
 #include <stddef.h>
 #include <align.h>
@@ -51 +52 @@
 
         /* Enforce minimal alignment. */
-        alignment = ALIGN_UP(alignment, 4);
+        alignment = ALIGN_UP(alignment, alignof(max_align_t));
 
         uintptr_t addr = phys_base + ALIGN_UP(ballocs->size, alignment);

uspace/lib/c/generic/malloc.c

@@ -35 +35 @@
 
 #include <malloc.h>
+#include <stdalign.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -198 +199 @@
 
 #define malloc_assert(expr) safe_assert(expr)
+
+/*
+ * Make sure the base alignment is sufficient.
+ */
+static_assert(BASE_ALIGN >= alignof(heap_area_t), "");
+static_assert(BASE_ALIGN >= alignof(heap_block_head_t), "");
+static_assert(BASE_ALIGN >= alignof(heap_block_foot_t), "");
+static_assert(BASE_ALIGN >= alignof(max_align_t), "");
 
 /** Serializes access to the heap from multiple threads. */

uspace/lib/c/generic/rtld/module.c

@@ -40 +40 @@
 #include <errno.h>
 #include <loader/pcb.h>
+#include <stdalign.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -353 +354 @@
 #ifdef CONFIG_TLS_VARIANT_1
         rtld->tls_size = sizeof(tcb_t);
-        rtld->tls_align = _Alignof(tcb_t);
+        rtld->tls_align = alignof(tcb_t);
 
         list_foreach(rtld->modules, modules_link, module_t, m) {
@@ -366 +367 @@
 #else
         rtld->tls_size = 0;
-        rtld->tls_align = _Alignof(tcb_t);
+        rtld->tls_align = alignof(tcb_t);
 
         list_foreach(rtld->modules, modules_link, module_t, m) {

uspace/lib/c/generic/thread/tls.c

@@ -37 +37 @@
 
 #include <assert.h>
+#include <stdalign.h>
 #include <stddef.h>
 #include <align.h>
@@ -69 +70 @@
 #else
         size_t tls_size = tls ? tls->p_memsz : 0;
-        return -ALIGN_UP((ptrdiff_t) tls_size, max(tls_align, _Alignof(tcb_t)));
+        return -ALIGN_UP((ptrdiff_t) tls_size, max(tls_align, alignof(tcb_t)));
 #endif
 }
@@ -104 +105 @@
 #else
         size_t alloc_size =
-            ALIGN_UP(tls_size, max(tls_align, _Alignof(tcb_t))) + sizeof(tcb_t);
-#endif
-
-        void *area = alloc(max(tls_align, _Alignof(tcb_t)), alloc_size);
+            ALIGN_UP(tls_size, max(tls_align, alignof(tcb_t))) + sizeof(tcb_t);
+#endif
+
+        void *area = alloc(max(tls_align, alignof(tcb_t)), alloc_size);
         if (!area)
                 return NULL;
@@ -187 +188 @@
         tls_free_arch(tcb,
             ALIGN_UP(tls->p_memsz, tls->p_align) + sizeof(tcb_t),
-            max(tls->p_align, _Alignof(tcb_t)));
+            max(tls->p_align, alignof(tcb_t)));
 }
 

uspace/lib/virtio/virtio.c

@@ -35 +35 @@
 #include <align.h>
 #include <macros.h>
+#include <stdalign.h>
 
 #include <ddf/log.h>
@@ -230 +231 @@
          */
         size_t mem_size = sizeof(virtq_desc_t[size]);
-        mem_size = ALIGN_UP(mem_size, _Alignof(virtq_avail_t));
+        mem_size = ALIGN_UP(mem_size, alignof(virtq_avail_t));
         avail_offset = mem_size;
         mem_size += sizeof(virtq_avail_t) + sizeof(ioport16_t[size]) +
             sizeof(ioport16_t);
-        mem_size = ALIGN_UP(mem_size, _Alignof(virtq_used_t));
+        mem_size = ALIGN_UP(mem_size, alignof(virtq_used_t));
         used_offset = mem_size;
         mem_size += sizeof(virtq_used_t) + sizeof(virtq_used_elem_t[size]) +