Remove clrex instruction from Cortex-M ports again as it is implicit in interrupt...

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

diff --git a/FreeRTOS/Source/portable/CCS/ARM_CM4F/portasm.asm b/FreeRTOS/Source/portable/CCS/ARM_CM4F/portasm.asm
index aa42559800c40ed1a63c172c0ca1d0489c7ab92e..a392583b07b72f59842f7f38d14ae86cd25f5594 100644 (file)
--- a/FreeRTOS/Source/portable/CCS/ARM_CM4F/portasm.asm
+++ b/FreeRTOS/Source/portable/CCS/ARM_CM4F/portasm.asm
@@ -123,9 +123,6 @@ xPortPendSVHandler: .asmfunc
        ;/* Save the new top of stack into the first member of the TCB. */\r
        str r0, [r2]\r
 \r
-       ;/* Ensure thread safety of atomic operations. */\r
-       clrex\r
-\r
        stmdb sp!, {r3}\r
        ldr r0, ulMaxSyscallInterruptPriorityConst\r
        ldr r1, [r0]\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
index 0888579f87ca5dc949ed9cc3d5e8a47f0aa39ee6..960717a573c208d68b9720d59e5da95dfce0c106 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
@@ -410,7 +410,6 @@ void xPortPendSVHandler( void )
        "                                                                               \n"\r
        "       stmdb r0!, {r4-r11}                                     \n" /* Save the remaining registers. */\r
        "       str r0, [r2]                                            \n" /* Save the new top of stack into the first member of the TCB. */\r
-       "       clrex                                                           \n" /* Ensure thread safety of atomic operations. */\r
        "                                                                               \n"\r
        "       stmdb sp!, {r3, r14}                            \n"\r
        "       mov r0, %0                                                      \n"\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c
index 986b988240fd418bfaa9c9b7684c805471504737..d176bcc3567f1ab4c4ce38f899869f9730906096 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c
@@ -450,7 +450,6 @@ void xPortPendSVHandler( void )
                "       mrs r1, control                                         \n"\r
                "       stmdb r0!, {r1, r4-r11}                         \n" /* Save the remaining registers. */\r
                "       str r0, [r2]                                            \n" /* Save the new top of stack into the first member of the TCB. */\r
-               "       clrex                                                           \n" /* Ensure thread safety of atomic operations. */\r
                "                                                                               \n"\r
                "       stmdb sp!, {r3, r14}                            \n"\r
                "       mov r0, %0                                                      \n"\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
index 2cb58683e79047483c54d07e63fd73b0a05841ec..952c60b8bd84a8b73f1330dd18cd89e298c46e71 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
@@ -450,7 +450,6 @@ void xPortPendSVHandler( void )
        "                                                                               \n"\r
        "       stmdb r0!, {r4-r11, r14}                        \n" /* Save the core registers. */\r
        "       str r0, [r2]                                            \n" /* Save the new top of stack into the first member of the TCB. */\r
-       "       clrex                                                           \n" /* Ensure thread safety of atomic operations. */\r
        "                                                                               \n"\r
        "       stmdb sp!, {r3}                                         \n"\r
        "       mov r0, %0                                                      \n"\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM4_MPU/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM4_MPU/port.c
index a6b4c5a84e57d4fae6775b55b1cc1ee779bce02d..babea315fbd1ae2413a49e4d436e8cfe8a4fedd0 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM4_MPU/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM4_MPU/port.c
@@ -477,7 +477,6 @@ void xPortPendSVHandler( void )
                "       mrs r1, control                                         \n"\r
                "       stmdb r0!, {r1, r4-r11, r14}            \n" /* Save the remaining registers. */\r
                "       str r0, [r2]                                            \n" /* Save the new top of stack into the first member of the TCB. */\r
-               "       clrex                                                           \n" /* Ensure thread safety of atomic operations. */\r
                "                                                                               \n"\r
                "       stmdb sp!, {r3}                                         \n"\r
                "       mov r0, %0                                                      \n"\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c
index 51d1c1a661a22b2d125565059bfb5461dea6f8f7..86fb9cc6bb3afcd6b9ddb465761c8f2d4513df80 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c
@@ -438,7 +438,6 @@ void xPortPendSVHandler( void )
        "                                                                               \n"\r
        "       stmdb r0!, {r4-r11, r14}                        \n" /* Save the core registers. */\r
        "       str r0, [r2]                                            \n" /* Save the new top of stack into the first member of the TCB. */\r
-       "       clrex                                                           \n" /* Ensure thread safety of atomic operations. */\r
        "                                                                               \n"\r
        "       stmdb sp!, {r3}                                         \n"\r
        "       mov r0, %0                                                      \n"\r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s b/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s
index 756602121dd670eca26f61ea2489d21de9b4262f..cf7a6a3a1bc5999352f98384a461c00d9b88ff19 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s
@@ -91,7 +91,6 @@ xPortPendSVHandler:
 \r
        stmdb r0!, {r4-r11}                             /* Save the remaining registers. */\r
        str r0, [r2]                                    /* Save the new top of stack into the first member of the TCB. */\r
