From ee096d8342c3b6b6f85ef4884b316f9856b1e101 Mon Sep 17 00:00:00 2001 From: RichardBarry Date: Mon, 26 Jan 2009 17:29:01 +0000 Subject: [PATCH] More work in progress on NEC port and demo. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@625 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Source/portable/IAR/V850ES_Fx3/ISR_Support.h | 171 +++++++++++++++++++ Source/portable/IAR/V850ES_Fx3/portasm.s85 | 80 ++++++--- Source/portable/IAR/V850ES_Fx3/portmacro.h | 13 +- 3 files changed, 235 insertions(+), 29 deletions(-) create mode 100644 Source/portable/IAR/V850ES_Fx3/ISR_Support.h diff --git a/Source/portable/IAR/V850ES_Fx3/ISR_Support.h b/Source/portable/IAR/V850ES_Fx3/ISR_Support.h new file mode 100644 index 000000000..efb4cd561 --- /dev/null +++ b/Source/portable/IAR/V850ES_Fx3/ISR_Support.h @@ -0,0 +1,171 @@ +/* + FreeRTOS.org V5.1.1 - Copyright (C) 2003-2008 Richard Barry. + + This file is part of the FreeRTOS distribution. + + FreeRTOS is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + FreeRTOS is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with FreeRTOS; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + A special exception to the GPL can be applied should you wish to distribute + a combined work that includes FreeRTOS, without being obliged to provide + the source code for any proprietary components. See the licensing section + of http://www.FreeRTOS.org for full details of how and when the exception + can be applied. + + *************************************************************************** + *************************************************************************** + * * + * SAVE TIME AND MONEY! We can port FreeRTOS.org to your own hardware, * + * and even write all or part of your application on your behalf. * + * See http://www.OpenRTOS.com for details of the services we provide to * + * expedite your project. * + * * + *************************************************************************** + *************************************************************************** + + Please ensure to read the configuration and relevant port sections of the + online documentation. + + http://www.FreeRTOS.org - Documentation, latest information, license and + contact details. + + http://www.SafeRTOS.com - A version that is certified for use in safety + critical systems. + + http://www.OpenRTOS.com - Commercial support, development, porting, + licensing and training services. +*/ + + EXTERN pxCurrentTCB + EXTERN usCriticalNesting + +#include "FreeRTOSConfig.h" + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Context save and restore macro definitions +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +portSAVE_CONTEXT MACRO + + add -0x0C,sp ; prepare stack to save necessary values + st.w lp,8[sp] ; store LP to stack + stsr 0,r31 + st.w lp,4[sp] ; store EIPC to stack + stsr 1,lp + st.w lp,0[sp] ; store EIPSW to stack +#if configDATA_MODE == 1 ; Using the Tiny data model + prepare {r20,r21,r22,r23,r24,r25,r26,r27,r28,r29,r30},76,sp ; save general purpose registers + sst.w r19,72[ep] + sst.w r18,68[ep] + sst.w r17,64[ep] + sst.w r16,60[ep] + sst.w r15,56[ep] + sst.w r14,52[ep] + sst.w r13,48[ep] + sst.w r12,44[ep] + sst.w r11,40[ep] + sst.w r10,36[ep] + sst.w r9,32[ep] + sst.w r8,28[ep] + sst.w r7,24[ep] + sst.w r6,20[ep] + sst.w r5,16[ep] + sst.w r4,12[ep] +#else ; Using the Small/Large data model + prepare {r20,r21,r22,r23,r24,r26,r27,r28,r29,r30},72,sp ; save general purpose registers + sst.w r19,68[ep] + sst.w r18,64[ep] + sst.w r17,60[ep] + sst.w r16,56[ep] + sst.w r15,52[ep] + sst.w r14,48[ep] + sst.w r13,44[ep] + sst.w r12,40[ep] + sst.w r11,36[ep] + sst.w r10,32[ep] + sst.w r9,28[ep] + sst.w r8,24[ep] + sst.w r7,20[ep] + sst.w r6,16[ep] + sst.w r5,12[ep] +#endif /* configDATA_MODE */ + sst.w r2,8[ep] + sst.w r1,4[ep] + MOVHI hi1(usCriticalNesting),r0,r1 ; save usCriticalNesting value to stack + ld.w lw1(usCriticalNesting)[r1],r2 + sst.w r2,0[ep] + MOVHI hi1(pxCurrentTCB),r0,r1 ; save SP to top of current TCB + ld.w lw1(pxCurrentTCB)[r1],r2 + st.w sp,0[r2] + ENDM + + +portRESTORE_CONTEXT MACRO + + MOVHI hi1(pxCurrentTCB),r0,r1 ; get Stackpointer address + ld.w lw1(pxCurrentTCB)[r1],sp + MOV sp,r1 + ld.w 0[r1],sp ; load stackpointer + MOV sp,ep ; set stack pointer to element pointer + sld.w 0[ep],r1 ; load usCriticalNesting value from stack + MOVHI hi1(usCriticalNesting),r0,r2 + st.w r1,lw1(usCriticalNesting)[r2] + sld.w 4[ep],r1 ; restore general purpose registers + sld.w 8[ep],r2 +#if configDATA_MODE == 1 ; Using Tiny data model + sld.w 12[ep],r4 + sld.w 16[ep],r5 + sld.w 20[ep],r6 + sld.w 24[ep],r7 + sld.w 28[ep],r8 + sld.w 32[ep],r9 + sld.w 36[ep],r10 + sld.w 40[ep],r11 + sld.w 44[ep],r12 + sld.w 48[ep],r13 + sld.w 52[ep],r14 + sld.w 56[ep],r15 + sld.w 60[ep],r16 + sld.w 64[ep],r17 + sld.w 68[ep],r18 + sld.w 72[ep],r19 + dispose 76,{r20,r21,r22,r23,r24,r25,r26,r27,r28,r29,r30} +#else ; Using Small/Large data model + sld.w 12[ep],r5 + sld.w 16[ep],r6 + sld.w 20[ep],r7 + sld.w 24[ep],r8 + sld.w 28[ep],r9 + sld.w 32[ep],r10 + sld.w 36[ep],r11 + sld.w 40[ep],r12 + sld.w 44[ep],r13 + sld.w 48[ep],r14 + sld.w 52[ep],r15 + sld.w 56[ep],r16 + sld.w 60[ep],r17 + sld.w 64[ep],r18 + sld.w 68[ep],r19 + dispose 72,{r20,r21,r22,r23,r24,r26,r27,r28,r29,r30} +#endif /* configDATA_MODE */ + ld.w 0[sp],lp ; restore EIPSW from stack + ldsr lp,1 + ld.w 4[sp],lp ; restore EIPC from stack + ldsr lp,0 + ld.w 8[sp],lp ; restore LP from stack + add 0x0C,sp ; set SP to right position + + RETI + + ENDM diff --git a/Source/portable/IAR/V850ES_Fx3/portasm.s85 b/Source/portable/IAR/V850ES_Fx3/portasm.s85 index 31af18c62..729223369 100644 --- a/Source/portable/IAR/V850ES_Fx3/portasm.s85 +++ b/Source/portable/IAR/V850ES_Fx3/portasm.s85 @@ -29,17 +29,17 @@ ; *************************************************************************** ; ;------------------------------------------------------------------------------ -; Note: Select the correct include files for the device used by the application. +; Note: Select the correct include files for the device used by the application. #include "FreeRTOSConfig.h" ;------------------------------------------------------------------------------ ; Functions used by scheduler -;------------------------------------------------------------------------------ +;------------------------------------------------------------------------------ EXTERN vTaskSwitchContext EXTERN vTaskIncrementTick ; Variables used by scheduler -;------------------------------------------------------------------------------ +;------------------------------------------------------------------------------ EXTERN pxCurrentTCB EXTERN usCriticalNesting @@ -49,7 +49,7 @@ PUBLIC vPortStart ; Security ID definition -;------------------------------------------------------------------------------ +;------------------------------------------------------------------------------ #define CG_SECURITY0 0FFH #define CG_SECURITY1 0FFH #define CG_SECURITY2 0FFH @@ -84,7 +84,7 @@ MD_INTTM0EQ0 SYMBOL "MD_INTTM0EQ0" ; and the usCriticalNesting Value of the active Task onto the task stack ; saves stack pointer to the TCB ;------------------------------------------------------------------------------ -portSAVE_CONTEXT MACRO +portSAVE_CONTEXT MACRO #if configDATA_MODE == 1 ; Using the Tiny data model prepare {r20,r21,r22,r23,r24,r25,r26,r27,r28,r29,r30},76,sp ; save general purpose registers sst.w r19,72[ep] @@ -123,7 +123,7 @@ portSAVE_CONTEXT MACRO #endif /* configDATA_MODE */ sst.w r2,8[ep] sst.w r1,4[ep] - MOVHI hi1(usCriticalNesting),r0,r1 ; save usCriticalNesting value to stack + MOVHI hi1(usCriticalNesting),r0,r1 ; save usCriticalNesting value to stack ld.w lw1(usCriticalNesting)[r1],r2 sst.w r2,0[ep] MOVHI hi1(pxCurrentTCB),r0,r1 ; save SP to top of current TCB @@ -136,7 +136,7 @@ portSAVE_CONTEXT MACRO ; portRESTORE_CONTEXT MACRO ; Gets stack pointer from the current TCB ; Restores the context of the usCriticalNesting value and general purpose -; registers of the selected task from the task stack +; registers of the selected task from the task stack ;------------------------------------------------------------------------------ portRESTORE_CONTEXT MACRO MOVHI hi1(pxCurrentTCB),r0,r1 ; get Stackpointer address @@ -148,7 +148,7 @@ portRESTORE_CONTEXT MACRO MOVHI hi1(usCriticalNesting),r0,r2 st.w r1,lw1(usCriticalNesting)[r2] sld.w 4[ep],r1 ; restore general purpose registers - sld.w 8[ep],r2 + sld.w 8[ep],r2 #if configDATA_MODE == 1 ; Using Tiny data model sld.w 12[ep],r4 sld.w 16[ep],r5 @@ -184,7 +184,7 @@ portRESTORE_CONTEXT MACRO sld.w 64[ep],r18 sld.w 68[ep],r19 dispose 72,{r20,r21,r22,r23,r24,r26,r27,r28,r29,r30} -#endif /* configDATA_MODE */ +#endif /* configDATA_MODE */ ENDM ;------------------------------------------------------------------------------ @@ -200,7 +200,7 @@ portRESTORE_CONTEXT MACRO RSEG CODE:CODE vPortStart: portRESTORE_CONTEXT ; Restore the context of whichever task the ... - ld.w 0[sp],lp + ld.w 0[sp],lp ldsr lp,5 ; restore PSW DI ld.w 4[sp],lp ; restore LP @@ -208,10 +208,10 @@ vPortStart: ADD 0x0C,sp ; set SP to right position EI jmp [lp] -;------------------------------------------------------------------------------ +;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------ -; Port Yield function to check for a Task switch in the cooperative and +; Port Yield function to check for a Task switch in the cooperative and ; preemptive mode ; ; Input: NONE @@ -220,6 +220,9 @@ vPortStart: ; ; Output: NONE ;------------------------------------------------------------------------------ + +#if 0 + RSEG CODE:CODE vPortYield: DI @@ -236,24 +239,50 @@ vPortYield: ld.w 4[sp],lp ; restore PIPC ldsr lp,0 ld.w 8[sp],lp ; restore LP - add 0x0C,sp + add 0x0C,sp RETI + +#else + + RSEG CODE:CODE +vPortYield: + + add -0x0C,sp ; prepare stack to save necessary values + st.w lp,8[sp] ; store LP to stack + stsr 0,r31 + st.w lp,4[sp] ; store EIPC to stack + stsr 1,lp + st.w lp,0[sp] ; store EIPSW to stack + portSAVE_CONTEXT ; Save the context of the current task. + jarl vTaskSwitchContext,lp ; Call the scheduler. + portRESTORE_CONTEXT ; Restore the context of whichever task the ... + ; ... scheduler decided should run. + ld.w 0[sp],lp ; restore EIPSW from stack + ldsr lp,1 + ld.w 4[sp],lp ; restore EIPC from stack + ldsr lp,0 + ld.w 8[sp],lp ; restore LP from stack + add 0x0C,sp ; set SP to right position + + RETI + +#endif ;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------ ; Perform the necessary steps of the Tick Count Increment and Task Switch -; depending on the chosen kernel configuration +; depending on the chosen kernel configuration ; ; Input: NONE ; -; Call: ISR +; Call: ISR ; ; Output: NONE ;------------------------------------------------------------------------------ #if configUSE_PREEMPTION == 1 ; use preemptive kernel mode MD_INTTM0EQ0: - + add -0x0C,sp ; prepare stack to save necessary values st.w lp,8[sp] ; store LP to stack stsr 0,r31 @@ -272,8 +301,8 @@ MD_INTTM0EQ0: ld.w 8[sp],lp ; restore LP from stack add 0x0C,sp ; set SP to right position - RETI -;------------------------------------------------------------------------------ + RETI +;------------------------------------------------------------------------------ #else ; use cooperative kernel mode MD_INTTM0EQ0: @@ -284,7 +313,7 @@ MD_INTTM0EQ0: sld.w 0[ep],r5 sld.w 4[ep],r1 dispose 8,{lp,ep} - RETI + RETI #endif /* configUSE_PREEMPTION */ ;------------------------------------------------------------------------------ @@ -296,8 +325,13 @@ MD_INTTM0EQ0: RSEG NEAR_ID:CONST:SORT:NOROOT(2) `?`: DW 10 - -;------------------------------------------------------------------------------ + + COMMON INTVEC:CODE:ROOT(2) + ORG 40H +`??vPortYield??INTVEC 40`: + JR vPortYield + +;------------------------------------------------------------------------------ ; set microcontroller security ID COMMON INTVEC:CODE:ROOT(2) @@ -314,7 +348,7 @@ MD_INTTM0EQ0: DB CG_SECURITY8 DB CG_SECURITY9 -;------------------------------------------------------------------------------ +;------------------------------------------------------------------------------ ; set microcontroller option bytes COMMON INTVEC:CODE:ROOT(2) @@ -326,5 +360,5 @@ MD_INTTM0EQ0: DB OPT7D DB OPT7E DB OPT7F - + END \ No newline at end of file diff --git a/Source/portable/IAR/V850ES_Fx3/portmacro.h b/Source/portable/IAR/V850ES_Fx3/portmacro.h index a1a7ae663..4beee153b 100644 --- a/Source/portable/IAR/V850ES_Fx3/portmacro.h +++ b/Source/portable/IAR/V850ES_Fx3/portmacro.h @@ -19,7 +19,7 @@ A special exception to the GPL can be applied should you wish to distribute a combined work that includes FreeRTOS.org, without being obliged to provide - the source code for any proprietary components. See the licensing section + the source code for any proprietary components. See the licensing section of http://www.FreeRTOS.org for full details of how and when the exception can be applied. @@ -37,13 +37,13 @@ Please ensure to read the configuration and relevant port sections of the online documentation. - http://www.FreeRTOS.org - Documentation, latest information, license and + http://www.FreeRTOS.org - Documentation, latest information, license and contact details. - http://www.SafeRTOS.com - A version that is certified for use in safety + http://www.SafeRTOS.com - A version that is certified for use in safety critical systems. - http://www.OpenRTOS.com - Commercial support, development, porting, + http://www.OpenRTOS.com - Commercial support, development, porting, licensing and training services. */ @@ -55,7 +55,7 @@ extern "C" { #endif /*----------------------------------------------------------- - * Port specific definitions. + * Port specific definitions. * * The settings in this file configure FreeRTOS correctly for the * given hardware and compiler. @@ -127,7 +127,8 @@ extern void vPortYield( void ); extern void vPortStart( void ); extern void portSAVE_CONTEXT( void ); extern void portRESTORE_CONTEXT( void ); -#define portYIELD() vPortYield() +//#define portYIELD() vPortYield() +#define portYIELD() __asm ( "trap 0" ) #define portNOP() __asm ( "NOP" ) /*-----------------------------------------------------------*/ -- 2.39.5