Correct alignment issue in GCC and RVDS Cortex-A9 port that was preventing full floating point usage in interrupts (other ports will be updated likewise).

Update the Zynq demo to test the GCC Cortex-A9 port layer modification mentioned on the line above.

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

22 files changed, 78 insertions, 309 deletions

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.cproject b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.cproject
index 19e0ca50a..bbb71d801 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.cproject
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.cproject
@@ -83,6 +83,9 @@
 							<tool id="xilinx.gnu.armv7.size.debug.922806469" name="ARM v7 Print Size" superClass="xilinx.gnu.armv7.size.debug"/>

 						</toolChain>

 					</folderInfo>

+					<fileInfo id="xilinx.gnu.armv7.exe.debug.42884744.1294115727" name="printf-stdarg.c" rcbsApplicability="disable" resourcePath="src/printf-stdarg.c" toolsToInvoke="xilinx.gnu.armv7.c.toolchain.compiler.debug.2006913865.2055003215">

+						<tool id="xilinx.gnu.armv7.c.toolchain.compiler.debug.2006913865.2055003215" name="ARM v7 gcc compiler" superClass="xilinx.gnu.armv7.c.toolchain.compiler.debug.2006913865"/>

+					</fileInfo>

 					<sourceEntries>

 						<entry excluding="src/lwIP_Demo/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/fsdata.c|src/lwIP_Demo/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>

 					</sourceEntries>

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/IntQueueTimer.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/IntQueueTimer.c
index c86424a72..f6d9aba0f 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/IntQueueTimer.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/IntQueueTimer.c
@@ -224,6 +224,12 @@ uint32_t ulInterruptStatus;
 XTtcPs *pxTimer = ( XTtcPs * ) pvCallBackRef;

 BaseType_t xYieldRequired;

 

+#if( configASSERT_DEFINED == 1 )

+	/* Test floating point access within nested interrupts. */

+	volatile long double d1, d2;

+#endif

+

+

 	/* Read the interrupt status, then write it back to clear the interrupt. */

 	ulInterruptStatus = XTtcPs_GetInterruptStatus( pxTimer );

 	XTtcPs_ClearInterruptStatus( pxTimer, ulInterruptStatus );

@@ -234,11 +240,37 @@ BaseType_t xYieldRequired;
 	/* Check the device ID to know which IntQueue demo to call. */

 	if( pxTimer->Config.DeviceId == xDeviceIDs[ 0 ] )

 	{

+		#if( configASSERT_DEFINED == 1 )

+		{

+			/* Test floating point access within nested interrupts. */

+			d1 = 1.5L;

+			d2 = 5.25L;

+		}

+		#endif /* configASSERT_DEFINED */

+

 		xYieldRequired = xFirstTimerHandler();

+

+		/* Will fail eventually if flop context switch is not correct in

+		interrupts.  Keep calculation simple so the answer is exact even when

+		using flop. */

+		configASSERT( ( d1 * d2 ) == ( 1.5L * 5.25L ) );

 	}

 	else if( pxTimer->Config.DeviceId == xDeviceIDs[ 1 ] )

 	{

+		#if( configASSERT_DEFINED == 1 )

+		{

+			/* Test floating point access within nested interrupts. */

+			d1 = 10.5L;

+			d2 = 5.5L;

+		}

+		#endif /* configASSERT_DEFINED */

+

 		xYieldRequired = xSecondTimerHandler();

+

+		/* Will fail eventually if flop context switch is not correct in

+		interrupts.  Keep calculation simple so the answer is exact even when

+		using flop. */

+		configASSERT( ( d1 / d2 ) == ( 10.5L / 5.5L ) );

 	}

 	else

 	{

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/main.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/main.c
index 12935c525..44013c6c4 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/main.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/main.c
@@ -334,6 +334,23 @@ void vApplicationTickHook( void )
 

 		/* Use mutexes from interrupts. */

 		vInterruptSemaphorePeriodicTest();

+

+		/* Test flop alignment in interrupts - calling printf from an interrupt

+		is BAD! */

+		#if( configASSERT_DEFINED == 1 )

+		{

+		char cBuf[ 20 ];

+		UBaseType_t uxSavedInterruptStatus;

+

+			uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();

+			{

+				sprintf( cBuf, "%1.3f", 1.234 );

+			}

+			portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );

+

+			configASSERT( strcmp( cBuf, "1.234" ) == 0 );

+		}

