From 6aa07ed9193eea5f6abba4fd3b56e9a3cebc7bfb Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Fri, 6 Apr 2012 18:33:50 +0000
Subject: [PATCH] Tasking XMC4500 demo now running.

---
 .../.cproject                                 | 40 +------------------
 .../portable/Tasking/ARM_CM4F/port_asm.asm    | 11 +++--
 2 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/.cproject b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/.cproject
index b6ac9518c4..a33848e391 100644
--- a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/.cproject
+++ b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/.cproject
@@ -46,7 +46,7 @@
 									<listOptionValue builtIn="false" value="163"/>
 								</option>
 								<option id="com.tasking.arm.lk.optimize.deleteUnreferencedSections.135265458" name="Delete unreferenced sections" superClass="com.tasking.arm.lk.optimize.deleteUnreferencedSections" value="true" valueType="boolean"/>
-								<option id="com.tasking.arm.lk.misc.longBranchVeneers.1174777913" superClass="com.tasking.arm.lk.misc.longBranchVeneers" value="true" valueType="boolean"/>
+								<option id="com.tasking.arm.lk.misc.longBranchVeneers.1174777913" name="Generate long-branch veneers" superClass="com.tasking.arm.lk.misc.longBranchVeneers" value="false" valueType="boolean"/>
 								<inputType id="com.tasking.arm.lkObjInputType.747815267" name="OBJ" superClass="com.tasking.arm.lkObjInputType"/>
 								<inputType id="com.tasking.arm.lkLibInputType.124974190" name="LIB" superClass="com.tasking.arm.lkLibInputType"/>
 							</tool>
@@ -56,47 +56,9 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 			<storageModule moduleId="com.tasking.toolInfo">
-				<toolInfo>TASKING VX-toolset for ARM Cortex: object linker v4.2r1 Build 135 SN 00521976</toolInfo>
-				<toolInfo>TASKING VX-toolset for ARM Cortex: control program v4.2r1 Build 118</toolInfo>
 				<toolInfo>TASKING program builder v4.2r1 Build 063</toolInfo>
 			</storageModule>
 		</cconfiguration>
-		<cconfiguration id="com.tasking.config.arm.abs.release.1347721718">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.tasking.config.arm.abs.release.1347721718" moduleId="org.eclipse.cdt.core.settings" name="Release">
-				<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.release.1347721718" name="Release" parent="com.tasking.config.arm.abs.release">
-					<folderInfo id="com.tasking.config.arm.abs.release.1347721718." name="/" resourcePath="">
-						<toolChain id="com.tasking.arm.abs.release.2133027783" name="TASKING VX-toolset for ARM" superClass="com.tasking.arm.abs.release">
-							<option id="com.tasking.arm.pluginVersion.994174085" name="Plugin version" superClass="com.tasking.arm.pluginVersion" value="1.77.0.0" valueType="string"/>
-							<option id="com.tasking.arm.prodDir.1630657737" name="Product directory:" superClass="com.tasking.arm.prodDir" value="${eclipse_home}/.." valueType="string"/>
-							<option id="com.tasking.arm.cpu.1056159152" 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.release.1749952775" name="Release" osList="" superClass="com.tasking.arm.platform.abs.release"/>
-							<builder buildPath="${workspace_loc:/RTOSDemo/Release}" id="com.tasking.arm.builder.abs.debug.2137153010" 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.release.383959121" name="C/C++ Compiler" superClass="com.tasking.arm.cc.abs.release">
-								<option id="com.tasking.arm.cc.pr36858.670618578" name="workaround for PR36858" superClass="com.tasking.arm.cc.pr36858" value="true" valueType="string"/>
-								<inputType id="com.tasking.arm.cppInputType.720200138" name="C++" superClass="com.tasking.arm.cppInputType"/>
-								<inputType id="com.tasking.arm.cpp.cInputType.611109353" name="C" superClass="com.tasking.arm.cpp.cInputType"/>
-								<inputType id="com.tasking.arm.cc.msInputType.1616585102" name="MS" superClass="com.tasking.arm.cc.msInputType"/>
-							</tool>
-							<tool id="com.tasking.arm.as.abs.release.1673229833" name="Assembler" superClass="com.tasking.arm.as.abs.release">
-								<inputType id="com.tasking.arm.asmInputType.202362186" name="ASM" superClass="com.tasking.arm.asmInputType"/>
-							</tool>
-							<tool id="com.tasking.arm.lk.abs.release.1443574651" name="Linker" superClass="com.tasking.arm.lk.abs.release">
-								<inputType id="com.tasking.arm.lkObjInputType.356912570" name="OBJ" superClass="com.tasking.arm.lkObjInputType"/>
-								<inputType id="com.tasking.arm.lkLibInputType.1089169346" name="LIB" superClass="com.tasking.arm.lkLibInputType"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</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/FreeRTOS_Source/portable/Tasking/ARM_CM4F/port_asm.asm b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/FreeRTOS_Source/portable/Tasking/ARM_CM4F/port_asm.asm
index e5ece8e870..3f9dd6de7f 100644
--- a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/FreeRTOS_Source/portable/Tasking/ARM_CM4F/port_asm.asm
+++ b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/FreeRTOS_Source/portable/Tasking/ARM_CM4F/port_asm.asm
@@ -69,7 +69,7 @@ PendSV_Handler: .type func
 	mrs r0, psp
 
 	;Get the location of the current TCB.
-	ldr	r3, =pxCurrentTCB
+	ldr.w	r3, =pxCurrentTCB
 	ldr	r2, [r3]
 
 	;Is the task using the FPU context?  If so, push high vfp registers.
@@ -84,8 +84,7 @@ PendSV_Handler: .type func
 	str r0, [r2]
 
 	stmdb sp!, {r3, r14}
-	ldr r0, ulMaxSyscallInterruptPriorityConst
-	ldr r0, [r0]
+	ldr.w r0, =ulMaxSyscallInterruptPriorityConst
 	msr basepri, r0
 	bl vTaskSwitchContext
 	mov r0, #0
@@ -117,7 +116,7 @@ PendSV_Handler: .type func
 	.align 4
 SVC_Handler: .type func
 	;Get the location of the current TCB.
-	ldr	r3, =pxCurrentTCB
+	ldr.w	r3, =pxCurrentTCB
 	ldr r1, [r3]
 	ldr r0, [r1]
 	;Pop the core registers.
@@ -136,7 +135,7 @@ SVC_Handler: .type func
 	.align 4
 vPortStartFirstTask .type func
 	;Use the NVIC offset register to locate the stack.
-	ldr r0, =0xE000ED08
+	ldr.w r0, =0xE000ED08
 	ldr r0, [r0]
 	ldr r0, [r0]
 	;Set the msp back to the start of the stack.
@@ -154,7 +153,7 @@ vPortStartFirstTask .type func
 	.align 4
 vPortEnableVFP .type func
 	;The FPU enable bits are in the CPACR.
-	ldr r0, =0xE000ED88
+	ldr.w r0, =0xE000ED88
 	ldr	r1, [r0]
 
 	;Enable CP10 and CP11 coprocessors, then save back.