Update IAR version used.

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

diff --git a/Demo/ARM7_AT91SAM7S64_IAR/resource/at91SAM7S64_FLASH.icf b/Demo/ARM7_AT91SAM7S64_IAR/resource/at91SAM7S64_FLASH.icf
index def0cf0a12a56c862b92c1da400d0db71a1a7179..ad5a19e942caf9d2ad157cf6b4be0b7f40eb59b5 100644 (file)
--- a/Demo/ARM7_AT91SAM7S64_IAR/resource/at91SAM7S64_FLASH.icf
+++ b/Demo/ARM7_AT91SAM7S64_IAR/resource/at91SAM7S64_FLASH.icf
@@ -4,8 +4,8 @@
 /*-Specials-*/\r
 define symbol __ICFEDIT_intvec_start__ = 0x00000000;\r
 /*-Memory Regions-*/\r
-define symbol __ICFEDIT_region_ROM_start__ = 0x00000100;\r
-define symbol __ICFEDIT_region_ROM_end__   = 0x0000FFFF;\r
+define symbol __ICFEDIT_region_ROM_start__   = 0x100000;\r
+define symbol __ICFEDIT_region_ROM_end__     = 0x10FFFF;\r
 define symbol __ICFEDIT_region_RAM_start__ = 0x00200000;\r
 define symbol __ICFEDIT_region_RAM_end__   = 0x00203FFF;\r
 /*-Sizes-*/\r
@@ -16,27 +16,37 @@ define symbol __ICFEDIT_size_fiqstack__ = 0x4;
 define symbol __ICFEDIT_size_undstack__ = 0x4;\r
 define symbol __ICFEDIT_size_abtstack__ = 0x4;\r
 define symbol __ICFEDIT_size_heap__     = 0x4;\r
+/*-Exports-*/\r
+export symbol __ICFEDIT_region_ROM_start__;\r
+export symbol __ICFEDIT_region_ROM_end__;\r
+export symbol __ICFEDIT_region_RAM_start__;\r
+export symbol __ICFEDIT_region_RAM_end__;\r
+export symbol __ICFEDIT_size_startup__;\r
+export symbol __ICFEDIT_size_vectors__;\r
+export symbol __ICFEDIT_size_cstack__;\r
+export symbol __ICFEDIT_size_sysstack__;\r
+export symbol __ICFEDIT_size_irqstack__;\r
+export symbol __ICFEDIT_size_heap__;\r
 /**** End of ICF editor section. ###ICF###*/\r
 \r
 \r
 define memory mem with size = 4G;\r
-define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__];\r
-define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__];\r
+define region STA_region = mem:[from __ICFEDIT_region_ROM_start__ size __ICFEDIT_size_startup__];\r
+define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__+__ICFEDIT_size_startup__ to __ICFEDIT_region_ROM_end__];\r
+define region VEC_region = mem:[from __ICFEDIT_region_RAM_start__ size __ICFEDIT_size_vectors__];\r
+define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__+__ICFEDIT_size_vectors__ to __ICFEDIT_region_RAM_end__];\r
 \r
 define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };\r
-define block SVC_STACK with alignment = 8, size = __ICFEDIT_size_svcstack__ { };\r
+define block SYS_STACK with alignment = 8, size = __ICFEDIT_size_sysstack__ { };\r
 define block IRQ_STACK with alignment = 8, size = __ICFEDIT_size_irqstack__ { };\r
-define block FIQ_STACK with alignment = 8, size = __ICFEDIT_size_fiqstack__ { };\r
-define block UND_STACK with alignment = 8, size = __ICFEDIT_size_undstack__ { };\r
-define block ABT_STACK with alignment = 8, size = __ICFEDIT_size_abtstack__ { };\r
 define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };\r
 \r
 initialize by copy { readwrite };\r
+initialize by copy { section .vectors };\r
 do not initialize  { section .noinit };\r
 \r
-place at address mem:__ICFEDIT_intvec_start__    { readonly section .intvec };\r
+place in STA_region { section .cstartup };\r
+place in ROM_region { readonly };\r
+place in VEC_region { section .vectors };\r
+place in RAM_region { readwrite, block IRQ_STACK, block SYS_STACK, block CSTACK, block HEAP };\r
 \r
-place in ROM_region   { readonly };\r
-place in RAM_region   { readwrite,\r
-                        block CSTACK, block SVC_STACK, block IRQ_STACK, block FIQ_STACK,\r
-                        block UND_STACK, block ABT_STACK, block HEAP };\r

diff --git a/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd b/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd
index 0512e23af29bd967ca29c5c76c7043771a1f20cb..8bb1b273387cc86283de249d1b7d6293ff5b53c7 100644 (file)
--- a/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd
+++ b/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd
@@ -41,7 +41,7 @@
         </option>\r
         <option>\r
           <name>MemOverride</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>MemFile</name>\r

diff --git a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dbgdt b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dbgdt
index 0df6a20f1417227fcce860151569f122bbf59049..59c532593c9095a503ff5c1a1939041a719de408 100644 (file)
--- a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dbgdt
+++ b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dbgdt
@@ -15,7 +15,7 @@
         \r
         \r
       <PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><MixedMode>1</MixedMode><CodeCovEnabled>0</CodeCovEnabled><CodeCovShow>0</CodeCovShow></Disassembly>\r
-      <Debug-Log><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Build</Factory></Window></Windows></PreferedWindows></Debug-Log>\r
+      <Debug-Log><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Build</Factory></Window></Windows></PreferedWindows><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1622</ColumnWidth1></Debug-Log>\r
       <Build><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Debug-Log</Factory></Window></Windows></PreferedWindows></Build>\r
       <Register>\r
         <PreferedWindows>\r
