RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #15059 from maribu/core-thread-cast-align

Browse Source 
core/thread.c: Silence -Wcast-align flase positives
This commit is contained in:
benpicco 2020-09-26 16:31:58 +02:00 committed by GitHub
commit ab15d67e80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/include/thread.h
View File

@ -540,7 +540,7 @@ const char *thread_getname(kernel_pid_t pid);
* *
* @return the amount of unused space of the thread's stack * @return the amount of unused space of the thread's stack
*/ */
uintptr_t thread_measure_stack_free(char *stack); uintptr_t thread_measure_stack_free(const char *stack);
#endif /* DEVELHELP */ #endif /* DEVELHELP */
/** /**

24
core/thread.c
View File

@ -169,9 +169,11 @@ void thread_add_to_list(list_node_t *list, thread_t *thread)
} }
#ifdef DEVELHELP #ifdef DEVELHELP
uintptr_t thread_measure_stack_free(char *stack) uintptr_t thread_measure_stack_free(const char *stack)
{ {
uintptr_t *stackp = (uintptr_t *)stack; /* Alignment of stack has been fixed (if needed) by thread_create(), so
* we can silence -Wcast-align here */
uintptr_t *stackp = (uintptr_t *)(uintptr_t)stack;
/* assume that the comparison fails before or after end of stack */ /* assume that the comparison fails before or after end of stack */
/* assume that the stack grows "downwards" */ /* assume that the stack grows "downwards" */
@ -216,8 +218,10 @@ kernel_pid_t thread_create(char *stack, int stacksize, uint8_t priority,
if (stacksize < 0) { if (stacksize < 0) {
DEBUG("thread_create: stacksize is too small!\n"); DEBUG("thread_create: stacksize is too small!\n");
} }
/* allocate our thread control block at the top of our stackspace */ /* allocate our thread control block at the top of our stackspace. Cast to
thread_t *thread = (thread_t *)(stack + stacksize); * (uintptr_t) intermediately to silence -Wcast-align. (We manually made
* sure alignment is correct above.) */
thread_t *thread = (thread_t *)(uintptr_t)(stack + stacksize);
#ifdef PICOLIBC_TLS #ifdef PICOLIBC_TLS
stacksize -= _tls_size(); stacksize -= _tls_size();
@ -228,9 +232,10 @@ kernel_pid_t thread_create(char *stack, int stacksize, uint8_t priority,
#if defined(DEVELHELP) || defined(SCHED_TEST_STACK) #if defined(DEVELHELP) || defined(SCHED_TEST_STACK)
if (flags & THREAD_CREATE_STACKTEST) { if (flags & THREAD_CREATE_STACKTEST) {
/* assign each int of the stack the value of it's address */ /* assign each int of the stack the value of it's address. Alignment
uintptr_t *stackmax = (uintptr_t *)(stack + stacksize); * has been handled above, so silence -Wcast-align */
uintptr_t *stackp = (uintptr_t *)stack; uintptr_t *stackmax = (uintptr_t *)(uintptr_t)(stack + stacksize);
uintptr_t *stackp = (uintptr_t *)(uintptr_t)stack;
while (stackp < stackmax) { while (stackp < stackmax) {
*stackp = (uintptr_t)stackp; *stackp = (uintptr_t)stackp;
@ -238,8 +243,9 @@ kernel_pid_t thread_create(char *stack, int stacksize, uint8_t priority,
} }
} }
else { else {
/* create stack guard */ /* create stack guard. Alignment has been handled above, so silence
*(uintptr_t *)stack = (uintptr_t)stack; * -Wcast-align */
*(uintptr_t *)(uintptr_t)stack = (uintptr_t)stack;
} }
#endif #endif