<!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-13)</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>jennifer</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-13 Jennifer Averett <Jennifer.Averett@OARcorp.com

        * DesiredSymbols.cc, DesiredSymbols.h, covoar.cc: Added a statistics
        class to consilidate statistical information. Note, that all new
        values are still 0 and are not yet calculated.
</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.248&r2=text&tr2=1.249&diff_format=h">M</a></td><td width='1%'>1.249</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/DesiredSymbols.h.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>rtems-coverage/DesiredSymbols.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/DesiredSymbols.cc.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>rtems-coverage/DesiredSymbols.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/covoar.cc.diff?r1=text&tr1=1.23&r2=text&tr2=1.24&diff_format=h">M</a></td><td width='1%'>1.24</td><td width='100%'>rtems-coverage/covoar.cc</td></tr>
</table>
<pre>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ChangeLog:1.248 gcc-testing/rtems-coverage/ChangeLog:1.249
--- gcc-testing/rtems-coverage/ChangeLog:1.248  Thu May 13 10:57:42 2010
+++ gcc-testing/rtems-coverage/ChangeLog        Thu May 13 12:36:16 2010
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2010-05-13    Jennifer Averett <Jennifer.Averett@OARcorp.com
+
+       * DesiredSymbols.cc, DesiredSymbols.h, covoar.cc: Added a statistics
+       class to consilidate statistical information. Note, that all new
+       values are still 0 and are not yet calculated.
+
</font> 2010-05-13        Joel Sherrill <joel.sherrilL@OARcorp.com>
 
        * do_coverage: Provide capability to only analyze one configuration.