@@ -30,7 +30,7 @@
       \r
       \r
       \r
-    <Wnd2>\r
+    <Wnd0>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-22256-14845</Identity>\r
@@ -42,20 +42,20 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-18517-20319</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-18517-20319</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\Demo\ARM7_AT91SAM7S64_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>25</YPos><SelStart>1726</SelStart><SelEnd>1726</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\Demo\ARM7_AT91SAM7S64_IAR\SrcIAR\Cstartup.s79</Filename><XPos>0</XPos><YPos>19</YPos><SelStart>1527</SelStart><SelEnd>1527</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\Demo\ARM7_AT91SAM7S64_IAR\SrcIAR\Cstartup.s</Filename><XPos>0</XPos><YPos>52</YPos><SelStart>3250</SelStart><SelEnd>3250</SelEnd></Tab><ActiveTab>2</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\Source\portable\IAR\AtmelSAM7S64\port.c</Filename><XPos>0</XPos><YPos>217</YPos><SelStart>8345</SelStart><SelEnd>8345</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_AT91SAM7S64_IAR\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>880</SelStart><SelEnd>880</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_AT91SAM7S64_IAR\SrcIAR\Cstartup.s</Filename><XPos>0</XPos><YPos>49</YPos><SelStart>3250</SelStart><SelEnd>3250</SelEnd></Tab><ActiveTab>1</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-01284260><key>iaridepm.enu1</key></Toolbar-01284260><Toolbar-070bd990><key>debuggergui.enu1</key></Toolbar-070bd990></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>278</Right><x>-2</x><y>-2</y><xscreen>0</xscreen><yscreen>0</yscreen><sizeHorzCX>0</sizeHorzCX><sizeHorzCY>0</sizeHorzCY><sizeVertCX>166667</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-00abb068><key>iaridepm.enu1</key></Toolbar-00abb068><Toolbar-04734888><key>debuggergui.enu1</key></Toolbar-04734888></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>278</Right><x>-2</x><y>-2</y><xscreen>0</xscreen><yscreen>0</yscreen><sizeHorzCX>0</sizeHorzCX><sizeHorzCY>0</sizeHorzCY><sizeVertCX>166667</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Project>\r
 \r

diff --git a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni
index 63a3b21beb2a5dfc5d7cd14796745f9cbfbed401..855e1561a14b184784ecb5c0bc383df6aaf7c543 100644 (file)
--- a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni
+++ b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni
@@ -23,6 +23,13 @@ UseTrigger=1
 TriggerName=main\r
 LimitSize=0\r
 ByteLimit=50\r
+[TraceHelper]\r
+Enabled=0\r
+ShowSource=1\r
+[DebugChecksum]\r
+Checksum=-39238073\r
+[InstructionProfiling]\r
+Enabled=_ 0\r
 [Log file]\r
 LoggingEnabled=_ 0\r
 LogFile=_ ""\r
@@ -30,9 +37,10 @@ Category=_ 0
 [TermIOLog]\r
 LoggingEnabled=_ 0\r
 LogFile=_ ""\r
-[TraceHelper]\r
+[DriverProfiling]\r
 Enabled=0\r
-ShowSource=1\r
+Source=2\r
+Graph=0\r
 [Disassemble mode]\r
 mode=0\r
 [Breakpoints]\r

diff --git a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.wsdt b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.wsdt
index ff30c649276241dbedd7750f3083c5c6c1396b76..3b8d949aed852a65aa9983e419bffdd52475afd6 100644 (file)
--- a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.wsdt
+++ b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.wsdt
@@ -28,7 +28,7 @@
     <Windows>\r
       \r
       \r
-    <Wnd0>\r
+    <Wnd2>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-17425-14382</Identity>\r
@@ -40,7 +40,7 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>\r
+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-4084-16269</Identity>\r
@@ -56,20 +56,20 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd1></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd3></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_AT91SAM7S64_IAR\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>880</SelStart><SelEnd>880</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_AT91SAM7S64_IAR\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>880</SelStart><SelEnd>880</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_AT91SAM7S64_IAR\SrcIAR\Cstartup.s</Filename><XPos>0</XPos><YPos>49</YPos><SelStart>3250</SelStart><SelEnd>3250</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_AT91SAM7S64_IAR\resource\at91SAM7S64_FLASH.icf</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>1038</SelStart><SelEnd>1045</SelEnd></Tab><ActiveTab>2</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-00abae00><key>iaridepm.enu1</key></Toolbar-00abae00></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>576</Bottom><Right>310</Right><x>-2</x><y>-2</y><xscreen>32</xscreen><yscreen>26</yscreen><sizeHorzCX>19048</sizeHorzCX><sizeHorzCY>26477</sizeHorzCY><sizeVertCX>185714</sizeVertCX><sizeVertCY>588595</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>362</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>364</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>370672</sizeHorzCY><sizeVertCX>19048</sizeVertCX><sizeVertCY>26477</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-00abb068><key>iaridepm.enu1</key></Toolbar-00abb068></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>576</Bottom><Right>310</Right><x>-2</x><y>-2</y><xscreen>32</xscreen><yscreen>26</yscreen><sizeHorzCX>19048</sizeHorzCX><sizeHorzCY>26477</sizeHorzCY><sizeVertCX>185714</sizeVertCX><sizeVertCY>588595</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>362</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>364</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>370672</sizeHorzCY><sizeVertCX>19048</sizeVertCX><sizeVertCY>26477</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r