Make the pcObjectGetName() API function naming consistent - so rename pcTaskGetTaskNa...

[freertos] / FreeRTOS / Source / portable / GCC / MicroBlazeV8 / port_exceptions.c

diff --git a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
index b644caeb3338e9489c6a114a54f1ae78da847566..ccbe24895544a78073632302375dcc0d8169d7f3 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
+++ b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
@@ -1,75 +1,70 @@
 /*\r
 /*\r

-    FreeRTOS V7.4.2 - Copyright (C) 2013 Real Time Engineers Ltd.\r
-\r
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT\r
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
-\r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
-     *    Complete, revised, and edited pdf reference manuals are also       *\r
-     *    available.                                                         *\r
-     *                                                                       *\r
-     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
-     *    ensuring you get running as quickly as possible and with an        *\r
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
-     *    the FreeRTOS project to continue with its mission of providing     *\r
-     *    professional grade, cross platform, de facto standard solutions    *\r
-     *    for microcontrollers - completely free of charge!                  *\r
-     *                                                                       *\r
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
-     *                                                                       *\r
-     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
-     *                                                                       *\r
-    ***************************************************************************\r
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.\r
+    All rights reserved\r

 \r
 \r

+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r

 \r
     This file is part of the FreeRTOS distribution.\r
 \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
 \r
     This file is part of the FreeRTOS distribution.\r
 \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

-    >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to\r
-    distribute a combined work that includes FreeRTOS without being obliged to\r
-    provide the source code for proprietary components outside of the FreeRTOS\r
-    kernel.\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
     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
     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

-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more\r
-    details. You should have received a copy of the GNU General Public License\r
-    and the FreeRTOS license exception along with FreeRTOS; if not it can be\r
-    viewed here: http://www.freertos.org/a00114.html and also obtained by\r
-    writing to Real Time Engineers Ltd., contact details for whom are available\r
-    on the FreeRTOS WEB site.\r
-\r
-    1 tab == 4 spaces!\r
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following\r
+    link: http://www.freertos.org/a00114.html\r

 \r
     ***************************************************************************\r
      *                                                                       *\r
 \r
     ***************************************************************************\r
      *                                                                       *\r

-     *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?"                                     *\r
+     *    FreeRTOS provides completely free yet professionally developed,    *\r
+     *    robust, strictly quality controlled, supported, and cross          *\r
+     *    platform software that is more than just the market leader, it     *\r
+     *    is the industry's de facto standard.                               *\r

      *                                                                       *\r
      *                                                                       *\r

-     *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
+     *    Help yourself get started quickly while simultaneously helping     *\r
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *\r
+     *    tutorial book, reference manual, or both:                          *\r
+     *    http://www.FreeRTOS.org/Documentation                              *\r

      *                                                                       *\r
     ***************************************************************************\r
 \r
      *                                                                       *\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
+\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
 \r

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, \r
-    license and Real Time Engineers Ltd. contact details.\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
 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r

-    including FreeRTOS+Trace - an indispensable productivity tool, and our new\r
-    fully thread aware and reentrant UDP/IP stack.\r
-\r
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High \r
-    Integrity Systems, who sell the code with commercial support, \r
-    indemnification and middleware, under the OpenRTOS brand.\r
-    \r
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety \r
-    engineered and independently SIL3 certified version for use in safety and \r
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
+\r
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
+\r
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
+    licenses offer ticketed support, indemnification and commercial middleware.\r
+\r
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
+    engineered and independently SIL3 certified version for use in safety and\r

     mission critical applications that require provable dependability.\r
     mission critical applications that require provable dependability.\r

+\r
+    1 tab == 4 spaces!\r

 */\r
 \r
 /* Scheduler includes. */\r
 */\r
 \r
 /* Scheduler includes. */\r


@@ -113,7 +108,7 @@ configINSTALL_EXCEPTION_HANDLERS is not set to 1. */
 \r
 /* This variable is set in the exception entry code, before\r
 vPortExceptionHandler is called. */\r
 \r
 /* This variable is set in the exception entry code, before\r
 vPortExceptionHandler is called. */\r

