Just tidy up the RX port files.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1058 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Source/portable/Renesas/RX600/port.c b/Source/portable/Renesas/RX600/port.c
index 822a77c40679119154b4a2c9c23db065772bf408..294f6a067cfcff94d2d68aa0b416a124b4ae6133 100644 (file)
--- a/Source/portable/Renesas/RX600/port.c
+++ b/Source/portable/Renesas/RX600/port.c
@@ -63,45 +63,44 @@
 #include "string.h"\r
 \r
 /* Hardware specifics. */\r
-#include <machine.h>\r
 #include "iodefine.h"\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
-/* Tasks should start with interrupts enabled, therefore PSW is set with U,I,PM \r
-flags set and IPL clear. */\r
-/* \r
- U = 1 User stack pointer.\r
- I = 1 Interrupts enabled.\r
- PM = 0 Supervisor mode.\r
- IPL = 0 All interrupt priorities enabled.\r
-*/\r
+/* Tasks should start with interrupts enabled and in Supervisor mode, therefore \r
+PSW is set with U and I set, and PM and IPL clear. */\r
 #define portINITIAL_PSW     ( ( portSTACK_TYPE ) 0x00030000 )\r
 #define portINITIAL_FPSW    ( ( portSTACK_TYPE ) 0x00000100 )\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
- * \r
+ * Function to start the first task executing - written in asm code as direct\r
+ * access to registers is required. \r
  */\r
-void vPortYield( void );\r
+static void prvStartFirstTask( void );\r
 \r
 /*\r
- * Function to start the first task executing.\r
+ * Software interrupt handler.  Performs the actual context switch (saving and\r
+ * restoring of registers).  Written in asm code as direct register access is\r
+ * required.\r
  */\r
-void vPortStartFirstTask( void );\r
-\r
-void vPortPendContextSwitch( void );\r
-\r
-static void prvStartFirstTask( void );\r
-\r
 static void prvYieldHandler( void );\r
 \r
+/*\r
+ * The entry point for the software interrupt handler.  This is the function\r
+ * that calls the inline asm function prvYieldHandler().  It is installed in \r
+ * the vector table, but the code that installs it is in prvYieldHandler rather\r
+ * than using a #pragma.\r
+ */\r
 void vSoftwareInterruptISR( void );\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
+/* This is accessed by the inline assembler functions so is file scope for\r
+convenience. */\r
 extern void *pxCurrentTCB;\r
+extern void vTaskSwitchContext( void );\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -117,35 +116,48 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
        *pxTopOfStack = portINITIAL_PSW;\r
        pxTopOfStack--;\r
        *pxTopOfStack = ( portSTACK_TYPE ) pxCode;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0xffffffff;     /* r15. */\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0xeeeeeeee;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0xdddddddd;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0xcccccccc;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0xbbbbbbbb;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0xaaaaaaaa;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0x99999999;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0x88888888;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0x77777777;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0x66666666;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0x55555555;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0x44444444;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0x33333333;\r
-       pxTopOfStack--;\r
-       *pxTopOfStack = 0x22222222;\r
-       pxTopOfStack--;\r
+       \r
+       /* When debugging it can be useful if every register is set to a known\r
+       value.  Otherwise code space can be saved by just setting the registers\r
+       that need to be set. */\r
+       #ifdef USE_FULL_REGISTER_INITIALISATION\r
+       {\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0xffffffff;     /* r15. */\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0xeeeeeeee;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0xdddddddd;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0xcccccccc;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0xbbbbbbbb;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0xaaaaaaaa;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0x99999999;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0x88888888;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0x77777777;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0x66666666;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0x55555555;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0x44444444;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0x33333333;\r
+               pxTopOfStack--;\r
+               *pxTopOfStack = 0x22222222;\r
+               pxTopOfStack--;\r
+       }\r
+       #else\r
+       {\r
+               pxTopOfStack -= 15;\r
+       }\r
+       #endif\r
+       \r
        *pxTopOfStack = ( portSTACK_TYPE ) pvParameters; /* R1 */\r
        pxTopOfStack--;                         \r
        *pxTopOfStack = portINITIAL_FPSW;\r
@@ -197,13 +209,13 @@ static void prvStartFirstTask( void )
        /* When starting the scheduler there is nothing that needs moving to the\r
        interrupt stack because the function is not called from an interrupt.\r
        Just ensure the current stack is the user stack. */\r
-       SETPSW      U\r
+       SETPSW  U\r
 \r
        /* Obtain the location of the stack associated with which ever task \r
        pxCurrentTCB is currently pointing to. */\r
-       MOV.L       #_pxCurrentTCB, R15\r
-       MOV.L       [R15], R15\r
-       MOV.L       [R15], R0\r
+       MOV.L   #_pxCurrentTCB, R15\r
+       MOV.L   [R15], R15\r
+       MOV.L   [R15], R0\r
 \r
        /* Restore the registers from the stack of the task pointed to by \r
        pxCurrentTCB. */\r
