]> git.sur5r.net Git - freertos/commitdiff
Update IAR RL78 demo regtest tasks to make use of SKZ instructions as the latest...
authorrtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Mon, 10 Feb 2014 19:13:49 +0000 (19:13 +0000)
committerrtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Mon, 10 Feb 2014 19:13:49 +0000 (19:13 +0000)
git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2198 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewd
FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewp
FreeRTOS/Demo/RL78_multiple_IAR/RegTest.s87
FreeRTOS/Demo/RL78_multiple_IAR/main.c
FreeRTOS/Demo/RL78_multiple_IAR/main_blinky.c
FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.cspy.bat
FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.dbgdt
FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.dni
FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.wsdt

index 075bcab69569360c29de6eaea28ae994c07906f1..683b2a13ecde02afe334c99fdc33596df3d57ce3 100644 (file)
         </option>\r
         <option>\r
           <name>DynDriver</name>\r
-          <state>E1RL78</state>\r
+          <state>SIMRL78</state>\r
         </option>\r
         <option>\r
           <name>DebugDDFOverride</name>\r
index 15a46bd66b1e8ebd77f54eb635c46767e66c07c5..5287e37379b2c142de4ab8c71170952a77e1b66c 100644 (file)
         <option>\r
           <name>GenCodeModel</name>\r
           <version>0</version>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>GenDataModel</name>\r
           <version>0</version>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>GenNearConstLocation</name>\r
         </option>\r
         <option>\r
           <name>GenRTConfigPath</name>\r
-          <state>$TOOLKIT_DIR$\LIB\dlrl78nn2n.h</state>\r
+          <state>$TOOLKIT_DIR$\LIB\dlrl78ff2n.h</state>\r
         </option>\r
         <option>\r
           <name>GenRTLibraryPath</name>\r
-          <state>$TOOLKIT_DIR$\LIB\dlrl78nn2n.r87</state>\r
+          <state>$TOOLKIT_DIR$\LIB\dlrl78ff2n.r87</state>\r
         </option>\r
         <option>\r
           <name>GenHwSupport</name>\r
         <option>\r
           <name>AsmDefines</name>\r
           <state>YRDKRL78G14</state>\r
-          <state>__NEAR_DATA_MODEL__</state>\r
+          <state>__FAR_DATA_MODEL__</state>\r
         </option>\r
         <option>\r
           <name>AsmPreprocOutput</name>\r
         </option>\r
         <option>\r
           <name>GenLibInFormatterDescription</name>\r
-          <state>No specifier n, no float, no scan set, no assignment suppressing.</state>\r
+          <state>No specifier n, no float or long long, no scan set, no assignment suppressing.</state>\r
         </option>\r
         <option>\r
           <name>GenLibOutFormatter</name>\r
         </option>\r
         <option>\r
           <name>GenLibOutFormatterDescription</name>\r
-          <state>No specifier a or A, no specifier n, no float, no flags.</state>\r
+          <state>No specifier a or A, no specifier n, no float or long long, no flags.</state>\r
         </option>\r
         <option>\r
           <name>GenStackSize</name>\r
index 3c2bbefd15f28875454c8ffa8e6e8f056a24ea6c..d91a93d86ce98c95db4fea51dd5051a382bc0767 100644 (file)
@@ -110,7 +110,7 @@ loop1:
 \r
        ; Compare with the expected value.\r
        CMPW    AX, #0x1122\r
-       BZ              +5\r
+       SKZ\r
 \r
        ; Jump over the branch to vRegTestError() if the register contained the\r
        ; expected value - otherwise flag an error by executing vRegTestError().\r
@@ -119,19 +119,19 @@ loop1:
        ; Repeat for all the registers.\r
        MOVW    AX, BC\r
        CMPW    AX, #0x3344\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
        MOVW    AX, DE\r
        CMPW    AX, #0x5566\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
        MOVW    AX, HL\r
        CMPW    AX, #0x7788\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
        MOV             A, CS\r
        CMP             A, #0x01\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
 \r
 #if __DATA_MODEL__ == __DATA_MODEL_FAR__\r