+		#endif /* configASSERT_DEFINED */

 	}

 	#endif

 }

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/printf-stdarg.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/printf-stdarg.c
deleted file mode 100644
index 117519837..000000000
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/printf-stdarg.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*

-	Copyright 2001, 2002 Georges Menie (www.menie.org)

-	stdarg version contributed by Christian Ettinger

-

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU Lesser General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU Lesser General Public License for more details.

-

-    You should have received a copy of the GNU Lesser General Public License

-    along with this program; if not, write to the Free Software

-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-*/

-

-/*

-	putchar is the only external dependency for this file,

-	if you have a working putchar, leave it commented out.

-	If not, uncomment the define below and

-	replace outbyte(c) by your own function call.

-

-*/

-

-#define putchar(c) c

-

-#include <stdarg.h>

-

-static void printchar(char **str, int c)

-{

-	//extern int putchar(int c);

-	

-	if (str) {

-		**str = (char)c;

-		++(*str);

-	}

-	else

-	{ 

-		(void)putchar(c);

-	}

-}

-

-#define PAD_RIGHT 1

-#define PAD_ZERO 2

-

-static int prints(char **out, const char *string, int width, int pad)

-{

-	register int pc = 0, padchar = ' ';

-

-	if (width > 0) {

-		register int len = 0;

-		register const char *ptr;

-		for (ptr = string; *ptr; ++ptr) ++len;

-		if (len >= width) width = 0;

-		else width -= len;

-		if (pad & PAD_ZERO) padchar = '0';

-	}

-	if (!(pad & PAD_RIGHT)) {

-		for ( ; width > 0; --width) {

-			printchar (out, padchar);

-			++pc;

-		}

-	}

-	for ( ; *string ; ++string) {

-		printchar (out, *string);

-		++pc;

-	}

-	for ( ; width > 0; --width) {

-		printchar (out, padchar);

-		++pc;

-	}

-

-	return pc;

-}

-

-/* the following should be enough for 32 bit int */

-#define PRINT_BUF_LEN 12

-

-static int printi(char **out, int i, int b, int sg, int width, int pad, int letbase)

-{

-	char print_buf[PRINT_BUF_LEN];

-	register char *s;

-	register int t, neg = 0, pc = 0;

-	register unsigned int u = (unsigned int)i;

-

-	if (i == 0) {

-		print_buf[0] = '0';

-		print_buf[1] = '\0';

-		return prints (out, print_buf, width, pad);

-	}

-

-	if (sg && b == 10 && i < 0) {

-		neg = 1;

-		u = (unsigned int)-i;

-	}

-

-	s = print_buf + PRINT_BUF_LEN-1;

-	*s = '\0';

-

-	while (u) {

-		t = (unsigned int)u % b;

-		if( t >= 10 )

-			t += letbase - '0' - 10;

-		*--s = (char)(t + '0');

-		u /= b;

-	}

-

-	if (neg) {

-		if( width && (pad & PAD_ZERO) ) {

-			printchar (out, '-');

-			++pc;

-			--width;

-		}

-		else {

-			*--s = '-';

-		}

-	}

-

-	return pc + prints (out, s, width, pad);

-}

-

-static int print( char **out, const char *format, va_list args )

