Tasking XMC4500 demo now running.

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

diff --git a/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/.cproject b/Demo/CORTEX_M4F_Infineon_XMC4500_Tasking/.cproject
index b6ac9518c45bd8b090063ce4b2e3151ea8d56fc1..a33848e39173dd43c5e5332f517b715137da3efe 100644 (file)
--- 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"/>\r
                                                                </option>\r
                                                                <option id="com.tasking.arm.lk.optimize.deleteUnreferencedSections.135265458" name="Delete unreferenced sections" superClass="com.tasking.arm.lk.optimize.deleteUnreferencedSections" value="true" valueType="boolean"/>\r
-                                                               <option id="com.tasking.arm.lk.misc.longBranchVeneers.1174777913" superClass="com.tasking.arm.lk.misc.longBranchVeneers" value="true" valueType="boolean"/>\r
+                                                               <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"/>\r
                                                                <inputType id="com.tasking.arm.lkObjInputType.747815267" name="OBJ" superClass="com.tasking.arm.lkObjInputType"/>\r
                                                                <inputType id="com.tasking.arm.lkLibInputType.124974190" name="LIB" superClass="com.tasking.arm.lkLibInputType"/>\r
                                                        </tool>\r
@@ -56,47 +56,9 @@
                        </storageModule>\r
                        <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
                        <storageModule moduleId="com.tasking.toolInfo">\r
-                               <toolInfo>TASKING VX-toolset for ARM Cortex: object linker v4.2r1 Build 135 SN 00521976</toolInfo>\r
-                               <toolInfo>TASKING VX-toolset for ARM Cortex: control program v4.2r1 Build 118</toolInfo>\r
                                <toolInfo>TASKING program builder v4.2r1 Build 063</toolInfo>\r
                        </storageModule>\r
                </cconfiguration>\r
-               <cconfiguration id="com.tasking.config.arm.abs.release.1347721718">\r
-                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.tasking.config.arm.abs.release.1347721718" moduleId="org.eclipse.cdt.core.settings" name="Release">\r
-                               <externalSettings/>\r
-                               <extensions>\r
-                                       <extension id="com.tasking.managedbuilder.TASKING_ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
-                                       <extension id="com.tasking.managedbuilder.TskRegexErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>\r
-                               </extensions>\r
-                       </storageModule>\r
-                       <storageModule moduleId="cdtBuildSystem" version="4.0.0">\r
-                               <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">\r
-                                       <folderInfo id="com.tasking.config.arm.abs.release.1347721718." name="/" resourcePath="">\r
-                                               <toolChain id="com.tasking.arm.abs.release.2133027783" name="TASKING VX-toolset for ARM" superClass="com.tasking.arm.abs.release">\r
-                                                       <option id="com.tasking.arm.pluginVersion.994174085" name="Plugin version" superClass="com.tasking.arm.pluginVersion" value="1.77.0.0" valueType="string"/>\r
-                                                       <option id="com.tasking.arm.prodDir.1630657737" name="Product directory:" superClass="com.tasking.arm.prodDir" value="${eclipse_home}/.." valueType="string"/>\r
-                                                       <option id="com.tasking.arm.cpu.1056159152" name="Processor:" superClass="com.tasking.arm.cpu" value="xmc4500x1024" valueType="string"/>\r
-                                                       <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"/>\r
-                                                       <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"/>\r
-                                                       <tool id="com.tasking.arm.cc.abs.release.383959121" name="C/C++ Compiler" superClass="com.tasking.arm.cc.abs.release">\r
-                                                               <option id="com.tasking.arm.cc.pr36858.670618578" name="workaround for PR36858" superClass="com.tasking.arm.cc.pr36858" value="true" valueType="string"/>\r
-                                                               <inputType id="com.tasking.arm.cppInputType.720200138" name="C++" superClass="com.tasking.arm.cppInputType"/>\r
-                                                               <inputType id="com.tasking.arm.cpp.cInputType.611109353" name="C" superClass="com.tasking.arm.cpp.cInputType"/>\r
-                                                               <inputType id="com.tasking.arm.cc.msInputType.1616585102" name="MS" superClass="com.tasking.arm.cc.msInputType"/>\r
-                                                       </tool>\r
-                                                       <tool id="com.tasking.arm.as.abs.release.1673229833" name="Assembler" superClass="com.tasking.arm.as.abs.release">\r
-                                                               <inputType id="com.tasking.arm.asmInputType.202362186" name="ASM" superClass="com.tasking.arm.asmInputType"/>\r
-                                                       </tool>\r
-                                                       <tool id="com.tasking.arm.lk.abs.release.1443574651" name="Linker" superClass="com.tasking.arm.lk.abs.release">\r
-                                                               <inputType id="com.tasking.arm.lkObjInputType.356912570" name="OBJ" superClass="com.tasking.arm.lkObjInputType"/>\r
-                                                               <inputType id="com.tasking.arm.lkLibInputType.1089169346" name="LIB" superClass="com.tasking.arm.lkLibInputType"/>\r
-                                                       </tool>\r
-                                               </toolChain>\r
-                                       </folderInfo>\r
-                               </configuration>\r
-                       </storageModule>\r
-                       <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
-               </cconfiguration>\r
        </storageModule>\r
        <storageModule moduleId="cdtBuildSystem" version="4.0.0">\r
                <project id="RTOSDemo.com.tasking.arm.target.abs.112448275" name="TASKING ARM Application" projectType="com.tasking.arm.target.abs"/>\r

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 e5ece8e87019d5d4402d3581dd747722bd55b233..3f9dd6de7fcac18e8c148affe3d09518a8364d78 100644 (file)
--- 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\r
 \r
        ;Get the location of the current TCB.\r
-       ldr     r3, =pxCurrentTCB\r
+       ldr.w   r3, =pxCurrentTCB\r
        ldr     r2, [r3]\r
 \r
        ;Is the task using the FPU context?  If so, push high vfp registers.\r
@@ -84,8 +84,7 @@ PendSV_Handler: .type func
        str r0, [r2]\r
 \r
        stmdb sp!, {r3, r14}\r
-       ldr r0, ulMaxSyscallInterruptPriorityConst\r
-       ldr r0, [r0]\r
+       ldr.w r0, =ulMaxSyscallInterruptPriorityConst\r
        msr basepri, r0\r
        bl vTaskSwitchContext\r
        mov r0, #0\r
@@ -117,7 +116,7 @@ PendSV_Handler: .type func
        .align 4\r
 SVC_Handler: .type func\r
        ;Get the location of the current TCB.\r
-       ldr     r3, =pxCurrentTCB\r
+       ldr.w   r3, =pxCurrentTCB\r
        ldr r1, [r3]\r
        ldr r0, [r1]\r
        ;Pop the core registers.\r
@@ -136,7 +135,7 @@ SVC_Handler: .type func
        .align 4\r
 vPortStartFirstTask .type func\r
        ;Use the NVIC offset register to locate the stack.\r
-       ldr r0, =0xE000ED08\r
+       ldr.w r0, =0xE000ED08\r
        ldr r0, [r0]\r
        ldr r0, [r0]\r
        ;Set the msp back to the start of the stack.\r
@@ -154,7 +153,7 @@ vPortStartFirstTask .type func
        .align 4\r
 vPortEnableVFP .type func\r
        ;The FPU enable bits are in the CPACR.\r
-       ldr r0, =0xE000ED88\r
+       ldr.w r0, =0xE000ED88\r
        ldr     r1, [r0]\r
 \r
        ;Enable CP10 and CP11 coprocessors, then save back.\r