@@ -140,7 +140,7 @@ loop1:
        ; test it when using the far model.\r
        MOV             A, ES\r
        CMP             A, #0x02\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
 \r
 #endif\r
@@ -181,30 +181,30 @@ vRegTest2Task:
 \r
 loop2:\r
        CMPW    AX, #0x99aa\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
        MOVW    AX, BC\r
        CMPW    AX, #0xbbcc\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
        MOVW    AX, DE\r
        CMPW    AX, #0xddee\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
        MOVW    AX, HL\r
        CMPW    AX, #0xff12\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
        MOV             A, CS\r
        CMP             A, #0x03\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
 \r
 #if __DATA_MODEL__ == __DATA_MODEL_FAR__\r
 \r
        MOV             A, ES\r
        CMP             A, #0x04\r
-       BZ              +5\r
+       SKZ\r
        BR              vRegTestError\r
 \r
 #endif\r
index a1ae991b1f9822bbc6a56517bcd91f727041378f..71a6c11f6262cb90281867ab4107201b73cf4db7 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd. \r
+    FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -97,7 +97,7 @@
 \r
 /* Set mainCREATE_SIMPLE_BLINKY_DEMO_ONLY to one to run the simple blinky demo,\r
 or 0 to run the more comprehensive test and demo application. */\r
-#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY     1\r
+#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY     0\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
index 847961710234763a802926d5472e801e5380325f..d96a310f4e376a7e7865463d3b9c323f47fd0353 100644 (file)
@@ -125,7 +125,14 @@ will remove items as they are added, meaning the send task should always find
 the queue empty. */\r
 #define mainQUEUE_LENGTH                                       ( 1 )\r
 \r
