aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-01-08 16:45:56 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-01-08 16:45:56 +0000
commit52c033d27e37a0726604a7e4f69f6d1469a9d25f (patch)
treeaea0beaf4c9d094dd2cbba90c9d3f2db0c8c2dc1
parent55173b29da939690453db807764de31bb9e667a8 (diff)
downloadChibiOS-52c033d27e37a0726604a7e4f69f6d1469a9d25f.tar.gz
ChibiOS-52c033d27e37a0726604a7e4f69f6d1469a9d25f.tar.bz2
ChibiOS-52c033d27e37a0726604a7e4f69f6d1469a9d25f.zip
Cortex-M0 RCTV port.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2619 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--demos/ARMCM0-LPC1114-LPCXPRESSO/keil/ch.uvopt274
-rw-r--r--docs/reports/LPC1114-48-RVCT.txt162
-rw-r--r--docs/reports/LPC1114-48.txt2
-rw-r--r--docs/reports/LPC1343-72-IAR.txt2
-rw-r--r--docs/reports/LPC1343-72-RVCT.txt2
-rw-r--r--os/ports/IAR/ARMCMx/chcoreasm_v6m.s8
-rw-r--r--os/ports/RVCT/ARMCMx/chcoreasm_v6m.s2
7 files changed, 307 insertions, 145 deletions
diff --git a/demos/ARMCM0-LPC1114-LPCXPRESSO/keil/ch.uvopt b/demos/ARMCM0-LPC1114-LPCXPRESSO/keil/ch.uvopt
index ad6bc133e..0d1c92fbf 100644
--- a/demos/ARMCM0-LPC1114-LPCXPRESSO/keil/ch.uvopt
+++ b/demos/ARMCM0-LPC1114-LPCXPRESSO/keil/ch.uvopt
@@ -189,7 +189,7 @@
<aSer4>0</aSer4>
<StkLoc>0</StkLoc>
<TrcWin>0</TrcWin>
- <newCpu>1</newCpu>
+ <newCpu>0</newCpu>
<uProt>0</uProt>
</DebugFlag>
<LintExecutable></LintExecutable>
@@ -204,7 +204,7 @@
<cbSel>0</cbSel>
<File>
<GroupNumber>1</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>1</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -218,7 +218,7 @@
</File>
<File>
<GroupNumber>1</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>2</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -245,19 +245,19 @@
<Focus>0</Focus>
<ColumnNumber>26</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>61</TopLine>
- <CurrentLine>76</CurrentLine>
+ <TopLine>0</TopLine>
+ <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\os\ports\RVCT\ARMCMx\cstartup.s</PathWithFileName>
<FilenameWithoutPath>cstartup.s</FilenameWithoutPath>
</File>
<File>
<GroupNumber>2</GroupNumber>
- <FileNumber>5</FileNumber>
+ <FileNumber>4</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>0</ColumnNumber>
+ <ColumnNumber>1</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -267,7 +267,7 @@
</File>
<File>
<GroupNumber>2</GroupNumber>
- <FileNumber>7</FileNumber>
+ <FileNumber>5</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -281,7 +281,7 @@
</File>
<File>
<GroupNumber>2</GroupNumber>
- <FileNumber>8</FileNumber>
+ <FileNumber>6</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -295,7 +295,7 @@
</File>
<File>
<GroupNumber>2</GroupNumber>
- <FileNumber>10</FileNumber>
+ <FileNumber>7</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -309,7 +309,7 @@
</File>
<File>
<GroupNumber>2</GroupNumber>
- <FileNumber>11</FileNumber>
+ <FileNumber>8</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -323,11 +323,11 @@
</File>
<File>
<GroupNumber>2</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>9</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>0</ColumnNumber>
+ <ColumnNumber>3</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -337,35 +337,35 @@
</File>
<File>
<GroupNumber>2</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>10</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>221</TopLine>
- <CurrentLine>251</CurrentLine>
+ <TopLine>0</TopLine>
+ <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\os\ports\RVCT\ARMCMx\chcore_v6m.h</PathWithFileName>
<FilenameWithoutPath>chcore_v6m.h</FilenameWithoutPath>
</File>
<File>
<GroupNumber>2</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>11</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>19</ColumnNumber>
+ <ColumnNumber>32</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>101</TopLine>
- <CurrentLine>127</CurrentLine>
+ <TopLine>0</TopLine>
+ <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\os\ports\RVCT\ARMCMx\chcoreasm_v6m.s</PathWithFileName>
<FilenameWithoutPath>chcoreasm_v6m.s</FilenameWithoutPath>
</File>
<File>
<GroupNumber>2</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>12</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -379,11 +379,11 @@
</File>
<File>
<GroupNumber>2</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>13</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>0</ColumnNumber>
+ <ColumnNumber>37</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -400,7 +400,7 @@
<cbSel>0</cbSel>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>13</FileNumber>
+ <FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -414,7 +414,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>14</FileNumber>
+ <FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -428,7 +428,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>15</FileNumber>
+ <FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -442,7 +442,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>16</FileNumber>
+ <FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -456,7 +456,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>17</FileNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -470,7 +470,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>18</FileNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -484,7 +484,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>19</FileNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -498,7 +498,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>20</FileNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -512,7 +512,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>21</FileNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -526,7 +526,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>22</FileNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -540,7 +540,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>23</FileNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -554,7 +554,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>24</FileNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -568,7 +568,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>25</FileNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -582,11 +582,11 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>26</FileNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>11</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -596,7 +596,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>27</FileNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -610,11 +610,11 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>28</FileNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>21</ColumnNumber>
+ <ColumnNumber>30</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -624,7 +624,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -638,7 +638,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -652,7 +652,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -666,7 +666,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -680,7 +680,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -694,7 +694,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -708,7 +708,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -722,7 +722,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -736,7 +736,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -750,7 +750,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -764,7 +764,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -778,7 +778,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -792,7 +792,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -806,7 +806,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -820,7 +820,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -834,7 +834,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -848,7 +848,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -862,7 +862,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -876,7 +876,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>47</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -890,7 +890,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>49</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -904,7 +904,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>50</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -918,7 +918,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>50</FileNumber>
+ <FileNumber>51</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -932,7 +932,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>52</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -946,7 +946,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>53</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -960,7 +960,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -974,7 +974,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -995,11 +995,11 @@
<cbSel>0</cbSel>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>13</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -1009,11 +1009,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>68</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -1023,7 +1023,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1037,11 +1037,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>58</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -1051,7 +1051,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1065,11 +1065,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>1</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -1079,7 +1079,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1093,11 +1093,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>56</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -1107,11 +1107,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>32</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -1121,7 +1121,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1135,7 +1135,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1149,7 +1149,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>66</FileNumber>
+ <FileNumber>67</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1163,7 +1163,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>67</FileNumber>
+ <FileNumber>68</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1177,7 +1177,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>68</FileNumber>
+ <FileNumber>69</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1191,7 +1191,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>69</FileNumber>
+ <FileNumber>70</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1205,7 +1205,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>70</FileNumber>
+ <FileNumber>71</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1219,7 +1219,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>71</FileNumber>
+ <FileNumber>72</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1233,11 +1233,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>72</FileNumber>
+ <FileNumber>73</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>55</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine>
<CurrentLine>0</CurrentLine>
@@ -1247,7 +1247,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>73</FileNumber>
+ <FileNumber>74</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1261,7 +1261,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>74</FileNumber>
+ <FileNumber>75</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1275,7 +1275,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>75</FileNumber>
+ <FileNumber>76</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1289,7 +1289,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>76</FileNumber>
+ <FileNumber>77</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1303,7 +1303,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>77</FileNumber>
+ <FileNumber>78</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1324,7 +1324,7 @@
<cbSel>0</cbSel>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>79</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1338,7 +1338,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>80</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1352,7 +1352,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>81</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1366,7 +1366,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>82</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1380,7 +1380,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>83</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1394,7 +1394,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>84</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1408,7 +1408,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>85</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1422,7 +1422,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>86</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1436,7 +1436,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>87</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1450,7 +1450,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>88</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1464,7 +1464,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>0</FileNumber>
+ <FileNumber>89</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1485,7 +1485,7 @@
<cbSel>0</cbSel>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>89</FileNumber>
+ <FileNumber>90</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1499,7 +1499,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>90</FileNumber>
+ <FileNumber>91</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1513,7 +1513,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>91</FileNumber>
+ <FileNumber>92</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1527,7 +1527,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>92</FileNumber>
+ <FileNumber>93</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1541,7 +1541,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>93</FileNumber>
+ <FileNumber>94</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1555,7 +1555,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>94</FileNumber>
+ <FileNumber>95</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1569,7 +1569,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>95</FileNumber>
+ <FileNumber>96</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1583,7 +1583,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>96</FileNumber>
+ <FileNumber>97</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1597,7 +1597,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>97</FileNumber>
+ <FileNumber>98</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1611,7 +1611,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>98</FileNumber>
+ <FileNumber>99</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1625,7 +1625,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>99</FileNumber>
+ <FileNumber>100</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1639,7 +1639,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>100</FileNumber>
+ <FileNumber>101</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1653,7 +1653,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>101</FileNumber>
+ <FileNumber>102</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1667,7 +1667,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>102</FileNumber>
+ <FileNumber>103</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1681,7 +1681,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>103</FileNumber>
+ <FileNumber>104</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1695,7 +1695,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>104</FileNumber>
+ <FileNumber>105</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1709,7 +1709,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>105</FileNumber>
+ <FileNumber>106</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1723,7 +1723,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>106</FileNumber>
+ <FileNumber>107</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1737,7 +1737,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>107</FileNumber>
+ <FileNumber>108</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1751,7 +1751,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>108</FileNumber>
+ <FileNumber>109</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1765,7 +1765,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>109</FileNumber>
+ <FileNumber>110</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1779,7 +1779,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>110</FileNumber>
+ <FileNumber>111</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1793,7 +1793,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>111</FileNumber>
+ <FileNumber>112</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1807,7 +1807,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>112</FileNumber>
+ <FileNumber>113</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1823,12 +1823,12 @@
<Group>
<GroupName>demo</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>113</FileNumber>
+ <FileNumber>114</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1842,7 +1842,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>114</FileNumber>
+ <FileNumber>115</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1856,7 +1856,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>115</FileNumber>
+ <FileNumber>116</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1870,7 +1870,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>116</FileNumber>
+ <FileNumber>117</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
diff --git a/docs/reports/LPC1114-48-RVCT.txt b/docs/reports/LPC1114-48-RVCT.txt
new file mode 100644
index 000000000..17df988de
--- /dev/null
+++ b/docs/reports/LPC1114-48-RVCT.txt
@@ -0,0 +1,162 @@
+***************************************************************************
+Options: -O3 -Otime --apcs=interwork
+Settings: CLK=48, (2 wait states)
+Compiler: RealView C/C++ Compiler V4.1.0.561 [Evaluation].
+***************************************************************************
+
+*** ChibiOS/RT test suite
+***
+*** Kernel: 2.1.7unstable
+*** Architecture: ARMv6-M
+*** Core Variant: Cortex-M0
+*** Platform: LPC11xx
+*** Test Board: Embedded Artists LPCXpresso Base Board + LPC1114
+
+----------------------------------------------------------------------------
+--- Test Case 1.1 (Threads, enqueuing test #1)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 1.2 (Threads, enqueuing test #2)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 1.3 (Threads, priority change)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 1.4 (Threads, delays)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 2.1 (Semaphores, enqueuing)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 2.2 (Semaphores, timeout)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 2.3 (Semaphores, atomic signal-wait)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 2.4 (Binary Semaphores, functionality)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 3.1 (Mutexes, priority enqueuing test)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 3.2 (Mutexes, priority inheritance, simple case)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 3.3 (Mutexes, priority inheritance, complex case)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 3.4 (Mutexes, priority return)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 3.5 (Mutexes, status)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 3.6 (CondVar, signal test)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 3.7 (CondVar, broadcast test)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 3.8 (CondVar, boost test)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 4.1 (Messages, loop)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 5.1 (Mailboxes, queuing and timeouts)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 6.1 (Events, registration and dispatch)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 6.2 (Events, wait and broadcast)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 6.3 (Events, timeouts)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 7.1 (Heap, allocation and fragmentation test)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 8.1 (Memory Pools, queue/dequeue)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 9.1 (Dynamic APIs, threads creation from heap)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 9.2 (Dynamic APIs, threads creation from memory pool)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 9.3 (Dynamic APIs, registry and references)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 10.1 (Queues, input queues)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 10.2 (Queues, output queues)
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.1 (Benchmark, messages #1)
+--- Score : 116826 msgs/S, 233652 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.2 (Benchmark, messages #2)
+--- Score : 100172 msgs/S, 200344 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.3 (Benchmark, messages #3)
+--- Score : 99754 msgs/S, 199508 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.4 (Benchmark, context switch)
+--- Score : 377360 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.5 (Benchmark, threads, full cycle)
+--- Score : 79506 threads/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.6 (Benchmark, threads, create only)
+--- Score : 112694 threads/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.7 (Benchmark, mass reschedule, 5 threads)
+--- Score : 33626 reschedules/S, 201756 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.8 (Benchmark, round robin context switching)
+--- Score : 246616 ctxswc/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.9 (Benchmark, I/O Queues throughput)
+--- Score : 261068 bytes/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.10 (Benchmark, virtual timers set/reset)
+--- Score : 301424 timers/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.11 (Benchmark, semaphores wait/signal)
+--- Score : 614472 wait+signal/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.12 (Benchmark, mutexes lock/unlock)
+--- Score : 382980 lock+unlock/S
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+--- Test Case 11.13 (Benchmark, RAM footprint)
+--- System: 360 bytes
+--- Thread: 68 bytes
+--- Timer : 20 bytes
+--- Semaph: 12 bytes
+--- EventS: 4 bytes
+--- EventL: 12 bytes
+--- Mutex : 16 bytes
+--- CondV.: 8 bytes
+--- Queue : 32 bytes
+--- MailB.: 40 bytes
+--- Result: SUCCESS
+----------------------------------------------------------------------------
+
+Final result: SUCCESS
diff --git a/docs/reports/LPC1114-48.txt b/docs/reports/LPC1114-48.txt
index 1f2bccf50..78f27a01c 100644
--- a/docs/reports/LPC1114-48.txt
+++ b/docs/reports/LPC1114-48.txt
@@ -1,6 +1,6 @@
***************************************************************************
Options: -O2 -fomit-frame-pointer -mabi=apcs-gnu
-Settings: CLK=48, (3 wait states)
+Settings: CLK=48, (2 wait states)
***************************************************************************
*** ChibiOS/RT test suite
diff --git a/docs/reports/LPC1343-72-IAR.txt b/docs/reports/LPC1343-72-IAR.txt
index 28f540ce9..3b0b45d03 100644
--- a/docs/reports/LPC1343-72-IAR.txt
+++ b/docs/reports/LPC1343-72-IAR.txt
@@ -1,6 +1,6 @@
***************************************************************************
Options: -Ohs
-Settings: SYSCLK=24, ACR=0x10 (no wait states)
+Settings: CLK=72, (3 wait states)
Compiler: IAR C/C++ Compiler for ARM 6.10.1.32143
***************************************************************************
diff --git a/docs/reports/LPC1343-72-RVCT.txt b/docs/reports/LPC1343-72-RVCT.txt
index 66c41be00..6edf4f2b5 100644
--- a/docs/reports/LPC1343-72-RVCT.txt
+++ b/docs/reports/LPC1343-72-RVCT.txt
@@ -1,6 +1,6 @@
***************************************************************************
Options: -O3 -Otime --apcs=interwork
-Settings: SYSCLK=72, ACR=0x12 (2 wait states)
+Settings: CLK=72, (3 wait states)
Compiler: RealView C/C++ Compiler V4.1.0.561 [Evaluation].
***************************************************************************
diff --git a/os/ports/IAR/ARMCMx/chcoreasm_v6m.s b/os/ports/IAR/ARMCMx/chcoreasm_v6m.s
index 5f0887960..07d89e6b5 100644
--- a/os/ports/IAR/ARMCMx/chcoreasm_v6m.s
+++ b/os/ports/IAR/ARMCMx/chcoreasm_v6m.s
@@ -111,20 +111,20 @@ _port_irq_epilogue:
subs r3, r3, #1
str r3, [r2]
cmp r3, #0
- beq .L34
+ beq skipexit
+notrequired
cpsie i
pop {r4, pc}
-.L34:
+skipexit
bl chSchIsRescRequiredExI
cmp r0, #0
- beq .L31
+ beq notrequired
mrs r1, PSP
ldr r2, =_port_saved_pc
ldr r3, [r1, #24]
str r3, [r2]
ldr r3, =_port_switch_from_isr
str r3, [r1, #24]
-.L31:
pop {r4, pc}
END
diff --git a/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s b/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s
index e813d7eca..8f348f099 100644
--- a/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s
+++ b/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s
@@ -110,6 +110,7 @@ _port_irq_epilogue PROC
str r3, [r2]
cmp r3, #0
beq skipexit
+notrequired
cpsie i
pop {r4, pc}
skipexit
@@ -122,7 +123,6 @@ skipexit
str r3, [r2]
ldr r3, =_port_switch_from_isr
str r3, [r1, #24]
-notrequired
pop {r4, pc}
nop
ENDP