Maintain legacy RTOS behavior before mbed-5
Fork of mbed-rtos by
Diff: rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/HAL_CM4.c
- Revision:
- 112:53ace74b190c
- Parent:
- 101:3d9d2b8b8f17
- Child:
- 123:58563e6cba1e
diff -r 162b12aea5f2 -r 53ace74b190c rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/HAL_CM4.c --- a/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/HAL_CM4.c Tue May 03 00:15:52 2016 +0100 +++ b/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/HAL_CM4.c Thu May 05 20:45:13 2016 +0100 @@ -1,12 +1,12 @@ /*---------------------------------------------------------------------------- - * RL-ARM - RTX + * CMSIS-RTOS - RTX *---------------------------------------------------------------------------- * Name: HAL_CM4.C * Purpose: Hardware Abstraction Layer for Cortex-M4 - * Rev.: V4.70 + * Rev.: V4.79 *---------------------------------------------------------------------------- * - * Copyright (c) 1999-2009 KEIL, 2009-2013 ARM Germany GmbH + * Copyright (c) 1999-2009 KEIL, 2009-2015 ARM Germany GmbH * All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include "rt_TypeDef.h" -#include "RTX_Conf.h" +#include "RTX_Config.h" #include "rt_System.h" #include "rt_HAL_CM.h" #include "rt_Task.h" @@ -99,7 +99,7 @@ /*--------------------------- _free_box -------------------------------------*/ -__asm int _free_box (void *box_mem, void *box) { +__asm U32 _free_box (void *box_mem, void *box) { /* Function wrapper for Unprivileged/Privileged mode. */ LDR R12,=__cpp(rt_free_box) MRS R3,IPSR @@ -152,7 +152,17 @@ BXEQ LR ; RETI, no task switch #endif - CBZ R1,SVC_Next ; Runtask deleted? + CBNZ R1,SVC_ContextSave ; Runtask not deleted? + + TST LR,#0x10 ; is it extended frame? + BNE SVC_ContextRestore + LDR R1,=0xE000EF34 + LDR R0,[R1] ; Load FPCCR + BIC R0,#1 ; Clear LSPACT (Lazy state) + STR R0,[R1] ; Store FPCCR + B SVC_ContextRestore + +SVC_ContextSave TST LR,#0x10 ; is it extended frame? VSTMDBEQ R12!,{S16-S31} ; yes, stack also VFP hi-regs MOVEQ R0,#0x01 ; os_tsk->stack_frame val @@ -165,16 +175,16 @@ BL rt_stk_check ; Check for Stack overflow POP {R2,R3} -SVC_Next +SVC_ContextRestore STR R2,[R3] ; os_tsk.run = os_tsk.new LDR R12,[R2,#TCB_TSTACK] ; os_tsk.new->tsk_stack LDMIA R12!,{R4-R11} ; Restore New Context LDRB R0,[R2,#TCB_STACKF] ; Stack Frame CMP R0,#0 ; Basic/Extended Stack Frame + MVNEQ LR,#:NOT:0xFFFFFFFD ; set EXC_RETURN value + MVNNE LR,#:NOT:0xFFFFFFED VLDMIANE R12!,{S16-S31} ; restore VFP hi-registers - MVNNE LR,#:NOT:0xFFFFFFED ; set EXC_RETURN value - MVNEQ LR,#:NOT:0xFFFFFFFD MSR PSP,R12 ; Write PSP SVC_Exit @@ -254,9 +264,9 @@ LDMIA R12!,{R4-R11} ; Restore New Context LDRB R0,[R2,#TCB_STACKF] ; Stack Frame CMP R0,#0 ; Basic/Extended Stack Frame + MVNEQ LR,#:NOT:0xFFFFFFFD ; set EXC_RETURN value + MVNNE LR,#:NOT:0xFFFFFFED VLDMIANE R12!,{S16-S31} ; restore VFP hi-regs - MVNNE LR,#:NOT:0xFFFFFFED ; set EXC_RETURN value - MVNEQ LR,#:NOT:0xFFFFFFFD MSR PSP,R12 ; Write PSP Sys_Exit