-unsigned long *pulStackPointerOnFunctionEntry = NULL;\r
+uint32_t *pulStackPointerOnFunctionEntry = NULL;\r

 \r
 /* This is the structure that is filled with the MicroBlaze context as it\r
 existed immediately prior to the exception occurrence.  A pointer to this\r
 \r
 /* This is the structure that is filled with the MicroBlaze context as it\r
 existed immediately prior to the exception occurrence.  A pointer to this\r


@@ -129,10 +124,10 @@ extern void vPortExceptionHandlerEntry( void *pvExceptionID );
 \r
 /*-----------------------------------------------------------*/\r
 \r
 \r
 /*-----------------------------------------------------------*/\r
 \r

-/* vApplicationExceptionRegisterDump() is a callback function that the \r
+/* vApplicationExceptionRegisterDump() is a callback function that the\r

 application can optionally define to receive a populated xPortRegisterDump\r
 application can optionally define to receive a populated xPortRegisterDump\r

-structure.  If the application chooses not to define a version of \r
-vApplicationExceptionRegisterDump() then this weekly defined default \r
+structure.  If the application chooses not to define a version of\r
+vApplicationExceptionRegisterDump() then this weekly defined default\r

 implementation will be called instead. */\r
 extern void vApplicationExceptionRegisterDump( xPortRegisterDump *xRegisterDump ) __attribute__((weak));\r
 void vApplicationExceptionRegisterDump( xPortRegisterDump *xRegisterDump )\r
 implementation will be called instead. */\r
 extern void vApplicationExceptionRegisterDump( xPortRegisterDump *xRegisterDump ) __attribute__((weak));\r
 void vApplicationExceptionRegisterDump( xPortRegisterDump *xRegisterDump )\r


@@ -152,11 +147,11 @@ extern void *pxCurrentTCB;
 \r
        /* Fill an xPortRegisterDump structure with the MicroBlaze context as it\r
        was immediately before the exception occurrence. */\r
 \r
        /* Fill an xPortRegisterDump structure with the MicroBlaze context as it\r
        was immediately before the exception occurrence. */\r

-       \r
-       /* First fill in the name and handle of the task that was in the Running \r
+\r
+       /* 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
        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
 \r
        configASSERT( pulStackPointerOnFunctionEntry );\r
 \r


@@ -176,7 +171,7 @@ extern void *pxCurrentTCB;
        xRegisterDump.ulR18 = pulStackPointerOnFunctionEntry[ portexR18_STACK_OFFSET ];\r
        xRegisterDump.ulR19 = pulStackPointerOnFunctionEntry[ portexR19_STACK_OFFSET ];\r
        xRegisterDump.ulMSR = pulStackPointerOnFunctionEntry[ portexMSR_STACK_OFFSET ];\r
        xRegisterDump.ulR18 = pulStackPointerOnFunctionEntry[ portexR18_STACK_OFFSET ];\r
        xRegisterDump.ulR19 = pulStackPointerOnFunctionEntry[ portexR19_STACK_OFFSET ];\r
        xRegisterDump.ulMSR = pulStackPointerOnFunctionEntry[ portexMSR_STACK_OFFSET ];\r

-       \r
+\r

        /* Obtain the value of all other registers. */\r
        xRegisterDump.ulR2_small_data_area = mfgpr( R2 );\r
        xRegisterDump.ulR13_read_write_small_data_area = mfgpr( R13 );\r
        /* Obtain the value of all other registers. */\r
        xRegisterDump.ulR2_small_data_area = mfgpr( R2 );\r
        xRegisterDump.ulR13_read_write_small_data_area = mfgpr( R13 );\r


@@ -195,17 +190,17 @@ extern void *pxCurrentTCB;
        xRegisterDump.ulR29 = mfgpr( R29 );\r
        xRegisterDump.ulR30 = mfgpr( R30 );\r
        xRegisterDump.ulR31 = mfgpr( R31 );\r
        xRegisterDump.ulR29 = mfgpr( R29 );\r
        xRegisterDump.ulR30 = mfgpr( R30 );\r
        xRegisterDump.ulR31 = mfgpr( R31 );\r