-{

-	register int width, pad;

-	register int pc = 0;

-	char scr[2];

-

-	for (; *format != 0; ++format) {

-		if (*format == '%') {

-			++format;

-			width = pad = 0;

-			if (*format == '\0') break;

-			if (*format == '%') goto out;

-			if (*format == '-') {

-				++format;

-				pad = PAD_RIGHT;

-			}

-			while (*format == '0') {

-				++format;

-				pad |= PAD_ZERO;

-			}

-			for ( ; *format >= '0' && *format <= '9'; ++format) {

-				width *= 10;

-				width += *format - '0';

-			}

-			if( *format == 's' ) {

-				register char *s = (char *)va_arg( args, int );

-				pc += prints (out, s?s:"(null)", width, pad);

-				continue;

-			}

-			if( *format == 'd' ) {

-				pc += printi (out, va_arg( args, int ), 10, 1, width, pad, 'a');

-				continue;

-			}

-			if( *format == 'x' ) {

-				pc += printi (out, va_arg( args, int ), 16, 0, width, pad, 'a');

-				continue;

-			}

-			if( *format == 'X' ) {

-				pc += printi (out, va_arg( args, int ), 16, 0, width, pad, 'A');

-				continue;

-			}

-			if( *format == 'u' ) {

-				pc += printi (out, va_arg( args, int ), 10, 0, width, pad, 'a');

-				continue;

-			}

-			if( *format == 'c' ) {

-				/* char are converted to int then pushed on the stack */

-				scr[0] = (char)va_arg( args, int );

-				scr[1] = '\0';

-				pc += prints (out, scr, width, pad);

-				continue;

-			}

-		}

-		else {

-		out:

-			printchar (out, *format);

-			++pc;

-		}

-	}

-	if (out) **out = '\0';

-	va_end( args );

-	return pc;

-}

-

-int printf(const char *format, ...)

-{

-        va_list args;

-        

-        va_start( args, format );

-        return print( 0, format, args );

-}

-

-int sprintf(char *out, const char *format, ...)

-{

-        va_list args;

-        

-        va_start( args, format );

-        return print( &out, format, args );

-}

-

-

-int snprintf( char *buf, unsigned int count, const char *format, ... )

-{

-        va_list args;

-        

-        ( void ) count;

-        

-        va_start( args, format );

-        return print( &buf, format, args );

-}

-

-

-#ifdef TEST_PRINTF

-int main(void)

-{

-	char *ptr = "Hello world!";

-	char *np = 0;

-	int i = 5;

-	unsigned int bs = sizeof(int)*8;

-	int mi;

-	char buf[80];

-

-	mi = (1 << (bs-1)) + 1;

-	printf("%s\n", ptr);

-	printf("printf test\n");

-	printf("%s is null pointer\n", np);

-	printf("%d = 5\n", i);

-	printf("%d = - max int\n", mi);

-	printf("char %c = 'a'\n", 'a');

-	printf("hex %x = ff\n", 0xff);

-	printf("hex %02x = 00\n", 0);

-	printf("signed %d = unsigned %u = hex %x\n", -3, -3, -3);

-	printf("%d %s(s)%", 0, "message");

-	printf("\n");

-	printf("%d %s(s) with %%\n", 0, "message");

-	sprintf(buf, "justif: \"%-10s\"\n", "left"); printf("%s", buf);

-	sprintf(buf, "justif: \"%10s\"\n", "right"); printf("%s", buf);

-	sprintf(buf, " 3: %04d zero padded\n", 3); printf("%s", buf);

-	sprintf(buf, " 3: %-4d left justif.\n", 3); printf("%s", buf);

-	sprintf(buf, " 3: %4d right justif.\n", 3); printf("%s", buf);

-	sprintf(buf, "-3: %04d zero padded\n", -3); printf("%s", buf);

-	sprintf(buf, "-3: %-4d left justif.\n", -3); printf("%s", buf);

-	sprintf(buf, "-3: %4d right justif.\n", -3); printf("%s", buf);

-

-	return 0;

-}

