From 14e65fc48d514415c288e569f3559058e6e0d85a Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Thu, 31 Jul 2014 18:41:15 +0200 Subject: [PATCH] cpu/cortex-mX_common: fixed type issues - added explicit cast for stack pointer - fixed printf type inconsistency --- cpu/cortex-m0_common/thread_arch.c | 2 +- cpu/cortex-m3_common/thread_arch.c | 4 ++-- cpu/cortex-m4_common/thread_arch.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cpu/cortex-m0_common/thread_arch.c b/cpu/cortex-m0_common/thread_arch.c index ab546f9a16..5f8578b62d 100644 --- a/cpu/cortex-m0_common/thread_arch.c +++ b/cpu/cortex-m0_common/thread_arch.c @@ -67,7 +67,7 @@ char *thread_arch_stack_init(void *(*task_func)(void *), int stack_size) { uint32_t *stk; - stk = (uint32_t *)(stack_start + stack_size); + stk = (uint32_t *)((uint32_t *)stack_start + stack_size); /* marker */ stk--; diff --git a/cpu/cortex-m3_common/thread_arch.c b/cpu/cortex-m3_common/thread_arch.c index f4001cc342..165a54a361 100644 --- a/cpu/cortex-m3_common/thread_arch.c +++ b/cpu/cortex-m3_common/thread_arch.c @@ -57,7 +57,7 @@ static void context_restore(void) NORETURN; char *thread_arch_stack_init(void *(*task_func)(void *), void *arg, void *stack_start, int stack_size) { uint32_t *stk; - stk = (uint32_t *)(stack_start + stack_size); + stk = (uint32_t *)((uint32_t *)stack_start + stack_size); /* marker */ stk--; @@ -116,7 +116,7 @@ void thread_arch_stack_print(void) count++; } while (*sp != STACK_MARKER); - printf("current stack size: %u byte\n", count); + printf("current stack size: %i byte\n", count); } __attribute__((naked)) void thread_arch_start_threading(void) diff --git a/cpu/cortex-m4_common/thread_arch.c b/cpu/cortex-m4_common/thread_arch.c index c6ecd43f9f..0b40edd411 100644 --- a/cpu/cortex-m4_common/thread_arch.c +++ b/cpu/cortex-m4_common/thread_arch.c @@ -63,7 +63,7 @@ char *thread_arch_stack_init(void *(*task_func)(void *), int stack_size) { uint32_t *stk; - stk = (uint32_t *)(stack_start + stack_size); + stk = (uint32_t *)((uint32_t*)stack_start + stack_size); /* marker */ stk--;