<!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-26)</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-26 Joel Sherrill <joel.sherrilL@OARcorp.com>

        * CoverageReaderTSIM.cc: Branch coverage works now.
        * DesiredSymbols.cc: Do not fatal on size mismatch.  Just patch it
        up and continue.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/covoar/ChangeLog.diff?r1=text&tr1=1.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</td><td width='100%'>covoar/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/covoar/CoverageReaderTSIM.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%'>covoar/CoverageReaderTSIM.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/covoar/DesiredSymbols.cc.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</td><td width='100%'>covoar/DesiredSymbols.cc</td></tr>
</table>
<pre>
<font color='#006600'>diff -u gcc-testing/covoar/ChangeLog:1.7 gcc-testing/covoar/ChangeLog:1.8
--- gcc-testing/covoar/ChangeLog:1.7    Wed May 26 07:41:11 2010
+++ gcc-testing/covoar/ChangeLog        Wed May 26 18:19:52 2010
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2010-05-26    Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+       * CoverageReaderTSIM.cc: Branch coverage works now.
+       * DesiredSymbols.cc: Do not fatal on size mismatch.  Just patch it
+       up and continue.
+
</font> 2010-05-26        Jennifer.Averett<Jennifer.Averett@OARcorp.com>
 
        * DesiredSymbols.cc: added -C to addr2line system call.

<font color='#006600'>diff -u gcc-testing/covoar/CoverageReaderTSIM.cc:1.2 gcc-testing/covoar/CoverageReaderTSIM.cc:1.3
--- gcc-testing/covoar/CoverageReaderTSIM.cc:1.2        Mon May 24 15:10:31 2010
+++ gcc-testing/covoar/CoverageReaderTSIM.cc    Wed May 26 18:19:52 2010
</font><font color='#997700'>@@ -82,17 +82,18 @@
</font>         //
        a = baseAddress + i;
        aCoverageMap = executableInformation->getCoverageMap( a );
<font color='#880000'>-        if (!aCoverageMap)
</font><font color='#000088'>+        if ( !aCoverageMap )
</font>           continue;
<font color='#880000'>-        if (cover & 1) {
</font><font color='#000088'>+        if ( cover & 0x01 ) {
</font>           aCoverageMap->setWasExecuted( a );
           aCoverageMap->setWasExecuted( a + 1 );
           aCoverageMap->setWasExecuted( a + 2 );
           aCoverageMap->setWasExecuted( a + 3 );
<font color='#880000'>-          if ( cover & 0x10 ) {
</font><font color='#000088'>+          if ( cover & 0x08 ) {
</font>       aCoverageMap->setWasTaken( a );
            BranchInfoAvailable = true;
<font color='#880000'>-          } else if ( cover & 0x20 ) {
</font><font color='#000088'>+          }
+          if ( cover & 0x10 ) {
</font>       aCoverageMap->setWasNotTaken( a );
            BranchInfoAvailable = true;
           }

<font color='#006600'>diff -u gcc-testing/covoar/DesiredSymbols.cc:1.3 gcc-testing/covoar/DesiredSymbols.cc:1.4
--- gcc-testing/covoar/DesiredSymbols.cc:1.3    Wed May 26 07:41:13 2010
+++ gcc-testing/covoar/DesiredSymbols.cc        Wed May 26 18:19:52 2010
</font><font color='#997700'>@@ -335,10 +335,16 @@
</font>         fprintf(
           stderr,
           "ERROR: DesiredSymbols::createCoverageMap - Attempt to create "
<font color='#880000'>-          "unified coverage maps for %s with different sizes\n",
-          symbolName.c_str()
</font><font color='#000088'>+          "unified coverage maps for %s with different sizes (%d != %d)\n",
+          symbolName.c_str(),
+          itr->second.stats.sizeInBytes,
+          size
</font>         );
<font color='#880000'>-        exit( -1 );
</font><font color='#000088'>+        if ( itr->second.stats.sizeInBytes < size )
+          itr->second.stats.sizeInBytes = size;
+        else
+          size = itr->second.stats.sizeInBytes;
+        // exit( -1 );
</font>       }
     }
 
<font color='#997700'>@@ -622,7 +628,8 @@
</font>         "coverage map for %s because the sizes are different\n",
         symbolName.c_str()
       );
<font color='#880000'>-      exit( -1 );
</font><font color='#000088'>+      return;
+      // exit( -1 );
</font>     }
 
     // Merge the data for each address.
</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>