-

-/*

- * if you compile this file with

- *   gcc -Wall $(YOUR_C_OPTIONS) -DTEST_PRINTF -c printf.c

- * you will get a normal warning:

- *   printf.c:214: warning: spurious trailing `%' in format

- * this line is testing an invalid % at the end of the format string.

- *

- * this should display (on 32bit int machine) :

- *

- * Hello world!

- * printf test

- * (null) is null pointer

- * 5 = 5

- * -2147483647 = - max int

- * char a = 'a'

- * hex ff = ff

- * hex 00 = 00

- * signed -3 = unsigned 4294967293 = hex fffffffd

- * 0 message(s)

- * 0 message(s) with %

- * justif: "left      "

- * justif: "     right"

- *  3: 0003 zero padded

- *  3: 3    left justif.

- *  3:    3 right justif.

- * -3: -003 zero padded

- * -3: -3   left justif.

- * -3:   -3 right justif.

- */

-

-#endif

-

-

-

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/canps_v3_1/src/xcanps_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/canps_v3_1/src/xcanps_g.c
index 3691d7081..ba95a60f4 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/canps_v3_1/src/xcanps_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/canps_v3_1/src/xcanps_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/devcfg_v3_4/src/xdevcfg_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/devcfg_v3_4/src/xdevcfg_g.c
index 588d82a96..5e02d6dcd 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/devcfg_v3_4/src/xdevcfg_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/devcfg_v3_4/src/xdevcfg_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/dmaps_v2_1/src/xdmaps_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/dmaps_v2_1/src/xdmaps_g.c
index 750a31279..3529895f9 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/dmaps_v2_1/src/xdmaps_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/dmaps_v2_1/src/xdmaps_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/emacps_v3_2/src/xemacps_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/emacps_v3_2/src/xemacps_g.c
index b051fa292..201e23d8f 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/emacps_v3_2/src/xemacps_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/emacps_v3_2/src/xemacps_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/gpiops_v3_1/src/xgpiops_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/gpiops_v3_1/src/xgpiops_g.c
index a4f9ecff1..eac708037 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/gpiops_v3_1/src/xgpiops_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/gpiops_v3_1/src/xgpiops_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/iicps_v3_1/src/xiicps_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/iicps_v3_1/src/xiicps_g.c
index a93620319..1f5d00c45 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/iicps_v3_1/src/xiicps_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/iicps_v3_1/src/xiicps_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/qspips_v3_3/src/xqspips_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/qspips_v3_3/src/xqspips_g.c
index 5875fd5c1..d9453c49c 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/qspips_v3_3/src/xqspips_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/qspips_v3_3/src/xqspips_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scugic_v3_2/src/xscugic_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scugic_v3_2/src/xscugic_g.c
index 1041b1d08..50888df78 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scugic_v3_2/src/xscugic_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scugic_v3_2/src/xscugic_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scutimer_v2_1/src/xscutimer_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scutimer_v2_1/src/xscutimer_g.c
index 4c51e7999..8126d2402 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scutimer_v2_1/src/xscutimer_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scutimer_v2_1/src/xscutimer_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scuwdt_v2_1/src/xscuwdt_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scuwdt_v2_1/src/xscuwdt_g.c
index 17dc1c58a..9824a3647 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scuwdt_v2_1/src/xscuwdt_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/scuwdt_v2_1/src/xscuwdt_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/sdps_v2_7/src/xsdps_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/sdps_v2_7/src/xsdps_g.c
index 4d5b30003..caab9c3f1 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/sdps_v2_7/src/xsdps_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/sdps_v2_7/src/xsdps_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/standalone_v5_4/src/bspconfig.h b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/standalone_v5_4/src/bspconfig.h
index 4dd178f04..8671e3fbe 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/standalone_v5_4/src/bspconfig.h
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/standalone_v5_4/src/bspconfig.h
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/ttcps_v3_1/src/xttcps_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/ttcps_v3_1/src/xttcps_g.c
index 9ea62c8b7..2729f41f5 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/ttcps_v3_1/src/xttcps_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/ttcps_v3_1/src/xttcps_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/uartps_v3_1/src/xuartps_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/uartps_v3_1/src/xuartps_g.c
index f7deaf320..d0ed617c4 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/uartps_v3_1/src/xuartps_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/uartps_v3_1/src/xuartps_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/usbps_v2_3/src/xusbps_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/usbps_v2_3/src/xusbps_g.c
index a4fb0da39..a2486d88e 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/usbps_v2_3/src/xusbps_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/usbps_v2_3/src/xusbps_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/xadcps_v2_2/src/xadcps_g.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/xadcps_v2_2/src/xadcps_g.c
index 947d2c6f5..4668ee8c5 100644
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/xadcps_v2_2/src/xadcps_g.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo_bsp/ps7_cortexa9_0/libsrc/xadcps_v2_2/src/xadcps_g.c
@@ -5,7 +5,7 @@
 * Version: 

 * DO NOT EDIT.

 *

