Ticket #1909: covoar_branch_report.patch

rtems-testing/covoar/ReportsHtml.cc

@@ -198 +198 @@
            TABLE_HEADER_CLASS "\">\n"
         "<thead>\n"
         "<tr>\n"
         "<th class=\"table-sortable:default\" align=\"left\">Symbol</th>\n"
         "<th class=\"table-sortable:default\" align=\"left\">Line</th>\n"
         "<th class=\"table-filterable table-sortable:default\" align=\"left\">File</th>\n"
         "<th class=\"table-sortable:numeric\" align=\"left\">Size </br>Bytes</th>\n"
         "<th class=\"table-sortable:default\" align=\"left\">Reason</th>\n"
+        "<th class=\"table-sortable:default\" align=\"left\">Taken / Not Taken</th>\n"
         "<th class=\"table-filterable table-sortable:default\" align=\"left\">Classification</th>\n"
         "<th class=\"table-sortable:default\" align=\"left\">Explanation</th>\n"
         "</tr>\n"
         "</thead>\n"
         "<tbody>\n",
         asctime( localtime(&timestamp_m) ) 
       );
     }
@@ -503 +504 @@
     unsigned int                                     count,
     Coverage::DesiredSymbols::symbolSet_t::iterator  symbolPtr,
     Coverage::CoverageRanges::ranges_t::iterator     rangePtr
   )
   {
     const Coverage::Explanation* explanation;
     std::string                  temp;
     int                          i;
+    uint32_t                     bAddress = 0;
+    uint32_t                     lowAddress = 0;
+    Coverage::CoverageMapBase*   theCoverageMap = NULL;
 
     // Mark the background color different for odd and even lines.
     if ( ( count%2 ) != 0 )
       fprintf( report, "<tr class=\"covoar-tr-odd\">\n");
     else
       fprintf( report, "<tr>\n");
 
     // symbol
@@ -555 +559 @@
       );
     else if (rangePtr->reason ==
       Coverage::CoverageRanges::UNCOVERED_REASON_BRANCH_NEVER_TAKEN)
       fprintf( 
         report, 
         "<td class=\"covoar-td\" align=\"center\">Never Taken</td>\n"
       );
 
+    // Taken / Not taken counts
+    lowAddress = rangePtr->lowAddress;
+    bAddress = symbolPtr->second.baseAddress;
+    theCoverageMap = symbolPtr->second.unifiedCoverageMap;
+    fprintf(
+      report,
+      "<td class=\"covoar-td\" align=\"center\">%d / %d</td>\n",
+      theCoverageMap->getWasTaken( lowAddress - bAddress ),
+      theCoverageMap->getWasNotTaken( lowAddress - bAddress )
+    );
+
     // See if an explanation is available and write the Classification and
     // the Explination Columns.
     explanation = AllExplanations->lookupExplanation( rangePtr->lowSourceLine );
     if ( !explanation ) {
-      // Write Classification
+      // Write Classificationditr->second.baseAddress
       fprintf( 
         report, 
         "<td class=\"covoar-td\" align=\"center\">NONE</td>\n"
         "<td class=\"covoar-td\" align=\"center\">No Explanation</td>\n"
       );
     } else {
       char explanationFile[48];
       sprintf( explanationFile, "explanation%d.html", rangePtr->id );