]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
Update version number to 9.0.0rc2.
[freertos] / FreeRTOS / Source / portable / GCC / MicroBlazeV8 / port_exceptions.c
index afbda99bee14b79536fc269451fd37e370d4b389..f76e0aa7a8ba43e5b5b54d122fa321f69eb97a12 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.2.0 - Copyright (C) 2015 Real Time Engineers Ltd.\r
+    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -8,14 +8,14 @@
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
 \r
-       ***************************************************************************\r
+    ***************************************************************************\r
     >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
     >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
     >>!   obliged to provide the source code for proprietary components     !<<\r
     >>!   outside of the FreeRTOS kernel.                                   !<<\r
-       ***************************************************************************\r
+    ***************************************************************************\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
     ***************************************************************************\r
 \r
     http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading\r
-       the FAQ page "My application does not run, what could be wrong?".  Have you\r
-       defined configASSERT()?\r
+    the FAQ page "My application does not run, what could be wrong?".  Have you\r
+    defined configASSERT()?\r
 \r
-       http://www.FreeRTOS.org/support - In return for receiving this top quality\r
-       embedded software for free we request you assist our global community by\r
-       participating in the support forum.\r
+    http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+    embedded software for free we request you assist our global community by\r
+    participating in the support forum.\r
 \r
-       http://www.FreeRTOS.org/training - Investing in training allows your team to\r
-       be as productive as possible as early as possible.  Now you can receive\r
-       FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
-       Ltd, and the world's leading authority on the world's leading RTOS.\r
+    http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+    be as productive as possible as early as possible.  Now you can receive\r
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+    Ltd, and the world's leading authority on the world's leading RTOS.\r
 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
@@ -151,7 +151,7 @@ extern void *pxCurrentTCB;
        /* First fill in the name and handle of the task that was in the Running\r
        state when the exception occurred. */\r
        xRegisterDump.xCurrentTaskHandle = pxCurrentTCB;\r
-       xRegisterDump.pcCurrentTaskName = pcTaskGetTaskName( NULL );\r
+       xRegisterDump.pcCurrentTaskName = pcTaskGetName( NULL );\r
 \r
        configASSERT( pulStackPointerOnFunctionEntry );\r
 \r
@@ -200,7 +200,7 @@ extern void *pxCurrentTCB;
        exception. */\r
        xRegisterDump.ulPC = xRegisterDump.ulR17_return_address_from_exceptions - portexINSTRUCTION_SIZE;\r
 \r
-       #if XPAR_MICROBLAZE_0_USE_FPU != 0\r
+       #if( XPAR_MICROBLAZE_USE_FPU != 0 )\r
        {\r
                xRegisterDump.ulFSR = mffsr();\r
        }\r
@@ -243,13 +243,13 @@ extern void *pxCurrentTCB;
                                xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_STACK_VIOLATION or XEXC_ID_MMU";\r
                                break;\r
 \r
-               #if XPAR_MICROBLAZE_0_USE_FPU != 0\r
+               #if( XPAR_MICROBLAZE_USE_FPU != 0 )\r
 \r
                        case XEXC_ID_FPU :\r
                                                xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_FPU see ulFSR value";\r
                                                break;\r
 \r
-               #endif /* XPAR_MICROBLAZE_0_USE_FPU */\r
+               #endif /* XPAR_MICROBLAZE_USE_FPU */\r
        }\r
 \r
        /* vApplicationExceptionRegisterDump() is a callback function that the\r
@@ -275,41 +275,43 @@ static uint32_t ulHandlersAlreadyInstalled = pdFALSE;
        {\r
                ulHandlersAlreadyInstalled = pdTRUE;\r
 \r
-               #if XPAR_MICROBLAZE_0_UNALIGNED_EXCEPTIONS == 1\r
+               #if XPAR_MICROBLAZE_UNALIGNED_EXCEPTIONS == 1\r
                        microblaze_register_exception_handler( XEXC_ID_UNALIGNED_ACCESS, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_UNALIGNED_ACCESS );\r
-               #endif /* XPAR_MICROBLAZE_0_UNALIGNED_EXCEPTIONS*/\r
+               #endif /* XPAR_MICROBLAZE_UNALIGNED_EXCEPTIONS*/\r
 \r