-       clrex                                                   /* Ensure thread safety of atomic operations. */\r
 \r
        stmdb sp!, {r3, r14}\r
        mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY\r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portasm.s b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portasm.s
index a6e07773db658e5062a65924e77cc67081893f76..758d6fa9718a7a65fe516403b289a0c299a4ad11 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portasm.s
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portasm.s
@@ -101,9 +101,6 @@ xPortPendSVHandler:
        /* Save the new top of stack into the first member of the TCB. */\r
        str r0, [r2]\r
 \r
-       /* Ensure thread safety of atomic operations. */\r
-       clrex\r
-\r
        stmdb sp!, {r3}\r
        mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY\r
        msr basepri, r0\r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM7/r0p1/portasm.s b/FreeRTOS/Source/portable/IAR/ARM_CM7/r0p1/portasm.s
index e90dfb26124c11880c6656795eb5a91439eff5e0..2ab809a0e3282f3969749c8a2effee1f5e768706 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM7/r0p1/portasm.s
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM7/r0p1/portasm.s
@@ -101,9 +101,6 @@ xPortPendSVHandler:
        /* Save the new top of stack into the first member of the TCB. */\r
        str r0, [r2]\r
 \r
-       /* Ensure thread safety of atomic operations. */\r
-       clrex\r
-\r
        stmdb sp!, {r3}\r
        mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY\r
        cpsid i\r

diff --git a/FreeRTOS/Source/portable/MikroC/ARM_CM4F/port.c b/FreeRTOS/Source/portable/MikroC/ARM_CM4F/port.c
index 8bd991d3cafbbec789db64a6797827d8fa1a3340..bb6993348194d9ef9a8ab304a9282a28db69a83b 100644 (file)
--- a/FreeRTOS/Source/portable/MikroC/ARM_CM4F/port.c
+++ b/FreeRTOS/Source/portable/MikroC/ARM_CM4F/port.c
@@ -458,8 +458,6 @@ void xPortPendSVHandler( void ) iv IVT_INT_PendSV ics ICS_OFF
 \r
        str r0, [r2]                     /* Save the new top of stack into the first member of the TCB. */\r
 \r
-       clrex                                   /* Ensure thread safety of atomic operations. */\r
-\r
        stmdb sp!, (r3)\r
        ldr r0, =_ucMaxSyscallInterruptPriority\r
        ldr r1, [r0]\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
index 8ce6d098d2e1b35d3ee9e5af2c5d0a8fa851cc1d..e15b91a16ce4edb262b0100dcbcd6fca3aa1a2a1 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
@@ -407,7 +407,6 @@ __asm void xPortPendSVHandler( void )
 \r
        stmdb r0!, {r4-r11}                     /* Save the remaining registers. */\r
        str r0, [r2]                            /* Save the new top of stack into the first member of the TCB. */\r
-       clrex                                           /* Ensure thread safety of atomic operations. */\r
 \r
        stmdb sp!, {r3, r14}\r
        mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c
index aaf9efd21ecf09e71c8158007709d99231bf6857..6902f97894dd513f91617dc6bfb8c66f1ef124f0 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c
@@ -479,9 +479,6 @@ __asm void xPortPendSVHandler( void )
        /* Save the new top of stack into the first member of the TCB. */\r
        str r0, [r2]\r
 \r
-       /* Ensure thread safety of atomic operations. */\r
-       clrex\r
-\r
        stmdb sp!, {r3}\r
        mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY\r
        msr basepri, r0\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/port.c
index 0623859e8417921b9ec8049671c7c78007ba353b..3cd92405651bef9e622790eb0e63fdf7201c53c2 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/port.c
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/port.c
@@ -492,7 +492,6 @@ __asm void xPortPendSVHandler( void )
        mrs r1, control\r
        stmdb r0!, {r1, r4-r11, r14}    /* Save the remaining registers. */\r
        str r0, [r2]                                    /* Save the new top of stack into the first member of the TCB. */\r
-       clrex                                                   /* Ensure thread safety of atomic operations. */\r
 \r
        stmdb sp!, {r3}\r
        mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM7/r0p1/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM7/r0p1/port.c
index 9f0dc3330ebd8076db67ee36f8bdc20604105d31..133f61ea8cca055437f04e8677e03b9c54f5e83a 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM7/r0p1/port.c
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM7/r0p1/port.c
@@ -463,9 +463,6 @@ __asm void xPortPendSVHandler( void )
        /* Save the new top of stack into the first member of the TCB. */\r
        str r0, [r2]\r
 \r
-       /* Ensure thread safety of atomic operations. */\r
-       clrex\r
-\r
        stmdb sp!, {r3}\r
        mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY\r
        cpsid i\r