@@ -223,9 +235,11 @@ static void prvStartFirstTask( void )
 #pragma interrupt ( vTickISR( vect = _VECT( configTICK_VECTOR ), enable ) )\r
 void vTickISR( void )\r
 {\r
-       /* Clear the interrupt. */\r
+       /* Increment the tick, and perform any processing the new tick value\r
+       necessitates. */\r
        vTaskIncrementTick();\r
        \r
+       /* Only select a new task if the preemptive scheduler is being used. */\r
        #if( configUSE_PREEMPTION == 1 )\r
                taskYIELD();\r
        #endif\r
@@ -250,7 +264,7 @@ static void prvYieldHandler( void )
        /* Move the data that was automatically pushed onto the interrupt stack when\r
        the interrupt occurred from the interrupt stack to the user stack.  \r
        \r
-       R15 is saved before it is used. */\r
+       R15 is saved before it is clobbered. */\r
        PUSH.L  R15\r
        \r
        /* Read the user stack pointer. */\r
@@ -260,7 +274,7 @@ static void prvYieldHandler( void )
        SUB             #12, R15\r
        MVTC    R15, USP\r
        \r
-       /* Copy the data accross. */\r
+       /* Copy the data across. */\r
        MOV.L   [ R0 ], [ R15 ] ; R15\r
        MOV.L   4[ R0 ], 4[ R15 ]  ; PC\r
        MOV.L   8[ R0 ], 8[ R15 ]  ; PSW\r
@@ -271,14 +285,16 @@ static void prvYieldHandler( void )
        /* All the rest of the registers are saved directly to the user stack. */\r
        SETPSW  U\r
 \r
-       /* Save the rest of the registers (R15 has been saved already. */\r
-       PUSHM   R1-R14          ; General purpose registers. \r
-       MVFC    FPSW, R15       ; Floating point status word.\r
+       /* Save the rest of the general registers (R15 has been saved already). */\r
+       PUSHM   R1-R14\r
+       \r
+       /* Save the FPSW and accumulator. */\r
+       MVFC    FPSW, R15\r
        PUSH.L  R15\r
-       MVFACHI R15             ; Accumulator\r
+       MVFACHI R15\r
        PUSH.L  R15\r
-       MVFACMI R15             ; Accumulator\r
-       SHLL    #16, R15\r
+       MVFACMI R15     ; Middle order word.\r
+       SHLL    #16, R15 ; Shifted left as it is restored to the low order word.\r
        PUSH.L  R15\r
 \r
        /* Save the stack pointer to the TCB. */\r
@@ -293,7 +309,7 @@ static void prvYieldHandler( void )
        /* Select the next task to run. */\r
        BSR.A   _vTaskSwitchContext\r
 \r
-       /* Reset the interrupt mask. */\r
+       /* Reset the interrupt mask as no more data structure access is required. */\r
        MVTIPL  #configKERNEL_INTERRUPT_PRIORITY\r
 \r
        /* Load the stack pointer of the task that is now selected as the Running\r

diff --git a/Source/portable/Renesas/RX600/portmacro.h b/Source/portable/Renesas/RX600/portmacro.h
index 82cf1676baf28a92244fea2a94b28e8afa49b0b8..8919e062e9a00a037c066c5ae0fb844b9add62b0 100644 (file)
--- a/Source/portable/Renesas/RX600/portmacro.h
+++ b/Source/portable/Renesas/RX600/portmacro.h
@@ -92,20 +92,16 @@ portSTACK_TYPE and portBASE_TYPE. */
 /*-----------------------------------------------------------*/\r
 \r
 /* Hardware specifics. */\r
-#define portBYTE_ALIGNMENT                             8\r
+#define portBYTE_ALIGNMENT                             8       /* Could make four, according to manual. */\r
 #define portSTACK_GROWTH                               -1\r
 #define portTICK_RATE_MS                               ( ( portTickType ) 1000 / configTICK_RATE_HZ )          \r
 #define portNOP()                                              nop()\r
-#define portSTART_SCHEDULER_TRAP_NO            ( 32 )\r
-#define portKERNEL_INTERRUPT_PRIORITY  ( 1 )\r
 \r
 /* The location of the software interrupt register.  Software interrupts use\r
 vector 27. */\r
 #define portITU_SWINTR                 ( ( unsigned char * ) 0x000872E0 )\r
 #define portYIELD()                            *portITU_SWINTR = 0x01; nop(); nop(); nop(); nop(); nop()\r
-\r
-extern void vTaskSwitchContext( void );\r
-#define portYIELD_FROM_ISR( x )                        if( x != pdFALSE ) portYIELD()\r
+#define portYIELD_FROM_ISR( x )        if( x != pdFALSE ) portYIELD()\r
 \r
 /*\r
  * These macros should be called directly, but through the taskENTER_CRITICAL()\r
@@ -114,9 +110,6 @@ extern void vTaskSwitchContext( void );
 #define portENABLE_INTERRUPTS()        set_ipl( 0 )\r
 #define portDISABLE_INTERRUPTS()       set_ipl( configMAX_SYSCALL_INTERRUPT_PRIORITY )\r
 \r
-#define portSET_INTERRUPT_MASK_FROM_ISR() get_ipl(); set_ipl( configMAX_SYSCALL_INTERRUPT_PRIORITY )\r
-#define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus ) set_ipl( uxSavedInterruptStatus )\r
-\r
 /* Critical nesting counts are stored in the TCB. */\r
 #define portCRITICAL_NESTING_IN_TCB ( 1 )\r
 \r
@@ -126,6 +119,9 @@ extern void vTaskExitCritical( void );
 #define portENTER_CRITICAL()   vTaskEnterCritical();\r
 #define portEXIT_CRITICAL()            vTaskExitCritical();\r
 \r
+/* As this port allows interrupt nesting... */\r
+#define portSET_INTERRUPT_MASK_FROM_ISR() get_ipl(); set_ipl( configMAX_SYSCALL_INTERRUPT_PRIORITY )\r
+#define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus ) set_ipl( uxSavedInterruptStatus )\r
 \r
 /*-----------------------------------------------------------*/\r
 \r