From: richardbarry Date: Mon, 3 Jan 2011 12:06:49 +0000 (+0000) Subject: Tidy up the run time stats generation in the MSP430X IAR port. X-Git-Tag: V6.1.1~40 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=497a8bd33d26becd1e800cb4804eda72c67f212d;p=freertos Tidy up the run time stats generation in the MSP430X IAR port. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1217 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c b/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c index c0ec7be19..434348460 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c +++ b/Demo/MSP430X_MSP430F5438_IAR/RunTimeStatsConfig.c @@ -110,7 +110,8 @@ inline unsigned long ulGetRunTimeStatsTime( void ) unsigned long ulReturn; TA1CTL &= ~MC__CONTINOUS; - ulReturn = ( ( ulStatsOverflowCount << 16UL ) | ( unsigned long ) TA1R ); + ulReturn = ( ulStatsOverflowCount << 16UL ); + ulReturn |= ( unsigned long ) TA1R; TA1CTL |= MC__CONTINOUS; return ulReturn; diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt index 4ffdf65e8..502d61f09 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt +++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt @@ -26,12 +26,12 @@ 200111 - 20030010{W}Watch-0:TA1CTL4{W}Watch-0:ulSP_PC_Combined4300134139124100300Debug-Log300200100100100100100100150200110$PROJ_DIR$\TermIOInput.txt10300150150300300001001300100100100100100100 + 20030010{W}Watch-0:TA1CTL4{W}Watch-0:ulSP_PC_Combined4{W}Watch-1:ulReturn4300134139124100300Debug-Log300200100100100100100100150200110$PROJ_DIR$\TermIOInput.txt10300150150300300001001300100100100100100100 - + TabID-11539-27703 @@ -43,20 +43,20 @@ - 0TabID-22030-8386Terminal I/OTerminalIO0TabID-3586-11188MemoryMemory012500125022000007760 + 0TabID-4842-14235Debug LogDebug-Log0TabID-25774-15685Terminal I/OTerminalIO0 - TextEditor$WS_DIR$\main.c02301219712197TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\port.c011056555655TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\portext.s43012254395439TextEditor$WS_DIR$\..\Common\Minimal\GenQTest.c0497173121731230100000010000001 + TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\portext.s43013454395439TextEditor$WS_DIR$\..\..\Source\tasks.c015925073650736TextEditor$WS_DIR$\RunTimeStatsConfig.c010248314831TextEditor$WS_DIR$\main.c02361219712197TextEditor$WS_DIR$\..\..\Source\queue.c010813700937009TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\port.c017879547954TextEditor$WS_DIR$\..\Common\Minimal\GenQTest.c0497173901739060100000010000001 - iaridepm.enu1430fet1debuggergui.enu1-2-2716191-2-212115072024152749114881731161-2-2716470-2-2200200119048203666280952731161-2-21981682-2-216842001002381203666119048203666 + iaridepm.enu1430fet1debuggergui.enu1-2-2716191-2-212115072024152749114881731161-2-2716497-2-2200200119048203666297024731161-2-21981682-2-216842001002381203666119048203666 diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni index 4af8c4973..d3daa7797 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni +++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni @@ -1,5 +1,5 @@ [DebugChecksum] -Checksum=-557929919 +Checksum=1933102805 [DisAssemblyWindow] NumStates=_ 1 State 1=_ 1 @@ -39,12 +39,11 @@ LogFile=_ "" Enabled=0 [DriverProfiling] Enabled=0 -Mode=604119078 +Mode=-1827890804 Graph=0 Symbiont=0 [Breakpoints] -Bp0=_ "STD_CODE" "{$PROJ_DIR$\..\..\Source\portable\IAR\MSP430X\portext.s43}.155.1@1" 1 0 0 0 "" 0 "" -Count=1 +Count=0 [FET] Clock mode=14 Extended Clock mode=4047 diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt index 9c150f28a..9e42bed26 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt +++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt @@ -19,13 +19,13 @@ - 20121632481 + 20121632481300Debug-LogFind-in-FilesBreakpoints - 18162458082994 + 181624300BuildFind-in-FilesBreakpoints58082994300BuildDebug-LogBreakpoints300 - + TabID-18858-27566 @@ -37,30 +37,20 @@ - 0 - - - TabID-25947-27638 - Build - Build - - - TabID-5978-12679Debug LogDebug-LogTabID-22019-23227Find in FilesFind-in-Files - - 0 + 0 - TextEditor$WS_DIR$\main.c0387755775500100000010000001 + TextEditor$WS_DIR$\main.c044121971219700100000010000001 - iaridepm.enu1-2-2645309-2-2331267197024271894185119658859-2-22931682-2-216842951002381300407197024271894 + iaridepm.enu1-2-2938309-2-2331267197024271894185119957230