summaryrefslogtreecommitdiffstats
path: root/covoar
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2011-09-01 22:32:29 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2011-09-01 22:32:29 +0000
commit8d623608885d487a4b5399f9385469e69accf0c7 (patch)
tree28143a39d8a3ab63f1b9c1142419721a2418b4ae /covoar
parent*** empty log message *** (diff)
downloadrtems-testing-8d623608885d487a4b5399f9385469e69accf0c7.tar.bz2
2011-09-01 Pawel Zagorski <pzagor@agh.edu.pl>
PR 1909/testing * ReportsHtml.cc: Add branch taken and not taken count columns.
Diffstat (limited to 'covoar')
-rw-r--r--covoar/ChangeLog5
-rw-r--r--covoar/ReportsHtml.cc17
2 files changed, 21 insertions, 1 deletions
diff --git a/covoar/ChangeLog b/covoar/ChangeLog
index 4affb54..3623bbc 100644
--- a/covoar/ChangeLog
+++ b/covoar/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-01 Pawel Zagorski <pzagor@agh.edu.pl>
+
+ PR 1909/testing
+ * ReportsHtml.cc: Add branch taken and not taken count columns.
+
2011-08-31 Pawel Zagorski <pzagor@agh.edu.pl>
* covoar/CoverageMapBase.cc, covoar/CoverageMapBase.h,
diff --git a/covoar/ReportsHtml.cc b/covoar/ReportsHtml.cc
index bc95ca8..af9506f 100644
--- a/covoar/ReportsHtml.cc
+++ b/covoar/ReportsHtml.cc
@@ -203,6 +203,7 @@ namespace Coverage {
"<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"
@@ -508,6 +509,9 @@ namespace Coverage {
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 )
@@ -560,11 +564,22 @@ namespace Coverage {
"<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"