<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for gcc-testing (2010-05-09)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
 <font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-09 Joel Sherrill <joel.sherrilL@OARcorp.com>

        * TargetBase.cc: Not a fatal error to not find instruction.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ChangeLog.diff?r1=text&tr1=1.207&r2=text&tr2=1.208&diff_format=h">M</a></td><td width='1%'>1.208</td><td width='100%'>rtems-coverage/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/TargetBase.cc.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>rtems-coverage/TargetBase.cc</td></tr>
</table>
<pre>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ChangeLog:1.207 gcc-testing/rtems-coverage/ChangeLog:1.208
--- gcc-testing/rtems-coverage/ChangeLog:1.207  Sat May  8 09:23:50 2010
+++ gcc-testing/rtems-coverage/ChangeLog        Sun May  9 11:03:36 2010
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2010-05-09    Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+       * TargetBase.cc: Not a fatal error to not find instruction.
+
</font> 2010-05-08        Joel Sherrill <joel.sherrilL@OARcorp.com>
 
        * do_coverage: Add ON_SIMULATOR for lm32_evr. Copy all .txt and .html

<font color='#006600'>diff -u gcc-testing/rtems-coverage/TargetBase.cc:1.2 gcc-testing/rtems-coverage/TargetBase.cc:1.3
--- gcc-testing/rtems-coverage/TargetBase.cc:1.2        Thu Apr 29 14:12:31 2010
+++ gcc-testing/rtems-coverage/TargetBase.cc    Sun May  9 11:03:36 2010
</font><font color='#997700'>@@ -30,6 +30,8 @@
</font>       const char* const instruction
   )
   {
<font color='#000088'>+    std::list <std::string>::iterator i;
+
</font>     if (branchInstructions.empty()) {
       fprintf(<span style="background-color: #FF0000"> </span>
         stderr,
<font color='#997700'>@@ -38,13 +40,10 @@
</font>        exit( -1 );<span style="background-color: #FF0000">    </span>
     }
     
<font color='#880000'>-    if ( find(
-           branchInstructions.begin(),<span style="background-color: #FF0000"> </span>
-           branchInstructions.end(),<span style="background-color: #FF0000"> </span>
-           instruction<span style="background-color: #FF0000"> </span>
-        ) == branchInstructions.end()
-    )
</font><font color='#000088'>+    i = find(branchInstructions.begin(), branchInstructions.end(), instruction);
+    if ( i  == branchInstructions.end() )
</font>       return false;
<font color='#000088'>+
</font>     return true;
   }
 
<font color='#997700'>@@ -52,6 +51,7 @@
</font>     const char* const line
   )
   {
<font color='#000088'>+    #define METHOD "ERROR: TargetBase::isBranchLine - "
</font>     const char *ch;
     char instruction[120];
     int  result;
<font color='#997700'>@@ -66,9 +66,10 @@
</font>     if (*ch != '\t') {
       fprintf(<span style="background-color: #FF0000"> </span>
         stderr,
<font color='#880000'>-        "ERROR: TargetBase::isBranchLine - Unable to find instruction\n"
</font><font color='#000088'>+        METHOD "(1) Unable to find instruction in: %s\n",
+        line
</font>       );
<font color='#880000'>-      exit( -1 );<span style="background-color: #FF0000">    </span>
</font><font color='#000088'>+      return false;
</font>     }
     ch++;
 
<font color='#997700'>@@ -78,20 +79,23 @@
</font>     if (*ch != '\t') {
       fprintf(<span style="background-color: #FF0000"> </span>
         stderr,
<font color='#880000'>-        "ERROR: TargetBase::isBranchLine - Unable to find instruction\n"
</font><font color='#000088'>+        METHOD "(2) Unable to find instruction in %s\n",<span style="background-color: #FF0000"> </span>
+        line
</font>       );
<font color='#880000'>-      exit( -1 );<span style="background-color: #FF0000">    </span>
</font><font color='#000088'>+      return false;
</font>     }
     ch++;
 
<font color='#880000'>-    // Grab the instruction which is the next word in the buffer after the second tab.
</font><font color='#000088'>+    // Grab the instruction which is the next word in the buffer
+    // after the second tab.
</font>     result = sscanf( ch, "%s", instruction );
     if (result != 1) {
         fprintf(
           stderr,
<font color='#880000'>-          "ERROR: TargetBase::isBranchLine - Unable to find instruction\n"
</font><font color='#000088'>+          METHOD "(3) Unable to find instruction in %s\n",
+          line<span style="background-color: #FF0000"> </span>
</font>         );
<font color='#880000'>-        exit( -1 );
</font><font color='#000088'>+        return false;
</font>     }
 
     return isBranch( instruction );
</pre>
<p> </p>

<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>