kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 10:03:50 +01:00
Code Releases Activity

cpu/arm7_common: Silence -Wcast-align

Browse Source 
- Enforced that ISR_STACKSIZE is indeed a multiple of 4
- With this enforced, every cast that triggers a -Wcast-align warning is now
  a false positives, so those were silenced by (intermediately) casting to
  `uintptr_t`.
This commit is contained in:
Marian Buschsieweke 2020-09-28 10:58:49 +02:00
parent cc2382220f
commit 833afc03e1
No known key found for this signature in database
GPG Key ID: 61F64C6599B1539F
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpu/arm7_common/arm_cpu.c
View File

@ -32,6 +32,10 @@ __attribute__((used, section(".irq_stack"), aligned(4))) uint8_t irq_stack[ISR_S
__attribute__((used, section(".abt_stack"), aligned(4))) uint8_t abt_stack[ABT_STACKSIZE]; __attribute__((used, section(".abt_stack"), aligned(4))) uint8_t abt_stack[ABT_STACKSIZE];
__attribute__((used, section(".svc_stack"), aligned(4))) uint8_t svc_stack[ISR_STACKSIZE]; __attribute__((used, section(".svc_stack"), aligned(4))) uint8_t svc_stack[ISR_STACKSIZE];
#if (ISR_STACKSIZE % 4)
#error "ISR_STACKSIZE must be a multiple of 4"
#endif
void thread_yield_higher(void) void thread_yield_higher(void)
{ {
if (irq_is_in()) { if (irq_is_in()) {
@ -129,13 +133,14 @@ void *thread_isr_stack_pointer(void)
/* This function returns the number of bytes used on the ISR stack */ /* This function returns the number of bytes used on the ISR stack */
int thread_isr_stack_usage(void) int thread_isr_stack_usage(void)
{ {
uint32_t *ptr = (uint32_t*) &irq_stack[0]; uint32_t *ptr = (uint32_t *)(uintptr_t)&irq_stack[0];
uint32_t *end = (uint32_t *)(uintptr_t)&irq_stack[ISR_STACKSIZE];
while(((*ptr) == STACK_CANARY_WORD) && (ptr < (uint32_t*) &irq_stack[ISR_STACKSIZE])) { while(((*ptr) == STACK_CANARY_WORD) && (ptr < end)) {
++ptr; ++ptr;
} }
ptrdiff_t num_used_words = (uint32_t*) &irq_stack[ISR_STACKSIZE] - ptr; ptrdiff_t num_used_words = (uintptr_t)end - (uintptr_t)ptr;
return num_used_words; return num_used_words;
} }