change log for gcc-testing (2010-05-10)
rtems-vc at rtems.org
rtems-vc at rtems.org
Mon May 10 19:10:04 UTC 2010
*jennifer*:
2010-05-10 Jennifer Averett <Jennifer.Averett at 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.
M 1.210 rtems-coverage/ChangeLog
M 1.4 rtems-coverage/CoverageRanges.h
M 1.3 rtems-coverage/CoverageRanges.cc
M 1.3 rtems-coverage/ReportsBase.h
M 1.4 rtems-coverage/ReportsBase.cc
M 1.2 rtems-coverage/ReportsHtml.h
M 1.2 rtems-coverage/ReportsHtml.cc
M 1.3 rtems-coverage/ReportsText.h
M 1.3 rtems-coverage/ReportsText.cc
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
@@ -1,3 +1,10 @@
+2010-05-10 Jennifer Averett <Jennifer.Averett at 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.
+
2010-05-10 Joel Sherrill <joel.sherrilL at OARcorp.com>
* TargetBase.cc: Really a warning since returns false.
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
@@ -42,6 +42,7 @@
* This type defines the information kept for each range.
*/
typedef struct {
+ uint32_t id;
uint32_t lowAddress;
std::string lowSourceLine;
uint32_t highAddress;
@@ -78,6 +79,20 @@
uint32_t highAddressArg,
uncoveredReason_t why
);
+
+
+ /*!
+ * 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 );
+
+ protected:
+
+ /*!
+ * This member variable tracks a unique index for the ranges_t block.
+ */
+ uint32_t id_m;
};
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
@@ -10,11 +10,13 @@
*/
#include "CoverageRanges.h"
+#include <stdio.h>
namespace Coverage {
CoverageRanges::CoverageRanges()
{
+ id_m = 0;
}
CoverageRanges::~CoverageRanges()
@@ -29,9 +31,29 @@
{
coverageRange_t c;
+ id_m++;
+ c.id = id_m;
c.lowAddress = lowAddressArg;
c.highAddress = highAddressArg;
c.reason = why;
set.push_back(c);
}
+
+ 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;
+ }
+
}
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
@@ -202,7 +202,8 @@
virtual void PutAnnotatedLine(
FILE* aFile,
AnnotatedLineState_t state,
- std::string line
+ std::string line,
+ uint32_t id
)=0;
/*!
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
@@ -115,13 +115,15 @@
void ReportsBase::WriteAnnotatedReport(
const char* const fileName
) {
- FILE* aFile = NULL;
- Coverage::DesiredSymbols::symbolSet_t::iterator ditr;
- std::list<Coverage::ObjdumpProcessor::objdumpLine_t>* theInstructions;
+ 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;
std::list<Coverage::ObjdumpProcessor::objdumpLine_t>::iterator itr;
- Coverage::CoverageMapBase* theCoverageMap = NULL;
- uint32_t bAddress = 0;
- AnnotatedLineState_t state;
aFile = OpenAnnotatedFile(fileName);
if (!aFile)
@@ -147,12 +149,15 @@
theCoverageMap = ditr->second.unifiedCoverageMap;
bAddress = ditr->second.baseAddress;
theInstructions = &(ditr->second.instructions);
+ theRanges = ditr->second.uncoveredRanges;
+ theBranches = ditr->second.uncoveredBranches;
// Add annotations to each line where necessary
for (itr = theInstructions->begin();
itr != theInstructions->end();
itr++ ) {
+ uint32_t id = 0;
std::string annotation = "";
std::string line;
char textLine[100];
@@ -161,9 +166,11 @@
if ( itr->isInstruction ) {
if (!theCoverageMap->wasExecuted( itr->address - bAddress )){
- annotation = "<== NOT EXECUTED";
+ annotation = "<== NOT EXECUTED";
state = A_NEVER_EXECUTED;
+ id = theRanges->getId( itr->address );
} else if (theCoverageMap->isBranch( itr->address - bAddress )) {
+ id = theBranches->getId( itr->address );
if (theCoverageMap->wasAlwaysTaken( itr->address - bAddress )){
annotation = "<== ALWAYS TAKEN";
state = A_BRANCH_TAKEN;
@@ -179,7 +186,7 @@
sprintf( textLine, "%-70s", itr->line.c_str() );
line = textLine + annotation;
- PutAnnotatedLine( aFile, state, line);
+ PutAnnotatedLine( aFile, state, line, id);
}
}
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
@@ -89,7 +89,8 @@
virtual void PutAnnotatedLine(
FILE* aFile,
AnnotatedLineState_t state,
- std::string line
+ std::string line,
+ uint32_t id
);
virtual bool PutNoBranchInfo(
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
@@ -67,6 +67,7 @@
fprintf( aFile, "<table class=\"covoar-table\">\n");
fprintf( aFile, "<tbody class=\"covoar-tbody\">\n");
fprintf( aFile, "<tr class=\"covoar-tr covoar-tr-first\">\n");
+ fprintf( aFile, "<th class=\"covoar-th\">Index</th>\n");
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");
@@ -103,6 +104,7 @@
fprintf( aFile, "<table class=\"covoar-table\">\n");
fprintf( aFile, "<tbody class=\"covoar-tbody\">\n");
fprintf( aFile, "<tr class=\"covoar-tr covoar-tr-first\">\n");
+ fprintf( aFile, "<th class=\"covoar-th\">Index</th>\n");
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");
@@ -141,7 +143,8 @@
void ReportsHtml::PutAnnotatedLine(
FILE* aFile,
AnnotatedLineState_t state,
- std::string line
+ std::string line,
+ uint32_t id
)
{
std::string stateText;
@@ -155,13 +158,22 @@
stateText = "</pre>\n<pre class=\"codeExecuted\">\n";
break;
case A_NEVER_EXECUTED:
- stateText = "</pre>\n<pre class=\"codeNotExecuted\">\n";
+ stateText = "</pre>\n";
+ stateText += "<a name=\"notExecuted";
+ stateText += ('0' + id);
+ stateText += "\"></a><pre class=\"codeNotExecuted\">\n";
break;
case A_BRANCH_TAKEN:
- stateText = "</pre>\n<pre class=\"codeAlwaysTaken\">\n";
+ stateText = "</pre>\n";
+ stateText += "<a name=\"branches";
+ stateText += ('0' + id);
+ stateText += "\"></a><pre class=\"codeAlwaysTaken\">\n";
break;
case A_BRANCH_NOT_TAKEN:
- stateText = "</pre>\n<pre class=\"codeNeverTaken\">\n";
+ stateText = "</pre>\n";
+ stateText += "<a name=\"branches";
+ stateText += ('0' + id);
+ stateText += "\"></a><pre class=\"codeNeverTaken\">\n";
break;
default:
fprintf(stderr, "ERROR: ReportsHtml::PutAnnotatedLine Unknown state\n");
@@ -215,6 +227,14 @@
else
fprintf( report, "<tr class=\"covoar-tr covoar-tr-odd\">\n");
+ // index
+ fprintf(
+ report,
+ "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#branches%d\">%d</td>\n",
+ rangePtr->id,
+ rangePtr->id
+ );
+
// symbol
fprintf(
report,
@@ -309,6 +329,12 @@
else
fprintf( report, "<tr class=\"covoar-tr covoar-tr-odd\">\n");
+ // index
+ fprintf(
+ report,
+ "<td class=\"covoar-td\" align=\"center\"></td>\n"
+ );
+
// symbol
fprintf(
report,
@@ -368,6 +394,14 @@
else
fprintf( report, "<tr class=\"covoar-tr covoar-tr-odd\">\n");
+ // index
+ fprintf(
+ report,
+ "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#notExecuted%d\">%d</td>\n",
+ rangePtr->id,
+ rangePtr->id
+ );
+
// symbol
fprintf(
report,
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
@@ -59,7 +59,8 @@
virtual void PutAnnotatedLine(
FILE* aFile,
AnnotatedLineState_t state,
- std::string line
+ std::string line,
+ uint32_t id
);
virtual bool PutNoBranchInfo(
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
@@ -24,7 +24,8 @@
void ReportsText::PutAnnotatedLine(
FILE* aFile,
AnnotatedLineState_t state,
- std::string line
+ std::string line,
+ uint32_t id
)
{
fprintf( aFile, "%s\n", line.c_str());
@@ -141,10 +142,12 @@
fprintf(
report,
"============================================\n"
+ "Index : %d\n"
"Symbol : %s (0x%x)\n"
"Starting Line : %s (0x%x)\n"
"Ending Line : %s (0x%x)\n"
"Size in Bytes : %d\n\n",
+ ritr->id,
ditr->first.c_str(),
ditr->second.baseAddress,
ritr->lowSourceLine.c_str(),
*jennifer*:
2010-05-10 Jennifer Averett <Jennifer.Averett at 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.
M 1.211 rtems-coverage/ChangeLog
M 1.5 rtems-coverage/CoverageRanges.h
M 1.4 rtems-coverage/CoverageRanges.cc
M 1.3 rtems-coverage/ReportsHtml.cc
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
@@ -1,5 +1,11 @@
2010-05-10 Jennifer Averett <Jennifer.Averett at 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.
+
+2010-05-10 Jennifer Averett <Jennifer.Averett at 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
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
@@ -89,10 +89,6 @@
protected:
- /*!
- * This member variable tracks a unique index for the ranges_t block.
- */
- uint32_t id_m;
};
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
@@ -14,9 +14,13 @@
namespace Coverage {
+ /*!
+ * This member variable tracks a unique index for the ranges_t block.
+ */
+ uint32_t id_m = 0;
+
CoverageRanges::CoverageRanges()
{
- id_m = 0;
}
CoverageRanges::~CoverageRanges()
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
@@ -148,7 +148,11 @@
)
{
std::string stateText;
+ char number[10];
+
+ sprintf(number,"%d", id);
+
// Set the stateText based upon the current state.
switch (state) {
case A_SOURCE:
@@ -159,20 +163,20 @@
break;
case A_NEVER_EXECUTED:
stateText = "</pre>\n";
- stateText += "<a name=\"notExecuted";
- stateText += ('0' + id);
+ stateText += "<a name=\"range";
+ stateText += number;
stateText += "\"></a><pre class=\"codeNotExecuted\">\n";
break;
case A_BRANCH_TAKEN:
stateText = "</pre>\n";
- stateText += "<a name=\"branches";
- stateText += ('0' + id);
+ stateText += "<a name=\"range";
+ stateText += number;
stateText += "\"></a><pre class=\"codeAlwaysTaken\">\n";
break;
case A_BRANCH_NOT_TAKEN:
stateText = "</pre>\n";
- stateText += "<a name=\"branches";
- stateText += ('0' + id);
+ stateText += "<a name=\"range";
+ stateText += number;
stateText += "\"></a><pre class=\"codeNeverTaken\">\n";
break;
default:
@@ -230,7 +234,7 @@
// index
fprintf(
report,
- "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#branches%d\">%d</td>\n",
+ "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#range%d\">%d</td>\n",
rangePtr->id,
rangePtr->id
);
@@ -397,7 +401,7 @@
// index
fprintf(
report,
- "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#notExecuted%d\">%d</td>\n",
+ "<td class=\"covoar-td\" align=\"center\"><a href =\"annotated.html#range%d\">%d</td>\n",
rangePtr->id,
rangePtr->id
);
--
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/20100510/6f565f87/attachment.html>
More information about the vc
mailing list