From 381f4017f874754a066c108f107de3a5ab57891d Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Fri, 6 Apr 2012 19:47:30 +0000
Subject: [PATCH] Created and tested optimised build configuration for the
 XMC4500 demo.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1727 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 .../.cproject                                 | 56 +++++++++++++++++++
 .../FreeRTOSConfig.h                          |  2 +-
 .../main.c                                    | 10 +++-
 .../main_blinky.c                             |  5 +-
 .../main_full.c                               |  5 +-
 5 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/.cproject b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/.cproject
index a33848e39..5494c28cb 100644
--- a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/.cproject
+++ b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/.cproject
@@ -59,6 +59,62 @@
 				<toolInfo>TASKING program builder v4.2r1 Build 063</toolInfo>
 			</storageModule>
 		</cconfiguration>
+		<cconfiguration id="com.tasking.config.arm.abs.debug.1826238485.654381753">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.tasking.config.arm.abs.debug.1826238485.654381753" moduleId="org.eclipse.cdt.core.settings" name="Optimised">
+				<externalSettings/>
+				<extensions>
+					<extension id="com.tasking.managedbuilder.TASKING_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="com.tasking.managedbuilder.TskRegexErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="abs" artifactName="RTOSDemo" buildArtefactType="com.tasking.arm.buildArtefactType.elf" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=com.tasking.arm.buildArtefactType.elf" cleanCommand="&quot;${PRODDIR}/bin/rm&quot; -rf" description="" id="com.tasking.config.arm.abs.debug.1826238485.654381753" name="Optimised" parent="com.tasking.config.arm.abs.debug">
+					<folderInfo id="com.tasking.config.arm.abs.debug.1826238485.654381753." name="/" resourcePath="">
+						<toolChain id="com.tasking.arm.abs.debug.88571467" name="TASKING VX-toolset for ARM" superClass="com.tasking.arm.abs.debug">
+							<option id="com.tasking.arm.pluginVersion.2020974908" name="Plugin version" superClass="com.tasking.arm.pluginVersion" value="1.77.0.0" valueType="string"/>
+							<option id="com.tasking.arm.prodDir.543770190" name="Product directory:" superClass="com.tasking.arm.prodDir" value="${eclipse_home}/.." valueType="string"/>
+							<option id="com.tasking.arm.cpu.407790444" name="Processor:" superClass="com.tasking.arm.cpu" value="xmc4500x1024" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="com.tasking.managedbuilder.TASKING_ELF" id="com.tasking.arm.platform.abs.debug.1538796444" name="Debug" osList="" superClass="com.tasking.arm.platform.abs.debug"/>
+							<builder buildPath="${workspace_loc:/RTOSDemo/Debug}" id="com.tasking.arm.builder.abs.debug.362325101" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="TASKING ARM Makefile generator" parallelBuildOn="true" parallelizationNumber="-1" superClass="com.tasking.arm.builder.abs.debug"/>
+							<tool id="com.tasking.arm.cc.abs.debug.2020315503" name="C/C++ Compiler" superClass="com.tasking.arm.cc.abs.debug">
+								<option id="com.tasking.arm.cc.pr36858.710990228" name="workaround for PR36858" superClass="com.tasking.arm.cc.pr36858" value="true" valueType="string"/>
+								<option id="com.tasking.arm.cc.includePaths.179492897" name="Include paths" superClass="com.tasking.arm.cc.includePaths" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;C:\E\Dev\FreeRTOS\WorkingCopy\Demo\CORTEX_M4F_Infineon_XMC4500_Tasking\FreeRTOS_Source\include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;C:\E\Dev\FreeRTOS\WorkingCopy\Demo\CORTEX_M4F_Infineon_XMC4500_Tasking\FreeRTOS_Source\portable\Tasking\ARM_CM4F&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;C:\E\Dev\FreeRTOS\WorkingCopy\Demo\CORTEX_M4F_Infineon_XMC4500_Tasking&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;C:\E\Dev\FreeRTOS\WorkingCopy\Demo\CORTEX_M4F_Infineon_XMC4500_Tasking\src\Common_Demo_Source\include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;C:\E\Dev\FreeRTOS\WorkingCopy\Demo\CORTEX_M4F_Infineon_XMC4500_Tasking\Common_Demo_Source\include&quot;"/>
+								</option>
+								<option id="com.tasking.arm.cc.optimize.1645610939" name="Optimization level:" superClass="com.tasking.arm.cc.optimize" value="com.tasking.arm.cc.optimize.3" valueType="enumerated"/>
+								<option id="com.tasking.arm.cc.globalTypeChecking.651396284" name="Perform global type checking on C code" superClass="com.tasking.arm.cc.globalTypeChecking" value="false" valueType="boolean"/>
+								<inputType id="com.tasking.arm.cppInputType.480346809" name="C++" superClass="com.tasking.arm.cppInputType"/>
+								<inputType id="com.tasking.arm.cpp.cInputType.1700855572" name="C" superClass="com.tasking.arm.cpp.cInputType"/>
+								<inputType id="com.tasking.arm.cc.msInputType.2058110844" name="MS" superClass="com.tasking.arm.cc.msInputType"/>
+							</tool>
+							<tool id="com.tasking.arm.as.abs.debug.946900032" name="Assembler" superClass="com.tasking.arm.as.abs.debug">
+								<option id="com.tasking.arm.as.nowarning.596975067" name="Suppress warnings" superClass="com.tasking.arm.as.nowarning" valueType="stringList"/>
+								<option id="com.tasking.arm.as.symbolScopeGlobal.979702489" name="Set default symbol scope to global" superClass="com.tasking.arm.as.symbolScopeGlobal" value="false" valueType="boolean"/>
+								<option id="com.tasking.arm.as.emitLocals.equ.1925547304" name="Emit local EQU symbols" superClass="com.tasking.arm.as.emitLocals.equ" value="false" valueType="boolean"/>
+								<inputType id="com.tasking.arm.asmInputType.307080549" name="ASM" superClass="com.tasking.arm.asmInputType"/>
+							</tool>
+							<tool id="com.tasking.arm.lk.abs.debug.694435973" name="Linker" superClass="com.tasking.arm.lk.abs.debug">
+								<option id="com.tasking.arm.lk.nowarning.460535977" name="Suppress warnings" superClass="com.tasking.arm.lk.nowarning" valueType="stringList">
+									<listOptionValue builtIn="false" value="163"/>
+								</option>
+								<option id="com.tasking.arm.lk.optimize.deleteUnreferencedSections.646779268" name="Delete unreferenced sections" superClass="com.tasking.arm.lk.optimize.deleteUnreferencedSections" value="true" valueType="boolean"/>
+								<option id="com.tasking.arm.lk.misc.longBranchVeneers.1482188034" name="Generate long-branch veneers" superClass="com.tasking.arm.lk.misc.longBranchVeneers" value="false" valueType="boolean"/>
+								<inputType id="com.tasking.arm.lkObjInputType.543385366" name="OBJ" superClass="com.tasking.arm.lkObjInputType"/>
+								<inputType id="com.tasking.arm.lkLibInputType.787930413" name="LIB" superClass="com.tasking.arm.lkLibInputType"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+			<storageModule moduleId="com.tasking.toolInfo">
+				<toolInfo>TASKING program builder v4.2r1 Build 063</toolInfo>
+			</storageModule>
+		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="RTOSDemo.com.tasking.arm.target.abs.112448275" name="TASKING ARM Application" projectType="com.tasking.arm.target.abs"/>
diff --git a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/FreeRTOSConfig.h b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/FreeRTOSConfig.h
index 4c1d32df8..bc8fcf3c0 100644
--- a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/FreeRTOSConfig.h
+++ b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/FreeRTOSConfig.h
@@ -137,7 +137,7 @@ to all Cortex-M ports, and do not rely on any particular library functions. */
 	
 /* Normal assert() semantics without relying on the provision of an assert.h
 header file. */
