<!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-10)</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-10 Jennifer Averett <Jennifer.Averett@OARcorp.com>
* CoverageRanges.cc, CoverageRanges.h, ReportsBase.cc, ReportsBase.h,
ReportsHtml.cc, ReportsHtml.h, ReportsText.cc, ReportsText.h: Added
anchors and links between branch-annotated and uncovered-annotated
reports.
</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.209&r2=text&tr2=1.210&diff_format=h">M</a></td><td width='1%'>1.210</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/CoverageRanges.h.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%'>rtems-coverage/CoverageRanges.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/CoverageRanges.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%'>rtems-coverage/CoverageRanges.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsBase.h.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%'>rtems-coverage/ReportsBase.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsBase.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%'>rtems-coverage/ReportsBase.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsHtml.h.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>rtems-coverage/ReportsHtml.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsHtml.cc.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>rtems-coverage/ReportsHtml.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsText.h.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%'>rtems-coverage/ReportsText.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsText.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%'>rtems-coverage/ReportsText.cc</td></tr>
</table>
<pre>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ChangeLog:1.209 gcc-testing/rtems-coverage/ChangeLog:1.210
--- gcc-testing/rtems-coverage/ChangeLog:1.209 Mon May 10 09:07:35 2010
+++ gcc-testing/rtems-coverage/ChangeLog Mon May 10 13:10:16 2010
</font><font color='#997700'>@@ -1,3 +1,10 @@
</font><font color='#000088'>+2010-05-10 Jennifer Averett <Jennifer.Averett@OARcorp.com>
+
+ * CoverageRanges.cc, CoverageRanges.h, ReportsBase.cc, ReportsBase.h,
+ ReportsHtml.cc, ReportsHtml.h, ReportsText.cc, ReportsText.h: Added
+ anchors and links between branch-annotated and uncovered-annotated
+ reports.
+
</font> 2010-05-10 Joel Sherrill <joel.sherrilL@OARcorp.com>
* TargetBase.cc: Really a warning since returns false.
<font color='#006600'>diff -u gcc-testing/rtems-coverage/CoverageRanges.h:1.3 gcc-testing/rtems-coverage/CoverageRanges.h:1.4
--- gcc-testing/rtems-coverage/CoverageRanges.h:1.3 Fri Mar 5 10:45:37 2010
+++ gcc-testing/rtems-coverage/CoverageRanges.h Mon May 10 13:10:16 2010
</font><font color='#997700'>@@ -42,6 +42,7 @@
</font> * This type defines the information kept for each range.
*/
typedef struct {
<font color='#000088'>+ uint32_t id;
</font> uint32_t lowAddress;
std::string lowSourceLine;
uint32_t highAddress;
<font color='#997700'>@@ -78,6 +79,20 @@
</font> uint32_t highAddressArg,
uncoveredReason_t why
);
<font color='#000088'>+<span style="background-color: #FF0000"> </span>
+
+ /*!
+ * This method returns the index of a range given the low address.
+ * Upon failure on finding the adress 0 is returned.
+ */
+ uint32_t getId( uint32_t lowAddress );
+<span style="background-color: #FF0000"> </span>
+ protected:
+
+ /*!
+ * This member variable tracks a unique index for the ranges_t block.
+ */
+ uint32_t id_m;
</font>
};
<font color='#006600'>diff -u gcc-testing/rtems-coverage/CoverageRanges.cc:1.2 gcc-testing/rtems-coverage/CoverageRanges.cc:1.3
--- gcc-testing/rtems-coverage/CoverageRanges.cc:1.2 Fri Mar 5 10:45:37 2010
+++ gcc-testing/rtems-coverage/CoverageRanges.cc Mon May 10 13:10:16 2010
</font><font color='#997700'>@@ -10,11 +10,13 @@
</font> */
#include "CoverageRanges.h"
<font color='#000088'>+#include <stdio.h>
</font>
namespace Coverage {
CoverageRanges::CoverageRanges()
{
<font color='#000088'>+ id_m = 0;
</font> }
CoverageRanges::~CoverageRanges()
<font color='#997700'>@@ -29,9 +31,29 @@
</font> {
coverageRange_t c;
<font color='#000088'>+ id_m++;
+ c.id = id_m;
</font> c.lowAddress = lowAddressArg;
c.highAddress = highAddressArg;
c.reason = why;
set.push_back(c);
}
<font color='#000088'>+
+ uint32_t CoverageRanges::getId( uint32_t lowAddress )
+ {
+ Coverage::CoverageRanges::ranges_t::iterator ritr;
+ uint32_t result = 0;
+
+ for (ritr = set.begin() ;
+ ritr != set.end() ;
+ ritr++ ) {
+ if ( ritr->lowAddress == lowAddress ) {
+ result = ritr->id;
+ break;
+ }
+ }
+
+ return result;
+ }
+
</font> }
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsBase.h:1.2 gcc-testing/rtems-coverage/ReportsBase.h:1.3
--- gcc-testing/rtems-coverage/ReportsBase.h:1.2 Fri May 7 13:01:51 2010
+++ gcc-testing/rtems-coverage/ReportsBase.h Mon May 10 13:10:16 2010
</font><font color='#997700'>@@ -202,7 +202,8 @@
</font> virtual void PutAnnotatedLine(<span style="background-color: #FF0000"> </span>
FILE* aFile,<span style="background-color: #FF0000"> </span>
AnnotatedLineState_t state,<span style="background-color: #FF0000"> </span>
<font color='#880000'>- std::string line<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ std::string line,
+ uint32_t id<span style="background-color: #FF0000"> </span>
</font> )=0;
/*!
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsBase.cc:1.3 gcc-testing/rtems-coverage/ReportsBase.cc:1.4
--- gcc-testing/rtems-coverage/ReportsBase.cc:1.3 Fri May 7 13:28:31 2010
+++ gcc-testing/rtems-coverage/ReportsBase.cc Mon May 10 13:10:16 2010
</font><font color='#997700'>@@ -115,13 +115,15 @@
</font> void ReportsBase::WriteAnnotatedReport(
const char* const fileName
) {
<font color='#880000'>- FILE* aFile = NULL;
- Coverage::DesiredSymbols::symbolSet_t::iterator ditr;
- std::list<Coverage::ObjdumpProcessor::objdumpLine_t>* theInstructions;
</font><font color='#000088'>+ FILE* aFile = NULL;
+ Coverage::DesiredSymbols::symbolSet_t::iterator ditr;
+ Coverage::CoverageRanges* theBranches;
+ Coverage::CoverageRanges* theRanges;
+ Coverage::CoverageMapBase* theCoverageMap = NULL;
+ uint32_t bAddress = 0;
+ AnnotatedLineState_t state;
+ std::list<Coverage::ObjdumpProcessor::objdumpLine_t>* theInstructions;
</font> std::list<Coverage::ObjdumpProcessor::objdumpLine_t>::iterator itr;
<font color='#880000'>- Coverage::CoverageMapBase* theCoverageMap = NULL;
- uint32_t bAddress = 0;
- AnnotatedLineState_t state;
</font>
aFile = OpenAnnotatedFile(fileName);
if (!aFile)
<font color='#997700'>@@ -147,12 +149,15 @@
</font> theCoverageMap = ditr->second.unifiedCoverageMap;
bAddress = ditr->second.baseAddress;
theInstructions = &(ditr->second.instructions);
<font color='#000088'>+ theRanges = ditr->second.uncoveredRanges;
+ theBranches = ditr->second.uncoveredBranches;
</font>
// Add annotations to each line where necessary
for (itr = theInstructions->begin();
itr != theInstructions->end();
itr++ ) {
<font color='#000088'>+ uint32_t id = 0;
</font> std::string annotation = "";
std::string line;
char textLine[100];
<font color='#997700'>@@ -161,9 +166,11 @@
</font>
if ( itr->isInstruction ) {
if (!theCoverageMap->wasExecuted( itr->address - bAddress )){
<font color='#880000'>- annotation = "<== NOT EXECUTED";
</font><font color='#000088'>+ annotation = "<== NOT EXECUTED";<span style="background-color: #FF0000"> </span>
</font> state = A_NEVER_EXECUTED;
<font color='#000088'>+ id = theRanges->getId( itr->address );
</font> } else if (theCoverageMap->isBranch( itr->address - bAddress )) {
<font color='#000088'>+ id = theBranches->getId( itr->address );
</font> if (theCoverageMap->wasAlwaysTaken( itr->address - bAddress )){
annotation = "<== ALWAYS TAKEN";
state = A_BRANCH_TAKEN;
<font color='#997700'>@@ -179,7 +186,7 @@
</font> sprintf( textLine, "%-70s", itr->line.c_str() );
line = textLine + annotation;
<font color='#880000'>- PutAnnotatedLine( aFile, state, line);<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ PutAnnotatedLine( aFile, state, line, id);<span style="background-color: #FF0000"> </span>
</font> }
}
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsHtml.h:1.1 gcc-testing/rtems-coverage/ReportsHtml.h:1.2
--- gcc-testing/rtems-coverage/ReportsHtml.h:1.1 Fri May 7 13:01:51 2010
+++ gcc-testing/rtems-coverage/ReportsHtml.h Mon May 10 13:10:16 2010
</font><font color='#997700'>@@ -89,7 +89,8 @@
</font> virtual void PutAnnotatedLine(<span style="background-color: #FF0000"> </span>
FILE* aFile,<span style="background-color: #FF0000"> </span>
AnnotatedLineState_t state,<span style="background-color: #FF0000"> </span>
<font color='#880000'>- std::string line<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ std::string line,<span style="background-color: #FF0000"> </span>
+ uint32_t id<span style="background-color: #FF0000"> </span>
</font> );
virtual bool PutNoBranchInfo(
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsHtml.cc:1.1 gcc-testing/rtems-coverage/ReportsHtml.cc:1.2
--- gcc-testing/rtems-coverage/ReportsHtml.cc:1.1 Fri May 7 13:01:51 2010
+++ gcc-testing/rtems-coverage/ReportsHtml.cc Mon May 10 13:10:16 2010
</font><font color='#997700'>@@ -67,6 +67,7 @@
</font> fprintf( aFile, "<table class=\"covoar-table\">\n");
fprintf( aFile, "<tbody class=\"covoar-tbody\">\n");
fprintf( aFile, "<tr class=\"covoar-tr covoar-tr-first\">\n");
<font color='#000088'>+ fprintf( aFile, "<th class=\"covoar-th\">Index</th>\n");
</font> fprintf( aFile, "<th class=\"covoar-th\">Symbol</th>\n");
fprintf( aFile, "<th class=\"covoar-th\">Line</th>\n");
fprintf( aFile, "<th class=\"covoar-th\">Size</th>\n");
<font color='#997700'>@@ -103,6 +104,7 @@
</font> fprintf( aFile, "<table class=\"covoar-table\">\n");
fprintf( aFile, "<tbody class=\"covoar-tbody\">\n");
fprintf( aFile, "<tr class=\"covoar-tr covoar-tr-first\">\n");
<font color='#000088'>+ fprintf( aFile, "<th class=\"covoar-th\">Index</th>\n");
</font> fprintf( aFile, "<th class=\"covoar-th\">Symbol</th>\n");
fprintf( aFile, "<th class=\"covoar-th\">Range</th>\n");
fprintf( aFile, "<th class=\"covoar-th\">Size</br>Bytes</th>\n");
<font color='#997700'>@@ -141,7 +143,8 @@
</font> void ReportsHtml::PutAnnotatedLine(<span style="background-color: #FF0000"> </span>
FILE* aFile,<span style="background-color: #FF0000"> </span>
AnnotatedLineState_t state,<span style="background-color: #FF0000"> </span>
<font color='#880000'>- std::string line<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ std::string line,<span style="background-color: #FF0000"> </span>
+ uint32_t id<span style="background-color: #FF0000"> </span>
</font> )
{
std::string stateText;
<font color='#997700'>@@ -155,13 +158,22 @@
</font> stateText = "</pre>\n<pre class=\"codeExecuted\">\n";
break;
case A_NEVER_EXECUTED:
<font color='#880000'>- stateText = "</pre>\n<pre class=\"codeNotExecuted\">\n";
</font><font color='#000088'>+ stateText = "</pre>\n";
+ stateText += "<a name=\"notExecuted";
+ stateText += ('0' + id);
+ stateText += "\"></a><pre class=\"codeNotExecuted\">\n";
</font> break;
case A_BRANCH_TAKEN:
<font color='#880000'>- stateText = "</pre>\n<pre class=\"codeAlwaysTaken\">\n";
</font><font color='#000088'>+ stateText = "</pre>\n";
+ stateText += "<a name=\"branches";
+ stateText += ('0' + id);
+ stateText += "\"></a><pre class=\"codeAlwaysTaken\">\n";
</font> break;
case A_BRANCH_NOT_TAKEN:
<font color='#880000'>- stateText = "</pre>\n<pre class=\"codeNeverTaken\">\n";
</font><font color='#000088'>+ stateText = "</pre>\n";
+ stateText += "<a name=\"branches";
+ stateText += ('0' + id);
+ stateText += "\"></a><pre class=\"codeNeverTaken\">\n";
</font> break;
default:
fprintf(stderr, "ERROR: ReportsHtml::PutAnnotatedLine Unknown state\n");
<font color='#997700'>@@ -215,6 +227,14 @@
</font> else
fprintf( report, "<tr class=\"covoar-tr covoar-tr-odd\">\n");
<font color='#000088'>+ // index
+ fprintf(<span style="background-color: #FF0000"> </span>
+ report,<span style="background-color: #FF0000"> </span>
+ "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#branches%d\">%d</td>\n",
+ rangePtr->id,
+ rangePtr->id
+ );
+
</font> // symbol
fprintf(<span style="background-color: #FF0000"> </span>
report,<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -309,6 +329,12 @@
</font> else
fprintf( report, "<tr class=\"covoar-tr covoar-tr-odd\">\n");
<font color='#000088'>+ // index
+ fprintf(<span style="background-color: #FF0000"> </span>
+ report,<span style="background-color: #FF0000"> </span>
+ "<td class=\"covoar-td\" align=\"center\"></td>\n"
+ );
+
</font> // symbol
fprintf(<span style="background-color: #FF0000"> </span>
report,<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -368,6 +394,14 @@
</font> else
fprintf( report, "<tr class=\"covoar-tr covoar-tr-odd\">\n");
<font color='#000088'>+ // index
+ fprintf(<span style="background-color: #FF0000"> </span>
+ report,<span style="background-color: #FF0000"> </span>
+ "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#notExecuted%d\">%d</td>\n",
+ rangePtr->id,
+ rangePtr->id
+ );
+
</font> // symbol
fprintf(<span style="background-color: #FF0000"> </span>
report,<span style="background-color: #FF0000"> </span>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsText.h:1.2 gcc-testing/rtems-coverage/ReportsText.h:1.3
--- gcc-testing/rtems-coverage/ReportsText.h:1.2 Fri May 7 13:01:51 2010
+++ gcc-testing/rtems-coverage/ReportsText.h Mon May 10 13:10:16 2010
</font><font color='#997700'>@@ -59,7 +59,8 @@
</font> virtual void PutAnnotatedLine(<span style="background-color: #FF0000"> </span>
FILE* aFile,<span style="background-color: #FF0000"> </span>
AnnotatedLineState_t state,<span style="background-color: #FF0000"> </span>
<font color='#880000'>- std::string line<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ std::string line,<span style="background-color: #FF0000"> </span>
+ uint32_t id<span style="background-color: #FF0000"> </span>
</font> );
virtual bool PutNoBranchInfo(
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsText.cc:1.2 gcc-testing/rtems-coverage/ReportsText.cc:1.3
--- gcc-testing/rtems-coverage/ReportsText.cc:1.2 Fri May 7 13:01:51 2010
+++ gcc-testing/rtems-coverage/ReportsText.cc Mon May 10 13:10:16 2010
</font><font color='#997700'>@@ -24,7 +24,8 @@
</font> void ReportsText::PutAnnotatedLine(<span style="background-color: #FF0000"> </span>
FILE* aFile,<span style="background-color: #FF0000"> </span>
AnnotatedLineState_t state,<span style="background-color: #FF0000"> </span>
<font color='#880000'>- std::string line<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ std::string line,<span style="background-color: #FF0000"> </span>
+ uint32_t id<span style="background-color: #FF0000"> </span>
</font> )
{
fprintf( aFile, "%s\n", line.c_str());
<font color='#997700'>@@ -141,10 +142,12 @@
</font> fprintf(
report,
"============================================\n"
<font color='#000088'>+ "Index : %d\n"
</font> "Symbol : %s (0x%x)\n"
"Starting Line : %s (0x%x)\n"
"Ending Line : %s (0x%x)\n"
"Size in Bytes : %d\n\n",
<font color='#000088'>+ ritr->id,
</font> ditr->first.c_str(),
ditr->second.baseAddress,
ritr->lowSourceLine.c_str(),
</pre>
<p> </p>
<a name='cs2'></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-10 Jennifer Averett <Jennifer.Averett@OARcorp.com>
* CoverageRanges.cc, CoverageRanges.h, ReportsHtml.cc: Merged
notExecuted and Branch anchors into a range anchor to resolve
multiple instances of the same numbers.
</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.210&r2=text&tr2=1.211&diff_format=h">M</a></td><td width='1%'>1.211</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/CoverageRanges.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/CoverageRanges.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/CoverageRanges.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%'>rtems-coverage/CoverageRanges.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsHtml.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%'>rtems-coverage/ReportsHtml.cc</td></tr>
</table>
<pre>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ChangeLog:1.210 gcc-testing/rtems-coverage/ChangeLog:1.211
--- gcc-testing/rtems-coverage/ChangeLog:1.210 Mon May 10 13:10:16 2010
+++ gcc-testing/rtems-coverage/ChangeLog Mon May 10 14:08:36 2010
</font><font color='#997700'>@@ -1,5 +1,11 @@
</font> 2010-05-10 Jennifer Averett <Jennifer.Averett@OARcorp.com>
<font color='#000088'>+ * CoverageRanges.cc, CoverageRanges.h, ReportsHtml.cc: Merged
+ notExecuted and Branch anchors into a range anchor to resolve
+ multiple instances of the same numbers.
+
+2010-05-10 Jennifer Averett <Jennifer.Averett@OARcorp.com>
+
</font> * CoverageRanges.cc, CoverageRanges.h, ReportsBase.cc, ReportsBase.h,
ReportsHtml.cc, ReportsHtml.h, ReportsText.cc, ReportsText.h: Added
anchors and links between branch-annotated and uncovered-annotated
<font color='#006600'>diff -u gcc-testing/rtems-coverage/CoverageRanges.h:1.4 gcc-testing/rtems-coverage/CoverageRanges.h:1.5
--- gcc-testing/rtems-coverage/CoverageRanges.h:1.4 Mon May 10 13:10:16 2010
+++ gcc-testing/rtems-coverage/CoverageRanges.h Mon May 10 14:08:36 2010
</font><font color='#997700'>@@ -89,10 +89,6 @@
</font>
protected:
<font color='#880000'>- /*!
- * This member variable tracks a unique index for the ranges_t block.
- */
- uint32_t id_m;
</font>
};
<font color='#006600'>diff -u gcc-testing/rtems-coverage/CoverageRanges.cc:1.3 gcc-testing/rtems-coverage/CoverageRanges.cc:1.4
--- gcc-testing/rtems-coverage/CoverageRanges.cc:1.3 Mon May 10 13:10:16 2010
+++ gcc-testing/rtems-coverage/CoverageRanges.cc Mon May 10 14:08:36 2010
</font><font color='#997700'>@@ -14,9 +14,13 @@
</font>
namespace Coverage {
<font color='#000088'>+ /*!
+ * This member variable tracks a unique index for the ranges_t block.
+ */
+ uint32_t id_m = 0;
+
</font> CoverageRanges::CoverageRanges()
{
<font color='#880000'>- id_m = 0;
</font> }
CoverageRanges::~CoverageRanges()
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsHtml.cc:1.2 gcc-testing/rtems-coverage/ReportsHtml.cc:1.3
--- gcc-testing/rtems-coverage/ReportsHtml.cc:1.2 Mon May 10 13:10:16 2010
+++ gcc-testing/rtems-coverage/ReportsHtml.cc Mon May 10 14:08:36 2010
</font><font color='#997700'>@@ -148,7 +148,11 @@
</font> )
{
std::string stateText;
<font color='#000088'>+ char number[10];
+
</font>
<font color='#000088'>+ sprintf(number,"%d", id);
+
</font> // Set the stateText based upon the current state.
switch (state) {
case A_SOURCE:
<font color='#997700'>@@ -159,20 +163,20 @@
</font> break;
case A_NEVER_EXECUTED:
stateText = "</pre>\n";
<font color='#880000'>- stateText += "<a name=\"notExecuted";
- stateText += ('0' + id);
</font><font color='#000088'>+ stateText += "<a name=\"range";
+ stateText += number;
</font> stateText += "\"></a><pre class=\"codeNotExecuted\">\n";
break;
case A_BRANCH_TAKEN:
stateText = "</pre>\n";
<font color='#880000'>- stateText += "<a name=\"branches";
- stateText += ('0' + id);
</font><font color='#000088'>+ stateText += "<a name=\"range";
+ stateText += number;
</font> stateText += "\"></a><pre class=\"codeAlwaysTaken\">\n";
break;
case A_BRANCH_NOT_TAKEN:
stateText = "</pre>\n";
<font color='#880000'>- stateText += "<a name=\"branches";
- stateText += ('0' + id);
</font><font color='#000088'>+ stateText += "<a name=\"range";
+ stateText += number;
</font> stateText += "\"></a><pre class=\"codeNeverTaken\">\n";
break;
default:
<font color='#997700'>@@ -230,7 +234,7 @@
</font> // index
fprintf(<span style="background-color: #FF0000"> </span>
report,<span style="background-color: #FF0000"> </span>
<font color='#880000'>- "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#branches%d\">%d</td>\n",
</font><font color='#000088'>+ "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#range%d\">%d</td>\n",
</font> rangePtr->id,
rangePtr->id
);
<font color='#997700'>@@ -397,7 +401,7 @@
</font> // index
fprintf(<span style="background-color: #FF0000"> </span>
report,<span style="background-color: #FF0000"> </span>
<font color='#880000'>- "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#notExecuted%d\">%d</td>\n",
</font><font color='#000088'>+ "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#range%d\">%d</td>\n",
</font> rangePtr->id,
rangePtr->id
);
</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>