-       xRegisterDump.ulR1_SP = ( ( unsigned long ) pulStackPointerOnFunctionEntry ) + portexASM_HANDLER_STACK_FRAME_SIZE;\r
+       xRegisterDump.ulR1_SP = ( ( uint32_t ) pulStackPointerOnFunctionEntry ) + portexASM_HANDLER_STACK_FRAME_SIZE;\r

        xRegisterDump.ulEAR = mfear();\r
        xRegisterDump.ulESR = mfesr();\r
        xRegisterDump.ulEDR = mfedr();\r
        xRegisterDump.ulEAR = mfear();\r
        xRegisterDump.ulESR = mfesr();\r
        xRegisterDump.ulEDR = mfedr();\r

-       \r
+\r

        /* Move the saved program counter back to the instruction that was executed\r
        when the exception occurred.  This is only valid for certain types of\r
        exception. */\r
        xRegisterDump.ulPC = xRegisterDump.ulR17_return_address_from_exceptions - portexINSTRUCTION_SIZE;\r
 \r
        /* Move the saved program counter back to the instruction that was executed\r
        when the exception occurred.  This is only valid for certain types of\r
        exception. */\r
        xRegisterDump.ulPC = xRegisterDump.ulR17_return_address_from_exceptions - portexINSTRUCTION_SIZE;\r
 \r

-       #if XPAR_MICROBLAZE_0_USE_FPU == 1\r
+       #if( XPAR_MICROBLAZE_USE_FPU != 0 )\r

        {\r
                xRegisterDump.ulFSR = mffsr();\r
        }\r
        {\r
                xRegisterDump.ulFSR = mffsr();\r
        }\r


@@ -218,49 +213,49 @@ extern void *pxCurrentTCB;
        /* Also fill in a string that describes what type of exception this is.\r
        The string uses the same ID names as defined in the MicroBlaze standard\r
        library exception header files. */\r
        /* Also fill in a string that describes what type of exception this is.\r
        The string uses the same ID names as defined in the MicroBlaze standard\r
        library exception header files. */\r

-       switch( ( unsigned long ) pvExceptionID )\r
+       switch( ( uint32_t ) pvExceptionID )\r

        {\r
                case XEXC_ID_FSL :\r
        {\r
                case XEXC_ID_FSL :\r

-                               xRegisterDump.pcExceptionCause = ( signed char * const ) "XEXC_ID_FSL";\r
+                               xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_FSL";\r

                                break;\r
 \r
                case XEXC_ID_UNALIGNED_ACCESS :\r
                                break;\r
 \r
                case XEXC_ID_UNALIGNED_ACCESS :\r

-                               xRegisterDump.pcExceptionCause = ( signed char * const ) "XEXC_ID_UNALIGNED_ACCESS";\r
+                               xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_UNALIGNED_ACCESS";\r

                                break;\r
 \r
                case XEXC_ID_ILLEGAL_OPCODE :\r
                                break;\r
 \r
                case XEXC_ID_ILLEGAL_OPCODE :\r

-                               xRegisterDump.pcExceptionCause = ( signed char * const ) "XEXC_ID_ILLEGAL_OPCODE";\r
+                               xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_ILLEGAL_OPCODE";\r

                                break;\r
 \r
                case XEXC_ID_M_AXI_I_EXCEPTION :\r
                                break;\r
 \r
                case XEXC_ID_M_AXI_I_EXCEPTION :\r

-                               xRegisterDump.pcExceptionCause = ( signed char * const ) "XEXC_ID_M_AXI_I_EXCEPTION or XEXC_ID_IPLB_EXCEPTION";\r
+                               xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_M_AXI_I_EXCEPTION or XEXC_ID_IPLB_EXCEPTION";\r

                                break;\r
 \r
                case XEXC_ID_M_AXI_D_EXCEPTION :\r
                                break;\r
 \r
                case XEXC_ID_M_AXI_D_EXCEPTION :\r

-                               xRegisterDump.pcExceptionCause = ( signed char * const ) "XEXC_ID_M_AXI_D_EXCEPTION or XEXC_ID_DPLB_EXCEPTION";\r
+                               xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_M_AXI_D_EXCEPTION or XEXC_ID_DPLB_EXCEPTION";\r

                                break;\r
 \r
                case XEXC_ID_DIV_BY_ZERO :\r
                                break;\r
 \r
                case XEXC_ID_DIV_BY_ZERO :\r

-                               xRegisterDump.pcExceptionCause = ( signed char * const ) "XEXC_ID_DIV_BY_ZERO";\r
+                               xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_DIV_BY_ZERO";\r

                                break;\r
 \r
                case XEXC_ID_STACK_VIOLATION :\r
                                break;\r
 \r
                case XEXC_ID_STACK_VIOLATION :\r

-                               xRegisterDump.pcExceptionCause = ( signed char * const ) "XEXC_ID_STACK_VIOLATION or XEXC_ID_MMU";\r
+                               xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_STACK_VIOLATION or XEXC_ID_MMU";\r

                                break;\r
 \r
                                break;\r
 \r

-               #if XPAR_MICROBLAZE_0_USE_FPU == 1\r
+               #if( XPAR_MICROBLAZE_USE_FPU != 0 )\r

 \r
                        case XEXC_ID_FPU :\r
 \r
                        case XEXC_ID_FPU :\r

-                                               xRegisterDump.pcExceptionCause = ( signed char * const ) "XEXC_ID_FPU see ulFSR value";\r
+                                               xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_FPU see ulFSR value";\r

                                                break;\r
 \r
                                                break;\r
 \r

-               #endif /* XPAR_MICROBLAZE_0_USE_FPU */\r
+               #endif /* XPAR_MICROBLAZE_USE_FPU */\r

        }\r
 \r
        }\r
 \r