<font color='#006600'>diff -u gcc-testing/rtems-coverage/DesiredSymbols.h:1.4 gcc-testing/rtems-coverage/DesiredSymbols.h:1.5
--- gcc-testing/rtems-coverage/DesiredSymbols.h:1.4     Thu May 13 10:01:07 2010
+++ gcc-testing/rtems-coverage/DesiredSymbols.h Thu May 13 12:36:17 2010
</font><font color='#997700'>@@ -22,6 +22,90 @@
</font> 
 namespace Coverage {
 
<font color='#000088'>+
+  /*! @class Stats
+   *<span style="background-color: #FF0000"> </span>
+   *  This class defines the statistics that are tracked.
+   */
+  class Statistics {
+    public:
+
+    /*!
+     *  This member variable contains the total number of branches always
+     *  taken.
+     */
+    int branchesAlwaysTaken;
+
+    /*!
+     *  This member variable contains the total number of branches found.
+     */
+    int branchesFound;
+
+    /*!
+     *  This member variable contains the total number of branches never
+     *  taken.
+     */
+    int branchesNeverTaken;
+
+    /*!
+     *  This member contains the size in Bytes.
+     */
+    uint32_t sizeInBytes;
+<span style="background-color: #FF0000">    </span>
+    /*!
+     *  This member contains the size in Bytes.
+     */
+    uint32_t sizeInInstructions;
+
+    /*!
+     *  This member variable contains the total number of uncovered bytes.
+     */
+    int uncoveredBytes;
+
+    /*!
+     *  This member variable contains the total number of uncovered assembly
+     *  instructions.
+     */
+    int uncoveredInstructions;
+
+    /*!
+     *  This member variable contains the total number of uncovered ranges.
+     */
+    int uncoveredRanges;
+
+    /*!
+     *  This method returns the percentage of uncovered instructions.
+     *
+     *  @return Returns the percent uncovered instructions
+     */
+    uint32_t getPercentUncoveredInstructions( void ) const;
+
+    /*!
+     *  This method returns the percentage of uncovered bytes.
+     *
+     *  @return Returns the percent uncovered bytes
+     */
+     uint32_t getPercentUncoveredBytes( void ) const;
+
+    /*!
+     *  This method constructs a Statistics instance.
+     */<span style="background-color: #FF0000">   </span>
+     Statistics():
+       branchesAlwaysTaken(0),
+       branchesFound(0),
+       branchesNeverTaken(0),
+       sizeInBytes(0),
+       sizeInInstructions(0),
+       uncoveredBytes(0),
+       uncoveredInstructions(0),
+       uncoveredRanges(0)
+     {
+     }
+
+
+<span style="background-color: #FF0000">      </span>
+  };
+
</font>   /*! @class SymbolInformation
    *
    *  This class defines the information kept for each symbol that is
<font color='#997700'>@@ -36,10 +120,6 @@
</font>      */
     uint32_t baseAddress;
 
<font color='#880000'>-    /*!
-     *  This member contains the size of the symbol.
-     */
-    uint32_t sizeInBytes;
</font> 
     /*!
      *  This member contains the disassembly associated with a symbol.
<font color='#997700'>@@ -53,6 +133,11 @@
</font>     std::string sourceFile;
 
     /*!
<font color='#000088'>+     *  This member contains the statistics kept on each symbol.
+     */<span style="background-color: #FF0000">    </span>
+    Statistics stats;
+
+    /*!
</font>      *  This member contains information about the branch instructions of
      *  a symbol that were not fully covered (i.e. taken/not taken).
      */
<font color='#997700'>@@ -75,7 +160,6 @@
</font>      */
     SymbolInformation() :
       baseAddress( 0 ),
<font color='#880000'>-      sizeInBytes( 0 ),
</font>       uncoveredBranches( NULL ),
       uncoveredRanges( NULL ),
       unifiedCoverageMap( NULL )
<font color='#997700'>@@ -215,31 +299,12 @@
</font>      */
     void preprocess( void );
 
<font color='#880000'>-  private:
-
</font>     /*!
<font color='#880000'>-     *  This member variable contains the total number of branches always
-     *  taken for all analyzed symbols.
-     */
-    int branchesAlwaysTaken;
</font><font color='#000088'>+     *  This member contains the statistics kept on each symbol.
+     */<span style="background-color: #FF0000">    </span>
+    Statistics stats;
</font> 
<font color='#880000'>-    /*!
-     *  This member variable contains the total number of branches found
-     *  for all analyzed symbols.
-     */
-    int branchesFound;
-
-    /*!
-     *  This member variable contains the total number of branches never
-     *  taken for all analyzed symbols.
-     */
-    int branchesNeverTaken;
-
-    /*
-     *  This member variable contains the total number of uncovered ranges
-     *  for all analyzed symbols.
-     */
-    int uncoveredRanges;
</font><font color='#000088'>+  private:
</font> 
     /*!
      *  This method uses the specified executable file to determine the

<font color='#006600'>diff -u gcc-testing/rtems-coverage/DesiredSymbols.cc:1.10 gcc-testing/rtems-coverage/DesiredSymbols.cc:1.11
--- gcc-testing/rtems-coverage/DesiredSymbols.cc:1.10   Thu May 13 10:01:07 2010
+++ gcc-testing/rtems-coverage/DesiredSymbols.cc        Thu May 13 12:36:16 2010
</font><font color='#997700'>@@ -24,10 +24,6 @@
</font> 
   DesiredSymbols::DesiredSymbols()
   {
<font color='#880000'>-    branchesAlwaysTaken = 0;
-    branchesFound = 0;
-    branchesNeverTaken = 0;
-    uncoveredRanges = 0;
</font>   }
 
   DesiredSymbols::~DesiredSymbols()
<font color='#997700'>@@ -163,7 +159,7 @@
</font>       sitr->second.uncoveredBranches = theBranches;
 
       // Now scan through the coverage map of this symbol.
<font color='#880000'>-      endAddress = sitr->second.sizeInBytes - 1;
</font><font color='#000088'>+      endAddress = sitr->second.stats.sizeInBytes - 1;
</font>       a = 0;
       while (a <= endAddress) {
 
<font color='#997700'>@@ -177,7 +173,7 @@
</font>             ;
           ha--;
 
<font color='#880000'>-          uncoveredRanges++;
</font><font color='#000088'>+          stats.uncoveredRanges++;
</font>           theRanges->add(
             sitr->second.baseAddress + la,
             sitr->second.baseAddress + ha,
<font color='#997700'>@@ -189,7 +185,7 @@
</font>         // If an address is a branch instruction, add any uncovered branches
         // to the uncoverd branches.
         else if (theCoverageMap->isBranch( a )) {
<font color='#880000'>-          branchesFound++;
</font><font color='#000088'>+          stats.branchesFound++;
</font>           la = a;
           for (ha=a+1;
                ha<=endAddress && !theCoverageMap->isStartOfInstruction( ha );
<font color='#997700'>@@ -198,7 +194,7 @@
</font>           ha--;
 
           if (theCoverageMap->wasAlwaysTaken( la )) {
<font color='#880000'>-            branchesAlwaysTaken++;
</font><font color='#000088'>+            stats.branchesAlwaysTaken++;
</font>             theBranches->add(
               sitr->second.baseAddress + la,
               sitr->second.baseAddress + ha,
<font color='#997700'>@@ -215,7 +211,7 @@
</font>           }
 
           else if (theCoverageMap->wasNeverTaken( la )) {
<font color='#880000'>-            branchesNeverTaken++;
</font><font color='#000088'>+            stats.branchesNeverTaken++;
</font>             theBranches->add(
               sitr->second.baseAddress + la,
               sitr->second.baseAddress + ha,
<font color='#997700'>@@ -265,7 +261,7 @@
</font>     if (itr->second.unifiedCoverageMap) {
 
       // ensure that the specified size matches the existing size.
<font color='#880000'>-      if (itr->second.sizeInBytes != size) {
</font><font color='#000088'>+      if (itr->second.stats.sizeInBytes != size) {
</font> 
         fprintf(
           stderr,
<font color='#997700'>@@ -301,7 +297,7 @@
</font>           symbolName.c_str(), 0, highAddress
         );
       itr->second.unifiedCoverageMap = aCoverageMap;
<font color='#880000'>-      itr->second.sizeInBytes = size;
</font><font color='#000088'>+      itr->second.stats.sizeInBytes = size;
</font>     }
   }
 
<font color='#997700'>@@ -480,19 +476,19 @@
</font>   }
 
   uint32_t DesiredSymbols::getNumberBranchesAlwaysTaken( void ) const {
<font color='#880000'>-    return branchesAlwaysTaken;
</font><font color='#000088'>+    return stats.branchesAlwaysTaken;
</font>   };
 
   uint32_t DesiredSymbols::getNumberBranchesFound( void ) const {
<font color='#880000'>-    return branchesFound;
</font><font color='#000088'>+    return stats.branchesFound;
</font>   };
 
   uint32_t DesiredSymbols::getNumberBranchesNeverTaken( void ) const {
<font color='#880000'>-    return branchesNeverTaken;
</font><font color='#000088'>+    return stats.branchesNeverTaken;
</font>   };
 
   uint32_t DesiredSymbols::getNumberUncoveredRanges( void ) const {
<font color='#880000'>-    return uncoveredRanges;
</font><font color='#000088'>+    return stats.uncoveredRanges;
</font>   };
 
   bool DesiredSymbols::isDesired (
<font color='#997700'>@@ -540,7 +536,7 @@
</font> 
     // Ensure that the source and destination coverage maps
     // are the same size.
<font color='#880000'>-    dMapSize = itr->second.sizeInBytes;
</font><font color='#000088'>+    dMapSize = itr->second.stats.sizeInBytes;
</font>     sBaseAddress = sourceCoverageMap->getLowAddress();
     sMapSize = sourceCoverageMap->getHighAddress() - sBaseAddress + 1;
     if (dMapSize != sMapSize) {

<font color='#006600'>diff -u gcc-testing/rtems-coverage/covoar.cc:1.23 gcc-testing/rtems-coverage/covoar.cc:1.24
--- gcc-testing/rtems-coverage/covoar.cc:1.23   Thu May 13 10:01:07 2010
+++ gcc-testing/rtems-coverage/covoar.cc        Thu May 13 12:36:17 2010
</font><font color='#997700'>@@ -395,7 +395,7 @@
</font>       theCoverageMap = itr->second.unifiedCoverageMap;
       if (theCoverageMap) {
 
<font color='#880000'>-        endAddress = itr->second.sizeInBytes - 1;
</font><font color='#000088'>+        endAddress = itr->second.stats.sizeInBytes - 1;
</font> 
         for (a = 0; a <= endAddress; a++) {
           totalBytes++;
</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>