-* Copyright (C) 2010-2016 Xilinx, Inc. All Rights Reserved.*

+* Copyright (C) 2010-2017 Xilinx, Inc. All Rights Reserved.*

 *Permission is hereby granted, free of charge, to any person obtaining a copy

 *of this software and associated documentation files (the Software), to deal

 *in the Software without restriction, including without limitation the rights

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CA9/portASM.S b/FreeRTOS/Source/portable/GCC/ARM_CA9/portASM.S
index 46ff2cfcd..970bb0cac 100644
--- a/FreeRTOS/Source/portable/GCC/ARM_CA9/portASM.S
+++ b/FreeRTOS/Source/portable/GCC/ARM_CA9/portASM.S
@@ -217,16 +217,17 @@ FreeRTOS_IRQ_Handler:
 	LDR		r0, [r2]

 

 	/* Ensure bit 2 of the stack pointer is clear.  r2 holds the bit 2 value for

-	future use. */

+	future use.  _RB_ Does this ever actually need to be done provided the start

+	of the stack is 8-byte aligned? */

 	MOV		r2, sp

 	AND		r2, r2, #4

 	SUB		sp, sp, r2

 

-	/* Call the interrupt handler. */

-	PUSH	{r0-r3, lr}

+	/* Call the interrupt handler.  r4 pushed to maintain alignment. */

+	PUSH	{r0-r4, lr}

 	LDR		r1, vApplicationIRQHandlerConst

 	BLX		r1

-	POP		{r0-r3, lr}

+	POP		{r0-r4, lr}

 	ADD		sp, sp, r2

 

 	CPSID	i

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CA9/portASM.s b/FreeRTOS/Source/portable/RVDS/ARM_CA9/portASM.s
index 55091c815..7008c0ecc 100644
--- a/FreeRTOS/Source/portable/RVDS/ARM_CA9/portASM.s
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CA9/portASM.s
@@ -124,16 +124,17 @@ FreeRTOS_IRQ_Handler
 	LDR		r0, [r2]

 

 	; Ensure bit 2 of the stack pointer is clear.  r2 holds the bit 2 value for

-	; future use.

+	; future use.  _RB_ Does this ever actually need to be done provided the

+	; start of the stack is 8-byte aligned?

 	MOV		r2, sp

 	AND		r2, r2, #4

 	SUB		sp, sp, r2

 

-	; Call the interrupt handler

-	PUSH	{r0-r3, lr}

+	; Call the interrupt handler.  r4 is pushed to maintain alignment.

+	PUSH	{r0-r4, lr}

 	LDR		r1, =vApplicationIRQHandler

 	BLX		r1

-	POP		{r0-r3, lr}

+	POP		{r0-r4, lr}

 	ADD		sp, sp, r2

 

 	CPSID 	i