-\r
+/* Used to check the task parameter passing in both supported memory models. */\r
+#if __DATA_MODEL__ == __DATA_MODEL_FAR__\r
+       #define mainQUEUE_SEND_PARAMETER        ( ( void * ) 0x12345678UL )\r
+       #define mainQUEUE_RECEIVE_PARAMETER     ( ( void * ) 0x11223344UL )\r
+#else\r
+       #define mainQUEUE_SEND_PARAMETER        ( ( void * ) 0x1234U )\r
+       #define mainQUEUE_RECEIVE_PARAMETER     ( ( void * ) 0x1122U )\r
+#endif\r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
@@ -156,14 +163,14 @@ void main_blinky( void )
        {\r
                /* Start the two tasks as described in the comments at the top of this\r
                file. */\r
-               xTaskCreate( prvQueueReceiveTask,                               /* The function that implements the task. */\r
-                                       "Rx",                                                           /* The text name assigned to the task - for debug only as it is not used by the kernel. */\r
-                                       configMINIMAL_STACK_SIZE,                       /* The size of the stack to allocate to the task. */\r
-                                       NULL,                                                           /* The parameter passed to the task - not used in this case. */\r
-                                       mainQUEUE_RECEIVE_TASK_PRIORITY,        /* The priority assigned to the task. */\r
-                                       NULL );                                                         /* The task handle is not required, so NULL is passed. */\r
+               xTaskCreate( prvQueueReceiveTask,                       /* The function that implements the task. */\r
+                                       "Rx",                                                   /* The text name assigned to the task - for debug only as it is not used by the kernel. */\r
+                                       configMINIMAL_STACK_SIZE,               /* The size of the stack to allocate to the task. */\r
+                                       mainQUEUE_RECEIVE_PARAMETER,    /* The parameter passed to the task - just used to check the port in this case. */\r
+                                       mainQUEUE_RECEIVE_TASK_PRIORITY,/* The priority assigned to the task. */\r
+                                       NULL );                                                 /* The task handle is not required, so NULL is passed. */\r
 \r
-               xTaskCreate( prvQueueSendTask, "TX", configMINIMAL_STACK_SIZE, NULL, mainQUEUE_SEND_TASK_PRIORITY, NULL );\r
+               xTaskCreate( prvQueueSendTask, "TX", configMINIMAL_STACK_SIZE, mainQUEUE_SEND_PARAMETER, mainQUEUE_SEND_TASK_PRIORITY, NULL );\r
 \r
                /* Start the tasks and timer running. */\r
                vTaskStartScheduler();\r
@@ -183,8 +190,8 @@ static void prvQueueSendTask( void *pvParameters )
 portTickType xNextWakeTime;\r
 const unsigned long ulValueToSend = 100UL;\r
 \r
-       /* Remove compiler warning about unused parameter. */\r
-       ( void ) pvParameters;\r
+       /* Check the parameter was passed in correctly. */\r
+       configASSERT( pvParameters == mainQUEUE_SEND_PARAMETER )\r
 \r
        /* Initialise xNextWakeTime - this only needs to be done once. */\r
        xNextWakeTime = xTaskGetTickCount();\r
@@ -208,8 +215,8 @@ static void prvQueueReceiveTask( void *pvParameters )
 unsigned long ulReceivedValue;\r
 const unsigned long ulExpectedValue = 100UL;\r
 \r
-       /* Remove compiler warning about unused parameter. */\r
-       ( void ) pvParameters;\r
+       /* Check the parameter was passed in correctly. */\r
+       configASSERT( pvParameters == mainQUEUE_RECEIVE_PARAMETER )\r
 \r
        for( ;; )\r
        {\r
index b8700e73e6a922fc30e078da63a7c758f30367a7..3ee2603b8a75ee2236c029a9a377482317e52358 100644 (file)
@@ -19,6 +19,6 @@
 @REM \r
 \r
 \r
-"C:\devtools\IAR Systems\Embedded Workbench 6.5\common\bin\cspybat" "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\bin\rl78proc.dll" "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\bin\rl78sim.dll"  %1 --plugin "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\bin\rl78bat.dll" --backend -B "--core" "rl78_2" "--near_const_location" "rom0" "--near_const_start" "0xf3000" "--near_const_size" "27.75" "-p" "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\config\debugger\ior5f104pj.ddf" "-d" "sim\r
+"C:\devtools\IAR Systems\Embedded Workbench 6.5\common\bin\cspybat" "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\bin\rl78proc.dll" "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\bin\rl78ocd.dll"  %1 --plugin "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\bin\rl78bat.dll" --backend -B "--core" "rl78_1" "--near_const_location" "rom0" "--near_const_start" "0xf2000" "--near_const_size" "24.00" "-p" "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\config\debugger\ior5f10jgc.ddf" "-d" "e1\r
 \r
 \r
index dd2d9e0ae58bfb76d8be3dad7d15ded592278ed7..b39ab7d0788c77676f3213349393be94a6acddaa 100644 (file)
         \r
         \r
       <PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><MixedMode>1</MixedMode><CodeCovShow>1</CodeCovShow><InstrProfShow>1</InstrProfShow><col-names><item>Disassembly</item><item>_I0</item></col-names><col-widths><item>500</item><item>20</item></col-widths><DisasmHistory/><ShowCodeCoverage>0</ShowCodeCoverage><ShowInstrProfiling>0</ShowInstrProfiling></Disassembly>\r
-    <STACK2><PreferedWindows><Position>1</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></STACK2><Register><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></Register><WATCH_1><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><expressions><item/></expressions><col-names><item>Expression</item><item>Location</item><item>Type</item><item>Value</item></col-names><col-widths><item>100</item><item>150</item><item>100</item><item>100</item></col-widths></WATCH_1><CallStack><PreferedWindows><Position>1</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><col-names><item>Frame</item><item>_I0</item></col-names><col-widths><item>400</item><item>20</item></col-widths></CallStack></Static>\r
+    <STACK2><PreferedWindows><Position>1</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></STACK2><Register><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></Register><WATCH_1><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><expressions><item/></expressions><col-names><item>Expression</item><item>Location</item><item>Type</item><item>Value</item></col-names><col-widths><item>100</item><item>150</item><item>100</item><item>100</item></col-widths></WATCH_1><CallStack><PreferedWindows><Position>1</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><col-names><item>Frame</item><item>_I0</item></col-names><col-widths><item>400</item><item>20</item></col-widths></CallStack><Breakpoints><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><col-names><item>Breakpoint</item><item>_I0</item></col-names><col-widths><item>500</item><item>35</item></col-widths></Breakpoints></Static>\r
     <Windows>\r
       \r
       \r
       \r
-    <Wnd2>\r
+    <Wnd1>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-30626-17561</Identity>\r
@@ -47,7 +47,7 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>\r
+      <SelectedTab>0</SelectedTab></Wnd1><Wnd4>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-8606-17564</Identity>\r
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd3></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd4><Wnd0><Tabs><Tab><Identity>TabID-27686-8718</Identity><TabName>Register</TabName><Factory>Register</Factory><Session><REG1>0</REG1><REG2>0</REG2><Group>0</Group><States>0</States></Session></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd0></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>146</YPos2><SelStart2>7550</SelStart2><SelEnd2>7550</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\demo_specific_io.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>64</YPos2><SelStart2>4262</SelStart2><SelEnd2>4262</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\RL78\portmacro.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>143</YPos2><SelStart2>7699</SelStart2><SelEnd2>7699</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>107</YPos2><SelStart2>7005</SelStart2><SelEnd2>7005</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\RL78\port.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>77</YPos2><SelStart2>5879</SelStart2><SelEnd2>6150</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\tasks.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>479</YPos2><SelStart2>23830</SelStart2><SelEnd2>23830</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main_blinky.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>77</YPos2><SelStart2>5290</SelStart2><SelEnd2>5290</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\queue.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>270</YPos2><SelStart2>12681</SelStart2><SelEnd2>12681</SelEnd2></Tab><ActiveTab>7</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\timers.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>640</YPos2><SelStart2>25872</SelStart2><SelEnd2>25872</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Common\Minimal\dynamic.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>182</YPos2><SelStart2>10489</SelStart2><SelEnd2>10489</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Common\Minimal\PollQ.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>133</YPos2><SelStart2>7366</SelStart2><SelEnd2>7366</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Common\Minimal\blocktim.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>124</YPos2><SelStart2>6743</SelStart2><SelEnd2>6743</SelEnd2></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>$WS_DIR$\main_blinky.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>65</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main_full.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>350</YPos2><SelStart2>16865</SelStart2><SelEnd2>16865</SelEnd2></Tab><ActiveTab>1</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>138</YPos2><SelStart2>6877</SelStart2><SelEnd2>6877</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\RegTest.s87</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>166</YPos2><SelStart2>6215</SelStart2><SelEnd2>6215</SelEnd2></Tab></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-01349048><key>iaridepm.enu1</key></Toolbar-01349048></Sizes></Row0><Row1><Sizes><Toolbar-09538940><key>debuggergui.enu1</key></Toolbar-09538940></Sizes></Row1></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>638</Bottom><Right>228</Right><x>-2</x><y>-2</y><xscreen>9</xscreen><yscreen>8</yscreen><sizeHorzCX>5357</sizeHorzCX><sizeHorzCY>8147</sizeHorzCY><sizeVertCX>136905</sizeVertCX><sizeVertCY>651731</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>276</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>278</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>283096</sizeHorzCY><sizeVertCX>5357</sizeVertCX><sizeVertCY>8147</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-0134bb18><key>iaridepm.enu1</key></Toolbar-0134bb18></Sizes></Row0><Row1><Sizes><Toolbar-0590ef58><key>debuggergui.enu1</key></Toolbar-0590ef58></Sizes></Row1><Row2><Sizes><Toolbar-0593fba0><key>rl78ocd.enu1</key></Toolbar-0593fba0></Sizes></Row2></Top><Left><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>614</Bottom><Right>228</Right><x>-2</x><y>-2</y><xscreen>9</xscreen><yscreen>8</yscreen><sizeHorzCX>5357</sizeHorzCX><sizeHorzCY>8147</sizeHorzCY><sizeVertCX>136905</sizeVertCX><sizeVertCY>627291</sizeVertCY></Rect></Wnd4></Sizes></Row0></Left><Right><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>614</Bottom><Right>428</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>255952</sizeVertCX><sizeVertCY>627291</sizeVertCY></Rect></Wnd0></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>276</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>278</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>283096</sizeHorzCY><sizeVertCX>5357</sizeVertCX><sizeVertCY>8147</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Project>\r
 \r
index 11e5a37ba878654423f6785447ebdbff39bf5065..71e7362edc7496843aa7d9a127fe8b5d4e687168 100644 (file)
@@ -1,5 +1,5 @@
 [DebugChecksum]\r
-Checksum=-1618849359\r
+Checksum=-225007159\r
 [DisAssemblyWindow]\r
 NumStates=_ 1\r
 State 1=_ 1\r
@@ -8,10 +8,10 @@ Enabled=_ 0
 [CodeCoverage]\r
 Enabled=_ 0\r
 [E1]\r
-Map0=0,0,65535,65536\r
-Map1=1,1044224,1048319,4096\r
+Map0=0,0,32767,32768\r
+Map1=1,1042688,1048319,5632\r
 MapEntries=2\r
-HWsettings=2,0,1,2,4,0,1,0,17,17,0\r
+HWsettings=2,0,1,2,4,0,1,0,16,1,0\r
 HWsettingsCube=2,4294967295,2,4294967295,0,1,0,0\r
 HWsettingsRsuid=00000000000000000000\r
 EventEntries=0\r
@@ -59,7 +59,7 @@ TraceSettings=128,0,0,0,0,0,8192
 TimerSettings=0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r
 CoverSettings=1048192,1048207,0\r
 Version=1,trace.txt\r
-LastDevFile=DR5F10ELE.DVF\r
+LastDevFile=DR5F10JGC.DVF\r
 EmulType=64\r
 BreakToggle=0\r
 EventLimits=0,1,1,0,0,0,1\r
@@ -147,31 +147,6 @@ ByteLimit=50
 ShowArgs=0\r
 [Disassembly]\r
 MixedMode=1\r
-[DataSample]\r
-LogEnabled=0\r
-GraphEnabled=0\r
-ShowTimeLog=1\r
-ShowTimeSum=1\r
-[TraceHelper]\r
-Enabled=0\r
-ShowSource=1\r
-[Log file]\r
-LoggingEnabled=_ 0\r
-LogFile=_ ""\r
-Category=_ 0\r
-[TermIOLog]\r
-LoggingEnabled=_ 0\r
-LogFile=_ ""\r
-[CallStackLog]\r
-Enabled=0\r
-[DriverProfiling]\r
-Enabled=0\r
-Mode=1\r
-Graph=0\r
-Symbiont=0\r
-Exclusions=\r
-[Breakpoints]\r
-Count=0\r
 [InterruptLog]\r
 LogEnabled=0\r
 SumEnabled=0\r
@@ -186,7 +161,8 @@ GraphEnabled=0
 ShowTimeLog=1\r
 ShowTimeSum=1\r
 [Breakpoints2]\r
-Count=0\r
+Bp0=_ 0 "STD_CODE2" "{$PROJ_DIR$\RegTest.s87}.172.1" 0 0 1 "" 0 ""\r
+Count=1\r
 [Interrupts]\r
 Enabled=1\r
 [MemoryMap]\r
@@ -196,10 +172,35 @@ UseAuto=0
 TypeViolation=1\r
 UnspecRange=1\r
 ActionState=1\r
+[Trace1]\r
+Enabled=0\r
+ShowSource=1\r
+[DataSample]\r
+LogEnabled=0\r
+GraphEnabled=0\r
+ShowTimeLog=1\r
+ShowTimeSum=1\r
+[Log file]\r
+LoggingEnabled=_ 0\r
+LogFile=_ ""\r
+Category=_ 0\r
+[TermIOLog]\r
+LoggingEnabled=_ 0\r
+LogFile=_ ""\r
+[TraceHelper]\r
+Enabled=0\r
+ShowSource=1\r
+[CallStackLog]\r
+Enabled=0\r
+[DriverProfiling]\r
+Enabled=0\r
+Mode=0\r
+Graph=0\r
+Symbiont=0\r
+Exclusions=\r
+[Breakpoints]\r
+Count=0\r
 [Aliases]\r
 A0=_ "C:\Data\RL78_STICK\FreeRTOSV6.1.1\Source\portable\IAR\RL78\portasm.s87" "E:\Data\RL78_STICK\FreeRTOSV6.1.1\Source\portable\IAR\RL78\portasm.s87"\r
 Count=1\r
 SuppressDialog=1\r
-[Trace1]\r
-Enabled=0\r
-ShowSource=1\r
index 11b5d39ec0d87368511cc26146b73b3bd9785ab1..20cf23e7d8ee154494584508d261a6e8f04d841d 100644 (file)
@@ -3,7 +3,7 @@
 <Workspace>\r
   <ConfigDictionary>\r
     \r
-  <CurrentConfigs><Project>RTOSDemo/YRDKRL78G14</Project></CurrentConfigs></ConfigDictionary>\r
+  <CurrentConfigs><Project>RTOSDemo/RSKRL78G1C</Project></CurrentConfigs></ConfigDictionary>\r
   <Desktop>\r
     <Static>\r
       <Workspace>\r
           \r
           \r
           \r
-        <Column0>263</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
+        <Column0>369</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
       </Workspace>\r
     <Build><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>684</ColumnWidth1><ColumnWidth2>182</ColumnWidth2><ColumnWidth3>45</ColumnWidth3></Build><TerminalIO/><Debug-Log><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1218</ColumnWidth1></Debug-Log><Disassembly><MixedMode>1</MixedMode><CodeCovShow>1</CodeCovShow><InstrProfShow>1</InstrProfShow></Disassembly><Find-in-Files><ColumnWidth0>439</ColumnWidth0><ColumnWidth1>62</ColumnWidth1><ColumnWidth2>753</ColumnWidth2></Find-in-Files><Select-Ambiguous-Definitions><ColumnWidth0>580</ColumnWidth0><ColumnWidth1>82</ColumnWidth1><ColumnWidth2>994</ColumnWidth2></Select-Ambiguous-Definitions></Static>\r
     <Windows>\r
       \r
-    <Wnd2>\r
+    <Wnd0>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-25565-17041</Identity>\r
             <Factory>Workspace</Factory>\r
             <Session>\r
               \r
-            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Demo Source</ExpandedNode></NodeDict></Session>\r
+            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode></NodeDict></Session>\r
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-4654-17433</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-7454-1824</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab><Tab><Identity>TabID-32199-1847</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-16124-30648</Identity><TabName>Ambiguous Definitions</TabName><Factory>Select-Ambiguous-Definitions</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-4654-17433</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-7454-1824</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab><Tab><Identity>TabID-32199-1847</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-16124-30648</Identity><TabName>Ambiguous Definitions</TabName><Factory>Select-Ambiguous-Definitions</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>72</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></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>$WS_DIR$\main_blinky.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>65</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main_full.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>63</YPos2><SelStart2>16865</SelStart2><SelEnd2>16865</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>60</YPos2><SelStart2>6877</SelStart2><SelEnd2>6877</SelEnd2></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-01349048><key>iaridepm.enu1</key></Toolbar-01349048></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>749</Bottom><Right>337</Right><x>-2</x><y>-2</y><xscreen>9625</xscreen><yscreen>6151</yscreen><sizeHorzCX>5729167</sizeHorzCX><sizeHorzCY>6263747</sizeHorzCY><sizeVertCX>201786</sizeVertCX><sizeVertCY>764766</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>189</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>191</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>194501</sizeHorzCY><sizeVertCX>7519643</sizeVertCX><sizeVertCY>7952138</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-0134bb18><key>iaridepm.enu1</key></Toolbar-0134bb18></Sizes></Row0><Row1><Sizes/></Row1><Row2><Sizes/></Row2><Row3><Sizes/></Row3><Row4><Sizes/></Row4><Row5><Sizes/></Row5><Row6><Sizes/></Row6></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>505</Bottom><Right>443</Right><x>-2</x><y>-2</y><xscreen>12633</xscreen><yscreen>8252</yscreen><sizeHorzCX>7519643</sizeHorzCX><sizeHorzCY>8403259</sizeHorzCY><sizeVertCX>264881</sizeVertCX><sizeVertCY>516293</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>433</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>435</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>442974</sizeHorzCY><sizeVertCX>9869643</sizeVertCX><sizeVertCY>10668024</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r