X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FSource%2Fportable%2FGCC%2FMicroBlazeV8%2Fport_exceptions.c;h=ccbe24895544a78073632302375dcc0d8169d7f3;hb=508cd75ea3983fdb04d7760ee0c8f9f8daf484e0;hp=06c5ae5c30ecf2ed018b114209826508c6d99e77;hpb=62c041d220c4812a1ea4350cac687998fcd5d733;p=freertos

diff --git a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
index 06c5ae5c3..ccbe24895 100644
--- a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
+++ b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/port_exceptions.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V8.2.1 - Copyright (C) 2015 Real Time Engineers Ltd.
+    FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -8,7 +8,7 @@
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
     ***************************************************************************
     >>!   NOTE: The modification to the GPL is included to allow you to     !<<
@@ -151,7 +151,7 @@ extern void *pxCurrentTCB;
 	/* First fill in the name and handle of the task that was in the Running
 	state when the exception occurred. */
 	xRegisterDump.xCurrentTaskHandle = pxCurrentTCB;
-	xRegisterDump.pcCurrentTaskName = pcTaskGetTaskName( NULL );
+	xRegisterDump.pcCurrentTaskName = pcTaskGetName( NULL );
 
 	configASSERT( pulStackPointerOnFunctionEntry );
 
@@ -200,7 +200,7 @@ extern void *pxCurrentTCB;
 	exception. */
 	xRegisterDump.ulPC = xRegisterDump.ulR17_return_address_from_exceptions - portexINSTRUCTION_SIZE;
 
-	#if XPAR_MICROBLAZE_0_USE_FPU != 0
+	#if( XPAR_MICROBLAZE_USE_FPU != 0 )
 	{
 		xRegisterDump.ulFSR = mffsr();
 	}
@@ -243,13 +243,13 @@ extern void *pxCurrentTCB;
 				xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_STACK_VIOLATION or XEXC_ID_MMU";
 				break;
 
-		#if XPAR_MICROBLAZE_0_USE_FPU != 0
+		#if( XPAR_MICROBLAZE_USE_FPU != 0 )
 
 			case XEXC_ID_FPU :
 						xRegisterDump.pcExceptionCause = ( int8_t * const ) "XEXC_ID_FPU see ulFSR value";
 						break;
 
-		#endif /* XPAR_MICROBLAZE_0_USE_FPU */
+		#endif /* XPAR_MICROBLAZE_USE_FPU */
 	}
 
 	/* vApplicationExceptionRegisterDump() is a callback function that the
@@ -275,41 +275,43 @@ static uint32_t ulHandlersAlreadyInstalled = pdFALSE;
 	{
 		ulHandlersAlreadyInstalled = pdTRUE;
 
-		#if XPAR_MICROBLAZE_0_UNALIGNED_EXCEPTIONS == 1
+		#if XPAR_MICROBLAZE_UNALIGNED_EXCEPTIONS == 1
 			microblaze_register_exception_handler( XEXC_ID_UNALIGNED_ACCESS, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_UNALIGNED_ACCESS );
-		#endif /* XPAR_MICROBLAZE_0_UNALIGNED_EXCEPTIONS*/
+		#endif /* XPAR_MICROBLAZE_UNALIGNED_EXCEPTIONS*/
 
-		#if XPAR_MICROBLAZE_0_ILL_OPCODE_EXCEPTION == 1
+		#if XPAR_MICROBLAZE_ILL_OPCODE_EXCEPTION == 1
 			microblaze_register_exception_handler( XEXC_ID_ILLEGAL_OPCODE, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_ILLEGAL_OPCODE );
-		#endif /* XPAR_MICROBLAZE_0_ILL_OPCODE_EXCEPTION*/
+		#endif /* XPAR_MICROBLAZE_ILL_OPCODE_EXCEPTION */
 
-		#if XPAR_MICROBLAZE_0_M_AXI_I_BUS_EXCEPTION == 1
+		#if XPAR_MICROBLAZE_M_AXI_I_BUS_EXCEPTION == 1
 			microblaze_register_exception_handler( XEXC_ID_M_AXI_I_EXCEPTION, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_M_AXI_I_EXCEPTION );
-		#endif /* XPAR_MICROBLAZE_0_M_AXI_I_BUS_EXCEPTION*/
+		#endif /* XPAR_MICROBLAZE_M_AXI_I_BUS_EXCEPTION */
 
-		#if XPAR_MICROBLAZE_0_M_AXI_D_BUS_EXCEPTION == 1
+		#if XPAR_MICROBLAZE_M_AXI_D_BUS_EXCEPTION == 1
 			microblaze_register_exception_handler( XEXC_ID_M_AXI_D_EXCEPTION, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_M_AXI_D_EXCEPTION );
-		#endif /* XPAR_MICROBLAZE_0_M_AXI_D_BUS_EXCEPTION*/
+		#endif /* XPAR_MICROBLAZE_M_AXI_D_BUS_EXCEPTION */
 
-		#if XPAR_MICROBLAZE_0_IPLB_BUS_EXCEPTION == 1
+		#if XPAR_MICROBLAZE_IPLB_BUS_EXCEPTION == 1
 			microblaze_register_exception_handler( XEXC_ID_IPLB_EXCEPTION, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_IPLB_EXCEPTION );
-		#endif /* XPAR_MICROBLAZE_0_IPLB_BUS_EXCEPTION*/
+		#endif /* XPAR_MICROBLAZE_IPLB_BUS_EXCEPTION */
 
-		#if XPAR_MICROBLAZE_0_DPLB_BUS_EXCEPTION == 1
+		#if XPAR_MICROBLAZE_DPLB_BUS_EXCEPTION == 1
 			microblaze_register_exception_handler( XEXC_ID_DPLB_EXCEPTION, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_DPLB_EXCEPTION );
-		#endif /* XPAR_MICROBLAZE_0_DPLB_BUS_EXCEPTION*/
+		#endif /* XPAR_MICROBLAZE_DPLB_BUS_EXCEPTION */
 
-		#if XPAR_MICROBLAZE_0_DIV_ZERO_EXCEPTION == 1
+		#if XPAR_MICROBLAZE_DIV_ZERO_EXCEPTION == 1
 			microblaze_register_exception_handler( XEXC_ID_DIV_BY_ZERO, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_DIV_BY_ZERO );
-		#endif /* XPAR_MICROBLAZE_0_DIV_ZERO_EXCEPTION*/
+		#endif /* XPAR_MICROBLAZE_DIV_ZERO_EXCEPTION */
 
-		#if XPAR_MICROBLAZE_0_FPU_EXCEPTION == 1
+		#if XPAR_MICROBLAZE_FPU_EXCEPTION == 1
 			microblaze_register_exception_handler( XEXC_ID_FPU, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_FPU );
-		#endif /* XPAR_MICROBLAZE_0_FPU_EXCEPTION*/
+		#endif /* XPAR_MICROBLAZE_FPU_EXCEPTION */
 
-		#if XPAR_MICROBLAZE_0_FSL_EXCEPTION == 1
+		#if XPAR_MICROBLAZE_FSL_EXCEPTION == 1
 			microblaze_register_exception_handler( XEXC_ID_FSL, vPortExceptionHandlerEntry, ( void * ) XEXC_ID_FSL );
-		#endif /* XPAR_MICROBLAZE_0_FSL_EXCEPTION*/
+		#endif /* XPAR_MICROBLAZE_FSL_EXCEPTION */
+
+		microblaze_enable_exceptions();
 	}
 }