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

core/cortex-m: add missing NORETURNs to thread_arch

Browse Source
This commit is contained in:
René Kijewski 2014-06-05 21:01:35 +02:00
parent 87f0977c21
commit b6dc5c9b76
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/include/arch/thread_arch.h
View File

@ -19,6 +19,7 @@
#ifndef __THREAD_ARCH_H #ifndef __THREAD_ARCH_H
#define __THREAD_ARCH_H #define __THREAD_ARCH_H
#include "attributes.h"
/** /**
* @name Define the mapping between the architecture independent interfaces * @name Define the mapping between the architecture independent interfaces
@ -56,7 +57,7 @@ void thread_arch_stack_print(void);
/** /**
* @brief Start threading by loading a threads initial information from the stack * @brief Start threading by loading a threads initial information from the stack
*/ */
void thread_arch_start_threading(void); void thread_arch_start_threading(void) NORETURN;
/** /**
* @brief Pause the current thread and schedule the next pending, if available * @brief Pause the current thread and schedule the next pending, if available

10
cpu/cortexm_common/thread_arch.c
View File

@ -41,8 +41,8 @@
static void context_save(void); static void context_save(void);
static void context_restore(void); static void context_restore(void) NORETURN;
static void enter_thread_mode(void); static void enter_thread_mode(void) NORETURN;
/** /**
* Cortex-M knows stacks and handles register backups, so use different stack frame layout * Cortex-M knows stacks and handles register backups, so use different stack frame layout
@ -133,7 +133,7 @@ void thread_arch_start_threading(void)
/** /**
* @brief Set the MCU into Thread-Mode and load the initial task from the stack and run it * @brief Set the MCU into Thread-Mode and load the initial task from the stack and run it
*/ */
void enter_thread_mode(void) void NORETURN enter_thread_mode(void)
{ {
/* switch to user mode use PSP instead of MSP in ISR Mode*/ /* switch to user mode use PSP instead of MSP in ISR Mode*/
CONTROL_Type mode; CONTROL_Type mode;
@ -152,6 +152,8 @@ void enter_thread_mode(void)
asm("pop {r4}" ); /* get PC */ asm("pop {r4}" ); /* get PC */
asm("pop {r5}" ); /* discard the xPSR entry */ asm("pop {r5}" ); /* discard the xPSR entry */
asm("mov pc, r4" ); /* load PC */ asm("mov pc, r4" ); /* load PC */
UNREACHABLE();
} }
void thread_arch_yield(void) void thread_arch_yield(void)
@ -206,4 +208,6 @@ __attribute__((always_inline)) static __INLINE void context_restore(void)
asm("bx r0" ); /* load exception return value to PC causes end of exception*/ asm("bx r0" ); /* load exception return value to PC causes end of exception*/
/* {r0-r3,r12,LR,PC,xPSR} are restored automatically on exception return */ /* {r0-r3,r12,LR,PC,xPSR} are restored automatically on exception return */
UNREACHABLE();
} }