change log for gcc-testing (2010-05-26)

[rtems-vc at rtems.org]

 *joel*:
2010-05-26	Joel Sherrill <joel.sherrilL at OARcorp.com>

	* CoverageReaderTSIM.cc: Branch coverage works now.
	* DesiredSymbols.cc: Do not fatal on size mismatch.  Just patch it
	up and continue.

M    1.8  covoar/ChangeLog
M    1.3  covoar/CoverageReaderTSIM.cc
M    1.4  covoar/DesiredSymbols.cc

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
@@ -1,3 +1,9 @@
+2010-05-26	Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+	* CoverageReaderTSIM.cc: Branch coverage works now.
+	* DesiredSymbols.cc: Do not fatal on size mismatch.  Just patch it
+	up and continue.
+
 2010-05-26	Jennifer.Averett<Jennifer.Averett at OARcorp.com>
 
 	* DesiredSymbols.cc: added -C to addr2line system call.

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
@@ -82,17 +82,18 @@
         //
 	a = baseAddress + i;
 	aCoverageMap = executableInformation->getCoverageMap( a );
-        if (!aCoverageMap)
+        if ( !aCoverageMap )
           continue;
-        if (cover & 1) {
+        if ( cover & 0x01 ) {
           aCoverageMap->setWasExecuted( a );
           aCoverageMap->setWasExecuted( a + 1 );
           aCoverageMap->setWasExecuted( a + 2 );
           aCoverageMap->setWasExecuted( a + 3 );
-          if ( cover & 0x10 ) {
+          if ( cover & 0x08 ) {
 	    aCoverageMap->setWasTaken( a );
 	    BranchInfoAvailable = true;
-          } else if ( cover & 0x20 ) {
+          }
+          if ( cover & 0x10 ) {
 	    aCoverageMap->setWasNotTaken( a );
 	    BranchInfoAvailable = true;
           }

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
@@ -335,10 +335,16 @@
         fprintf(
           stderr,
           "ERROR: DesiredSymbols::createCoverageMap - Attempt to create "
-          "unified coverage maps for %s with different sizes\n",
-          symbolName.c_str()
+          "unified coverage maps for %s with different sizes (%d != %d)\n",
+          symbolName.c_str(),
+          itr->second.stats.sizeInBytes,
+          size
         );
-        exit( -1 );
+        if ( itr->second.stats.sizeInBytes < size )
+          itr->second.stats.sizeInBytes = size;
+        else
+          size = itr->second.stats.sizeInBytes;
+        // exit( -1 );
       }
     }
 
@@ -622,7 +628,8 @@
         "coverage map for %s because the sizes are different\n",
         symbolName.c_str()
       );
-      exit( -1 );
+      return;
+      // exit( -1 );
     }
 
     // Merge the data for each address.



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100526/f297e1cc/attachment-0001.html>