-               #if XPAR_MICROBLAZE_0_ILL_OPCODE_EXCEPTION == 1\r
+               #if XPAR_MICROBLAZE_ILL_OPCODE_EXCEPTION == 1\r
                        microblaze_register_exception_handler( XEXC_ID_ILLEGAL_OPCODE, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_ILLEGAL_OPCODE );\r
-               #endif /* XPAR_MICROBLAZE_0_ILL_OPCODE_EXCEPTION*/\r
+               #endif /* XPAR_MICROBLAZE_ILL_OPCODE_EXCEPTION */\r
 \r
-               #if XPAR_MICROBLAZE_0_M_AXI_I_BUS_EXCEPTION == 1\r
+               #if XPAR_MICROBLAZE_M_AXI_I_BUS_EXCEPTION == 1\r
                        microblaze_register_exception_handler( XEXC_ID_M_AXI_I_EXCEPTION, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_M_AXI_I_EXCEPTION );\r
-               #endif /* XPAR_MICROBLAZE_0_M_AXI_I_BUS_EXCEPTION*/\r
+               #endif /* XPAR_MICROBLAZE_M_AXI_I_BUS_EXCEPTION */\r
 \r
-               #if XPAR_MICROBLAZE_0_M_AXI_D_BUS_EXCEPTION == 1\r
+               #if XPAR_MICROBLAZE_M_AXI_D_BUS_EXCEPTION == 1\r
                        microblaze_register_exception_handler( XEXC_ID_M_AXI_D_EXCEPTION, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_M_AXI_D_EXCEPTION );\r
-               #endif /* XPAR_MICROBLAZE_0_M_AXI_D_BUS_EXCEPTION*/\r
+               #endif /* XPAR_MICROBLAZE_M_AXI_D_BUS_EXCEPTION */\r
 \r
-               #if XPAR_MICROBLAZE_0_IPLB_BUS_EXCEPTION == 1\r
+               #if XPAR_MICROBLAZE_IPLB_BUS_EXCEPTION == 1\r
                        microblaze_register_exception_handler( XEXC_ID_IPLB_EXCEPTION, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_IPLB_EXCEPTION );\r
-               #endif /* XPAR_MICROBLAZE_0_IPLB_BUS_EXCEPTION*/\r
+               #endif /* XPAR_MICROBLAZE_IPLB_BUS_EXCEPTION */\r
 \r
-               #if XPAR_MICROBLAZE_0_DPLB_BUS_EXCEPTION == 1\r
+               #if XPAR_MICROBLAZE_DPLB_BUS_EXCEPTION == 1\r
                        microblaze_register_exception_handler( XEXC_ID_DPLB_EXCEPTION, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_DPLB_EXCEPTION );\r
-               #endif /* XPAR_MICROBLAZE_0_DPLB_BUS_EXCEPTION*/\r
+               #endif /* XPAR_MICROBLAZE_DPLB_BUS_EXCEPTION */\r
 \r
-               #if XPAR_MICROBLAZE_0_DIV_ZERO_EXCEPTION == 1\r
+               #if XPAR_MICROBLAZE_DIV_ZERO_EXCEPTION == 1\r
                        microblaze_register_exception_handler( XEXC_ID_DIV_BY_ZERO, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_DIV_BY_ZERO );\r
-               #endif /* XPAR_MICROBLAZE_0_DIV_ZERO_EXCEPTION*/\r
+               #endif /* XPAR_MICROBLAZE_DIV_ZERO_EXCEPTION */\r
 \r
-               #if XPAR_MICROBLAZE_0_FPU_EXCEPTION == 1\r
+               #if XPAR_MICROBLAZE_FPU_EXCEPTION == 1\r
                        microblaze_register_exception_handler( XEXC_ID_FPU, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_FPU );\r
-               #endif /* XPAR_MICROBLAZE_0_FPU_EXCEPTION*/\r
+               #endif /* XPAR_MICROBLAZE_FPU_EXCEPTION */\r
 \r
-               #if XPAR_MICROBLAZE_0_FSL_EXCEPTION == 1\r
+               #if XPAR_MICROBLAZE_FSL_EXCEPTION == 1\r
                        microblaze_register_exception_handler( XEXC_ID_FSL, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_FSL );\r
-               #endif /* XPAR_MICROBLAZE_0_FSL_EXCEPTION*/\r
+               #endif /* XPAR_MICROBLAZE_FSL_EXCEPTION */\r
+\r
+               microblaze_enable_exceptions();\r
        }\r
 }\r
 \r