-#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); }	
+#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ) __asm volatile( "NOP" ); }
 	
 #endif /* FREERTOS_CONFIG_H */
 
diff --git a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main.c b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main.c
index d443e5a6a..859ccb8f7 100644
--- a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main.c
+++ b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main.c
@@ -154,7 +154,10 @@ void vApplicationMallocFailedHook( void )
 	to query the size of free heap space that remains (although it does not
 	provide information on how the remaining heap might be fragmented). */
 	taskDISABLE_INTERRUPTS();
-	for( ;; );
+	for( ;; )
+	{
+		__asm volatile( "NOP" );
+	};
 }
 /*-----------------------------------------------------------*/
 
@@ -181,7 +184,10 @@ void vApplicationStackOverflowHook( xTaskHandle pxTask, signed char *pcTaskName
 	configCHECK_FOR_STACK_OVERFLOW is defined to 1 or 2.  This hook
 	function is called if a stack overflow is detected. */
 	taskDISABLE_INTERRUPTS();
-	for( ;; );
+	for( ;; )
+	{
+		__asm volatile( "NOP" );
+	}
 }
 /*-----------------------------------------------------------*/
 
diff --git a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main_blinky.c b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main_blinky.c
index be344d5e9..b107a4c76 100644
--- a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main_blinky.c
+++ b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main_blinky.c
@@ -174,7 +174,10 @@ void main_blinky( void )
 	there was insufficient FreeRTOS heap memory available for the idle and/or
 	timer tasks	to be created.  See the memory management section on the
 	FreeRTOS web site for more details. */
-	for( ;; );
+	for( ;; )
+	{
+		__asm volatile( "NOP" );
+	}
 }
 /*-----------------------------------------------------------*/
 
diff --git a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main_full.c b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main_full.c
index cc188f440..dedd84c25 100644
--- a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main_full.c
+++ b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/main_full.c
@@ -215,7 +215,10 @@ xTimerHandle xCheckTimer = NULL;
 	insufficient FreeRTOS heap memory available for the idle and/or timer tasks
 	to be created.  See the memory management section on the FreeRTOS web site
 	for more details. */
-	for( ;; );	
+	for( ;; )
+	{
+		__asm volatile( "NOP" );
+	}
 }
 /*-----------------------------------------------------------*/
 
-- 
2.39.5