-       /* vApplicationExceptionRegisterDump() is a callback function that the \r
+       /* vApplicationExceptionRegisterDump() is a callback function that the\r

        application can optionally define to receive the populated xPortRegisterDump\r
        application can optionally define to receive the populated xPortRegisterDump\r

-       structure.  If the application chooses not to define a version of \r
-       vApplicationExceptionRegisterDump() then the weekly defined default \r
+       structure.  If the application chooses not to define a version of\r
+       vApplicationExceptionRegisterDump() then the weekly defined default\r

        implementation within this file will be called instead. */\r
        vApplicationExceptionRegisterDump( &xRegisterDump );\r
 \r
        implementation within this file will be called instead. */\r
        vApplicationExceptionRegisterDump( &xRegisterDump );\r
 \r


@@ -274,52 +269,54 @@ extern void *pxCurrentTCB;
 \r
 void vPortExceptionsInstallHandlers( void )\r
 {\r
 \r
 void vPortExceptionsInstallHandlers( void )\r
 {\r

-static unsigned long ulHandlersAlreadyInstalled = pdFALSE;\r
+static uint32_t ulHandlersAlreadyInstalled = pdFALSE;\r

 \r
        if( ulHandlersAlreadyInstalled == pdFALSE )\r
        {\r
                ulHandlersAlreadyInstalled = pdTRUE;\r
 \r
 \r
        if( ulHandlersAlreadyInstalled == pdFALSE )\r
        {\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
                        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
 \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
                        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
 \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
                        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
 \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
                        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
 \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
                        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
 \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
                        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
 \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
                        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
 \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
                        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
 \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
                        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
 /* Exclude the entire file if the MicroBlaze is not configured to handle\r
        }\r
 }\r
 \r
 /* Exclude the entire file if the MicroBlaze is not configured to handle\r

-exceptions, or the application defined configuration item \r
+exceptions, or the application defined configuration item\r

 configINSTALL_EXCEPTION_HANDLERS is not set to 1. */\r
 #endif /* ( MICROBLAZE_EXCEPTIONS_ENABLED == 1 ) && ( configINSTALL_EXCEPTION_HANDLERS == 1 ) */\r
 \r
 configINSTALL_EXCEPTION_HANDLERS is not set to 1. */\r
 #endif /* ( MICROBLAZE_EXCEPTIONS_ENABLED == 1 ) && ( configINSTALL_EXCEPTION_HANDLERS == 1 ) */\r
 \r