<!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-19)</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-19 Jennifer Averett <Jennifer.Averett@OARcorp.com>
* ConfigFile.h, CoverageRanges.h, DesiredSymbols.h, Doxyfile,
ObjdumpProcessor.h, ReportsBase.cc, ReportsBase.h, ReportsHtml.cc,
ReportsHtml.h, ReportsText.cc, ReportsText.h, Target_lm32.h,
Target_m68k.h, Target_powerpc.h, TraceList.h, qemu-log.h,
rtemscov_header.h: Resolved doxygen warnings. Added a NoRange report
which lists all symbols that are never accessed by an executable.
</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.264&r2=text&tr2=1.265&diff_format=h">M</a></td><td width='1%'>1.265</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/ConfigFile.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/ConfigFile.h</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.6&r2=text&tr2=1.7&diff_format=h">M</a></td><td width='1%'>1.7</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/DesiredSymbols.h.diff?r1=text&tr1=1.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</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/Doxyfile.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/Doxyfile</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ObjdumpProcessor.h.diff?r1=text&tr1=1.11&r2=text&tr2=1.12&diff_format=h">M</a></td><td width='1%'>1.12</td><td width='100%'>rtems-coverage/ObjdumpProcessor.h</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.9&r2=text&tr2=1.10&diff_format=h">M</a></td><td width='1%'>1.10</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.13&r2=text&tr2=1.14&diff_format=h">M</a></td><td width='1%'>1.14</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.9&r2=text&tr2=1.10&diff_format=h">M</a></td><td width='1%'>1.10</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.21&r2=text&tr2=1.22&diff_format=h">M</a></td><td width='1%'>1.22</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.6&r2=text&tr2=1.7&diff_format=h">M</a></td><td width='1%'>1.7</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.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</td><td width='100%'>rtems-coverage/ReportsText.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/Target_lm32.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/Target_lm32.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/Target_m68k.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/Target_m68k.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/Target_powerpc.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/Target_powerpc.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/TraceList.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/TraceList.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/qemu-log.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/qemu-log.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/rtemscov_header.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/rtemscov_header.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ChangeLog:1.264 gcc-testing/rtems-coverage/ChangeLog:1.265
--- gcc-testing/rtems-coverage/ChangeLog:1.264 Wed May 19 09:02:21 2010
+++ gcc-testing/rtems-coverage/ChangeLog Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -1,3 +1,12 @@
</font><font color='#000088'>+2010-05-19 Jennifer Averett <Jennifer.Averett@OARcorp.com>
+
+ * ConfigFile.h, CoverageRanges.h, DesiredSymbols.h, Doxyfile,
+ ObjdumpProcessor.h, ReportsBase.cc, ReportsBase.h, ReportsHtml.cc,
+ ReportsHtml.h, ReportsText.cc, ReportsText.h, Target_lm32.h,
+ Target_m68k.h, Target_powerpc.h, TraceList.h, qemu-log.h,
+ rtemscov_header.h: Resolved doxygen warnings. Added a NoRange report
+ which lists all symbols that are never accessed by an executable.
+
</font> 2010-05-19 Joel Sherrill <joel.sherrilL@OARcorp.com>
* covoar.cc: Add executable and coverage file extension parameters
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ConfigFile.h:1.2 gcc-testing/rtems-coverage/ConfigFile.h:1.3
--- gcc-testing/rtems-coverage/ConfigFile.h:1.2 Wed May 12 13:12:36 2010
+++ gcc-testing/rtems-coverage/ConfigFile.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -15,6 +15,11 @@
</font>
namespace Configuration {
<font color='#000088'>+ /*!
+ *<span style="background-color: #FF0000"> </span>
+ * This structure contains the configuration parameter
+ * name and value pair.
+ */<span style="background-color: #FF0000"> </span>
</font> typedef struct {
const char *option;
const char *value;
<font color='#006600'>diff -u gcc-testing/rtems-coverage/CoverageRanges.h:1.6 gcc-testing/rtems-coverage/CoverageRanges.h:1.7
--- gcc-testing/rtems-coverage/CoverageRanges.h:1.6 Fri May 14 12:26:35 2010
+++ gcc-testing/rtems-coverage/CoverageRanges.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -42,19 +42,54 @@
</font> * This type defines the information kept for each range.
*/
typedef struct {
<font color='#000088'>+ /*!
+ * This member contains an identification number for this<span style="background-color: #FF0000"> </span>
+ * coverage range.
+ */
</font> uint32_t id;
<font color='#000088'>+
+ /*!
+ * This member contains the low address of this coverage<span style="background-color: #FF0000"> </span>
+ * range.
+ */
</font> uint32_t lowAddress;
<font color='#000088'>+
+ /*!
+ * This member contains the source line associated with the<span style="background-color: #FF0000"> </span>
+ * low address for this coverage range.
+ */
</font> std::string lowSourceLine;
<font color='#000088'>+
+ /*!
+ * This member contains the high address for this coverage range.
+ */
</font> uint32_t highAddress;
<font color='#000088'>+
+ /*!
+ * This member contains the high source line for this coverage range.
+ */
</font> std::string highSourceLine;
<font color='#000088'>+
+ /*!
+ * This member contains an instruction count for this coverage<span style="background-color: #FF0000"> </span>
+ * address range.
+ */
</font> uint32_t instructionCount;
<font color='#000088'>+
+ /*!
+ * This member contains the reason that this area was uncovered.
+ */
</font> uncoveredReason_t reason;
} coverageRange_t;
/*!
<font color='#880000'>- * This member variable contains a list of CoverageRange instances.
</font><font color='#000088'>+ * This type contains a list of CoverageRange instances.
</font> */
typedef std::list<coverageRange_t> ranges_t;
<font color='#000088'>+
+ /*!
+ * This member contains a list of the CoverageRange instances.
+ */
</font> ranges_t set;
/*!<span style="background-color: #FF0000"> </span>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/DesiredSymbols.h:1.7 gcc-testing/rtems-coverage/DesiredSymbols.h:1.8
--- gcc-testing/rtems-coverage/DesiredSymbols.h:1.7 Tue May 18 09:21:13 2010
+++ gcc-testing/rtems-coverage/DesiredSymbols.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -24,7 +24,7 @@
</font> namespace Coverage {
<font color='#880000'>- /*! @class Stats
</font><font color='#000088'>+ /*!<span style="background-color: #FF0000"> </span>
</font> *<span style="background-color: #FF0000"> </span>
* This class defines the statistics that are tracked.
*/
<font color='#997700'>@@ -188,6 +188,11 @@
</font> * This map associates each symbol with its symbol information.
*/
typedef std::map<std::string, SymbolInformation> symbolSet_t;
<font color='#000088'>+
+ /*!
+ * This variable contains a map of ymbol sets for each<span style="background-color: #FF0000"> </span>
+ * symbol in the system keyed on the symbol name.
+ */
</font> symbolSet_t set;
/*!<span style="background-color: #FF0000"> </span>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/Doxyfile:1.2 gcc-testing/rtems-coverage/Doxyfile:1.3
--- gcc-testing/rtems-coverage/Doxyfile:1.2 Wed May 12 13:12:36 2010
+++ gcc-testing/rtems-coverage/Doxyfile Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -585,7 +585,7 @@
</font> # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
<font color='#880000'>-FILE_PATTERNS =
</font><font color='#000088'>+FILE_PATTERNS = *.h
</font>
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO.
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ObjdumpProcessor.h:1.11 gcc-testing/rtems-coverage/ObjdumpProcessor.h:1.12
--- gcc-testing/rtems-coverage/ObjdumpProcessor.h:1.11 Tue May 18 09:21:13 2010
+++ gcc-testing/rtems-coverage/ObjdumpProcessor.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -72,8 +72,17 @@
</font>
} objdumpLine_t;
<font color='#000088'>+ /*!
+ * This object defines a list of object dump lines
+ * for a file.
+ */
</font> typedef std::list<objdumpLine_t> objdumpLines_t;
<font color='#000088'>+<span style="background-color: #FF0000"> </span>
+ /*!
+ * This object defines a list of instruction addresses
+ * that will be extracted from the objdump file.
+ */<span style="background-color: #FF0000"> </span>
</font> typedef std::list<uint32_t> objdumpFile_t;
/*!
<font color='#997700'>@@ -135,6 +144,10 @@
</font>
private:
<font color='#000088'>+ /*!
+ * This variable consists of a list of all instruction addresses
+ * extracted from the obj dump file.
+ */
</font> objdumpFile_t objdumpList;
/*!
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsBase.h:1.9 gcc-testing/rtems-coverage/ReportsBase.h:1.10
--- gcc-testing/rtems-coverage/ReportsBase.h:1.9 Fri May 14 12:26:35 2010
+++ gcc-testing/rtems-coverage/ReportsBase.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -19,7 +19,11 @@
</font>
namespace Coverage {
<font color='#880000'>-
</font><font color='#000088'>+/*!
+ * This class contains the base information to create a report<span style="background-color: #FF0000"> </span>
+ * set. The report set may be text based, html based or some
+ * other format to be defined at a future time.
+ */
</font> class ReportsBase {
public:
<font color='#997700'>@@ -89,8 +93,6 @@
</font> * This method returns the unique extension for the Report
* type. If the extension is ".txt" files will be<span style="background-color: #FF0000"> </span>
* named "annotated.txt", "branch.txt" ......
<font color='#880000'>- *
- * @param[in] fileName identifies the report file name
</font> */
std::string ReportExtension() { return reportExtension_m; }
<font color='#997700'>@@ -153,6 +155,16 @@
</font> virtual FILE* OpenCoverageFile(
const char* const fileName
);
<font color='#000088'>+<span style="background-color: #FF0000"> </span>
+ /*!
+ * This method opens a report file and verifies that it opened.
+ * Then appends any necessary header information onto the file.
+ *
+ * @param[in] fileName identifies the report file name
+ */
+ virtual FILE* OpenNoRangeFile(
+ const char* const fileName
+ );
</font>
/*!
* This method opens a report file and verifies that it opened.
<font color='#997700'>@@ -177,7 +189,7 @@
</font> /*!
* This method Closes a report file.<span style="background-color: #FF0000"> </span>
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] aFile identifies the report file name
</font> */
void CloseFile(
FILE* aFile
<font color='#997700'>@@ -187,7 +199,7 @@
</font> * This method puts any necessary footer information into
* the report then closes the file.
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] aFile identifies the report file name
</font> */
virtual void CloseAnnotatedFile(
FILE* aFile
<font color='#997700'>@@ -197,7 +209,7 @@
</font> * This method puts any necessary footer information into
* the report then closes the file.
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] aFile identifies the report file name
</font> * @param[in] hasBranches indicates if there are branches to report
*/
virtual void CloseBranchFile(
<font color='#997700'>@@ -209,7 +221,7 @@
</font> * This method puts any necessary footer information into
* the report then closes the file.
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] aFile identifies the report file name
</font> */
virtual void CloseCoverageFile(
FILE* aFile
<font color='#997700'>@@ -219,7 +231,17 @@
</font> * This method puts any necessary footer information into
* the report then closes the file.
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] aFile identifies the report file name
+ */
+ void CloseNoRangeFile(
+ FILE* aFile
+ );
+
+ /*!
+ * This method puts any necessary footer information into
+ * the report then closes the file.
+ *
+ * @param[in] aFile identifies the report file name
</font> */
virtual void CloseSizeFile(
FILE* aFile
<font color='#997700'>@@ -229,7 +251,7 @@
</font> * This method puts any necessary footer information into
* the report then closes the file.
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] aFile identifies the report file name
</font> */
virtual void CloseSymbolSummaryFile(
FILE* aFile
<font color='#997700'>@@ -239,7 +261,10 @@
</font> * This method puts any necessary footer information into
* the report then closes the file.
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] aFile identifies the report file name
+ * @param[in] state identifies the state machine state
+ * @param[in] line identifies the string to print<span style="background-color: #FF0000"> </span>
+ * @param[in] id identifies the branch or range id.
</font> */
virtual void PutAnnotatedLine(<span style="background-color: #FF0000"> </span>
FILE* aFile,<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -252,7 +277,7 @@
</font> * This method puts any necessary footer information into
* the report then closes the file.
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] report identifies the report file name
</font> */
virtual bool PutNoBranchInfo(
FILE* report
<font color='#997700'>@@ -261,7 +286,10 @@
</font> /*!
* This method puts a branch entry into the branch report.<span style="background-color: #FF0000"> </span>
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] report identifies the report file name
+ * @param[in] number identifies the line number.
+ * @param[in] symbolPtr is a pointer to the symbol information
+ * @param[in] rangePtr is a pointer to the range information.
</font> */
virtual bool PutBranchEntry(
FILE* report,
<font color='#997700'>@@ -274,10 +302,13 @@
</font> * This method reports when no range is available for<span style="background-color: #FF0000"> </span>
* a symbol in the coverage report.
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] report identifies the report file name
+ * @param[in] number identifies the line number.
+ * @param[in] symbol is a pointer to the symbol information
</font> */
virtual void putCoverageNoRange(
FILE* report,
<font color='#000088'>+ FILE* noRangeFile,
</font> unsigned int number,
std::string symbol
)=0;
<font color='#997700'>@@ -285,7 +316,10 @@
</font> /*!
* This method puts a line in the coverage report.
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] report identifies the report file name
+ * @param[in] number identifies the line number.
+ * @param[in] ditr is a iterator to the symbol information
+ * @param[in] ritr is a iterator to the range information.
</font> */
virtual bool PutCoverageLine(
FILE* report,
<font color='#997700'>@@ -297,7 +331,10 @@
</font> /*!
* This method method puts a line into the size report.
*
<font color='#880000'>- * @param[in] fileName identifies the size report file name
</font><font color='#000088'>+ * @param[in] report identifies the size report file name
+ * @param[in] number identifies the line number.
+ * @param[in] symbol is a pointer to the symbol information
+ * @param[in] range is a iterator to the range information.
</font> */
virtual bool PutSizeLine(
FILE* report,
<font color='#997700'>@@ -309,7 +346,9 @@
</font> /*!
* This method method puts a line into the symbol summary report.
*
<font color='#880000'>- * @param[in] fileName identifies the report file name
</font><font color='#000088'>+ * @param[in] report identifies the report file name
+ * @param[in] number identifies the line number.
+ * @param[in] symbol is a pointer to the symbol information
</font> */
virtual bool PutSymbolSummaryLine(
FILE* report,
<font color='#997700'>@@ -318,6 +357,10 @@
</font> )=0;
};
<font color='#000088'>+/*!
+ * This method iterates over all report set types and generates
+ * all reports.
+ */
</font> void GenerateReports();
}
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsBase.cc:1.13 gcc-testing/rtems-coverage/ReportsBase.cc:1.14
--- gcc-testing/rtems-coverage/ReportsBase.cc:1.13 Mon May 17 14:03:53 2010
+++ gcc-testing/rtems-coverage/ReportsBase.cc Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -84,6 +84,14 @@
</font> return OpenFile(fileName);
}
<font color='#000088'>+FILE* ReportsBase::OpenNoRangeFile(
+ const char* const fileName
+)
+{
+ return OpenFile(fileName);
+}
+
+
</font> FILE* ReportsBase::OpenSizeFile(
const char* const fileName
)
<font color='#997700'>@@ -127,6 +135,13 @@
</font> CloseFile( aFile );
}
<font color='#000088'>+void ReportsBase::CloseNoRangeFile(
+ FILE* aFile
+)
+{
+ CloseFile( aFile );
+}
+
</font> void ReportsBase::CloseSizeFile(
FILE* aFile
)
<font color='#997700'>@@ -289,7 +304,17 @@
</font> FILE* report;
Coverage::CoverageRanges::ranges_t::iterator ritr;
Coverage::CoverageRanges* theRanges;
<font color='#880000'>- unsigned int count;
</font><font color='#000088'>+ unsigned int count, count2;
+ FILE* NoRangeFile;
+ std::string NoRangeName;
+
+ // Open special file that captures NoRange informaiton
+ NoRangeName = "no_range_";
+ NoRangeName += fileName;
+ NoRangeFile = OpenNoRangeFile ( NoRangeName.c_str() );
+ if (!NoRangeFile) {
+ return;
+ }
</font>
// Open the coverage report file.
report = OpenCoverageFile( fileName );
<font color='#997700'>@@ -310,7 +335,7 @@
</font> // desired symbols list or with the executables so put something
// in the report.
if (theRanges == NULL) {
<font color='#880000'>- putCoverageNoRange( report, count, ditr->first );
</font><font color='#000088'>+ putCoverageNoRange( report, NoRangeFile, count, ditr->first );
</font> count++;
} else if (!theRanges->set.empty()) {
<font color='#997700'>@@ -323,7 +348,9 @@
</font> }
}
<font color='#000088'>+ CloseNoRangeFile( NoRangeFile );
</font> CloseCoverageFile( report );
<font color='#000088'>+
</font> }
/*
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsHtml.h:1.9 gcc-testing/rtems-coverage/ReportsHtml.h:1.10
--- gcc-testing/rtems-coverage/ReportsHtml.h:1.9 Fri May 14 12:26:35 2010
+++ gcc-testing/rtems-coverage/ReportsHtml.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -19,6 +19,10 @@
</font>
namespace Coverage {
<font color='#000088'>+/*!
+ * This class contains all methods and data necessary to
+ * do all of the HTML style reports.
+ */
</font> class ReportsHtml: public ReportsBase {
public:
<font color='#997700'>@@ -66,50 +70,77 @@
</font>
protected:
<font color='#000088'>+ /*!
+ * This variable tracks the annotated state at the time the<span style="background-color: #FF0000"> </span>
+ * last line was output. This allows the text formating to change
+ * based upon the type of lines being put out: source code or assembly
+ * object dump line....
+ */
</font> AnnotatedLineState_t lastState_m;
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual FILE* OpenAnnotatedFile(
const char* const fileName
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual FILE* OpenBranchFile(
const char* const fileName,
bool hasBranches
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual FILE* OpenCoverageFile(
const char* const fileName
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
+ FILE* OpenNoRangeFile(
+ const char* const fileName
+ );
+
+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual FILE* OpenSizeFile(
const char* const fileName
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual FILE* OpenSymbolSummaryFile(
const char* const fileName
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual void CloseAnnotatedFile(
FILE* aFile
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual void CloseBranchFile(
FILE* aFile,
bool hasBranches
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual void CloseCoverageFile(
FILE* aFile
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
+ void CloseNoRangeFile(
+ FILE* aFile
+ );
+
+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual void CloseSizeFile(
FILE* aFile
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual void CloseSymbolSummaryFile(
FILE* aFile
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</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='#997700'>@@ -117,10 +148,12 @@
</font> uint32_t id<span style="background-color: #FF0000"> </span>
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual bool PutNoBranchInfo(
FILE* report
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual bool PutBranchEntry(
FILE* report,
unsigned int number,
<font color='#997700'>@@ -128,12 +161,15 @@
</font> Coverage::CoverageRanges::ranges_t::iterator rangePtr
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual void putCoverageNoRange(
FILE* report,
<font color='#000088'>+ FILE* noRangeFile,
</font> unsigned int number,
std::string symbol
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual bool PutCoverageLine(
FILE* report,
unsigned int number,
<font color='#997700'>@@ -141,6 +177,7 @@
</font> Coverage::CoverageRanges::ranges_t::iterator ritr
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual bool PutSizeLine(
FILE* report,
unsigned int number,
<font color='#997700'>@@ -148,16 +185,19 @@
</font> Coverage::CoverageRanges::ranges_t::iterator range
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual bool PutSymbolSummaryLine(
FILE* report,
unsigned int number,
Coverage::DesiredSymbols::symbolSet_t::iterator symbol
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual FILE* OpenFile(
const char* const fileName
);
<font color='#000088'>+ /* Inherit documentation from base class. */<span style="background-color: #FF0000"> </span>
</font> virtual bool WriteExplationFile(
const char* fileName,
const Coverage::Explanation* explanation
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsHtml.cc:1.21 gcc-testing/rtems-coverage/ReportsHtml.cc:1.22
--- gcc-testing/rtems-coverage/ReportsHtml.cc:1.21 Mon May 17 14:35:57 2010
+++ gcc-testing/rtems-coverage/ReportsHtml.cc Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -117,6 +117,7 @@
</font>
fprintf(
aFile,
<font color='#000088'>+ "<title>Annotated Report</title>\n"
</font> "<pre class=\"heading-title\">Annotated Report</pre>\n"
"<body>\n"
"<pre class=\"code\">\n"
<font color='#997700'>@@ -139,6 +140,7 @@
</font> // Put header information into the file
fprintf(
aFile,
<font color='#000088'>+ "<title>Branch Report</title\n"
</font> "<pre class=\"heading-title\">Branch Report</pre>\n"
"<body>\n"
"<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
<font color='#997700'>@@ -172,6 +174,7 @@
</font> // Put header information into the file
fprintf(
aFile,
<font color='#000088'>+ "<title>Coverage Report</title>\n"
</font> "<pre class=\"heading-title\">Coverage Report</pre>\n"
"<body>\n"
"<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
<font color='#997700'>@@ -192,6 +195,36 @@
</font> return aFile;
}
<font color='#000088'>+ FILE* ReportsHtml::OpenNoRangeFile(
+ const char* const fileName
+ )
+ {
+ FILE *aFile;
+
+ // Open the file
+ aFile = OpenFile(fileName);
+
+ // Put header information into the file
+ fprintf(
+ aFile,
+ "<title> Report</title>\n"
+ "<pre class=\"heading-title\">No Range Report</pre>\n"
+ "<body>\n"
+ "<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
+ TABLE_HEADER_CLASS "\">\n"
+ "<thead>\n"
+ "<tr>\n"
+ "<th class=\"table-sortable:default\" align=\"left\">Symbol</th>\n"
+ "</tr>\n"
+ "</thead>\n"
+ "<tbody>\n"
+ );
+
+ return aFile;
+ }
+
+
+
</font> FILE* ReportsHtml::OpenSizeFile(
const char* const fileName
)
<font color='#997700'>@@ -204,6 +237,7 @@
</font> // Put header information into the file
fprintf(
aFile,
<font color='#000088'>+ "<title>Size Report</title>\n"
</font> "<pre class=\"heading-title\">Size Report</pre>\n"
"<body>\n"
"<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
<font color='#997700'>@@ -232,6 +266,7 @@
</font> // Put header information into the file
fprintf(
aFile,
<font color='#000088'>+ "<title>Symbol Summary Report</title>\n"
</font> "<pre class=\"heading-title\">Symbol Summary Report</pre>\n"
"<body>\n"
"<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
<font color='#997700'>@@ -344,6 +379,8 @@
</font> // Mark the background color different for odd and even lines.
if ( ( count%2 ) != 0 )
fprintf( report, "<tr class=\"covoar-tr-odd\">\n");
<font color='#000088'>+ else
+ fprintf( report, "<tr>\n");
</font>
// symbol
fprintf(<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -432,6 +469,7 @@
</font>
void ReportsHtml::putCoverageNoRange(
FILE* report,
<font color='#000088'>+ FILE* noRangeFile,
</font> unsigned int count,
std::string symbol
)
<font color='#997700'>@@ -448,8 +486,13 @@
</font> );
// Mark the background color different for odd and even lines.
<font color='#880000'>- if ( ( count%2 ) != 0 )
</font><font color='#000088'>+ if ( ( count%2 ) != 0 ){
</font> fprintf( report, "<tr class=\"covoar-tr-odd\">\n");
<font color='#000088'>+ fprintf( noRangeFile, "<tr class=\"covoar-tr-odd\">\n");
+ } else {
+ fprintf( report, "<tr>\n");
+ fprintf( noRangeFile, "<tr>\n");
+ }
</font>
// symbol
fprintf(<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -457,6 +500,11 @@
</font> "<td class=\"covoar-td\" align=\"center\">%s</td>\n",<span style="background-color: #FF0000"> </span>
symbol.c_str()
);
<font color='#000088'>+ fprintf(<span style="background-color: #FF0000"> </span>
+ noRangeFile,<span style="background-color: #FF0000"> </span>
+ "<td class=\"covoar-td\" align=\"center\">%s</td>\n",<span style="background-color: #FF0000"> </span>
+ symbol.c_str()
+ );
</font>
// starting line
fprintf(<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -486,6 +534,7 @@
</font> WriteExplationFile( "NotReferenced.html", &explanation );
fprintf( report, "</tr>\n");
<font color='#000088'>+ fprintf( noRangeFile, "</tr>\n");
</font> }
bool ReportsHtml::PutCoverageLine(
<font color='#997700'>@@ -501,6 +550,8 @@
</font> // Mark the background color different for odd and even lines.
if ( ( count%2 ) != 0 )
fprintf( report, "<tr class=\"covoar-tr-odd\">\n");
<font color='#000088'>+ else
+ fprintf( report, "<tr>\n");
</font>
// symbol
fprintf(<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -573,6 +624,8 @@
</font> // Mark the background color different for odd and even lines.
if ( ( count%2 ) != 0 )
fprintf( report, "<tr class=\"covoar-tr-odd\">\n");
<font color='#000088'>+ else
+ fprintf( report, "<tr>\n");
</font>
// size
fprintf(<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -610,6 +663,8 @@
</font> // Mark the background color different for odd and even lines.
if ( ( count%2 ) != 0 )
fprintf( report, "<tr class=\"covoar-tr-odd\">\n");
<font color='#000088'>+ else
+ fprintf( report, "<tr>\n");
</font>
// symbol
fprintf(<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -760,6 +815,24 @@
</font> CloseFile(aFile);
}
<font color='#000088'>+ void ReportsHtml::CloseNoRangeFile(
+ FILE* aFile
+ )
+ {
+ fprintf(
+ aFile,
+ TABLE_FOOTER
+ "</tbody>\n"
+ "</table>\n"<span style="background-color: #FF0000"> </span>
+ "</pre>\n"<span style="background-color: #FF0000"> </span>
+ "</body>\n"
+ "</html>"
+ );
+
+ CloseFile(aFile);
+ }
+
+
</font> void ReportsHtml::CloseSizeFile(
FILE* aFile
)
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsText.h:1.6 gcc-testing/rtems-coverage/ReportsText.h:1.7
--- gcc-testing/rtems-coverage/ReportsText.h:1.6 Fri May 14 12:26:35 2010
+++ gcc-testing/rtems-coverage/ReportsText.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -18,6 +18,10 @@
</font>
namespace Coverage {
<font color='#000088'>+/*!
+ * This class contains all methods and data necessary to
+ * produce all text style reports.
+ */
</font> class ReportsText: public ReportsBase {
public:
<font color='#997700'>@@ -76,6 +80,7 @@
</font>
virtual void putCoverageNoRange(
FILE* report,
<font color='#000088'>+ FILE* noRangeFile,
</font> unsigned int number,
std::string symbol
);
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsText.cc:1.7 gcc-testing/rtems-coverage/ReportsText.cc:1.8
--- gcc-testing/rtems-coverage/ReportsText.cc:1.7 Fri May 14 13:49:57 2010
+++ gcc-testing/rtems-coverage/ReportsText.cc Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -115,6 +115,7 @@
</font>
void ReportsText::putCoverageNoRange(
FILE* report,
<font color='#000088'>+ FILE* noRangeFile,
</font> unsigned int number,
std::string symbol
)
<font color='#997700'>@@ -131,6 +132,7 @@
</font> "============================================\n",
symbol.c_str()
);
<font color='#000088'>+ fprintf( noRangeFile, "%s\n", symbol.c_str() );
</font> }
bool ReportsText::PutCoverageLine(
<font color='#006600'>diff -u gcc-testing/rtems-coverage/Target_lm32.h:1.3 gcc-testing/rtems-coverage/Target_lm32.h:1.4
--- gcc-testing/rtems-coverage/Target_lm32.h:1.3 Thu Apr 29 14:12:31 2010
+++ gcc-testing/rtems-coverage/Target_lm32.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -18,7 +18,7 @@
</font>
namespace Target {
<font color='#880000'>- /*! @class TargetBase
</font><font color='#000088'>+ /*!
</font> *
* This class is the class for the m68k Target.
*
<font color='#006600'>diff -u gcc-testing/rtems-coverage/Target_m68k.h:1.1 gcc-testing/rtems-coverage/Target_m68k.h:1.2
--- gcc-testing/rtems-coverage/Target_m68k.h:1.1 Thu Apr 22 14:14:07 2010
+++ gcc-testing/rtems-coverage/Target_m68k.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -18,7 +18,7 @@
</font>
namespace Target {
<font color='#880000'>- /*! @class TargetBase
</font><font color='#000088'>+ /*!
</font> *
* This class is the class for the m68k Target.
*
<font color='#006600'>diff -u gcc-testing/rtems-coverage/Target_powerpc.h:1.1 gcc-testing/rtems-coverage/Target_powerpc.h:1.2
--- gcc-testing/rtems-coverage/Target_powerpc.h:1.1 Thu Apr 22 14:14:07 2010
+++ gcc-testing/rtems-coverage/Target_powerpc.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -18,7 +18,7 @@
</font>
namespace Target {
<font color='#880000'>- /*! @class TargetBase
</font><font color='#000088'>+ /*!
</font> *
* This class is the class for the powerpc target.
*
<font color='#006600'>diff -u gcc-testing/rtems-coverage/TraceList.h:1.2 gcc-testing/rtems-coverage/TraceList.h:1.3
--- gcc-testing/rtems-coverage/TraceList.h:1.2 Fri Apr 23 13:57:18 2010
+++ gcc-testing/rtems-coverage/TraceList.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -25,6 +25,10 @@
</font>
public:
<font color='#000088'>+ /*!
+ * This enumberated type defines an exit reason
+ * for the end of a section.
+ */
</font> typedef enum {
EXIT_REASON_BRANCH_TAKEN,
EXIT_REASON_BRANCH_NOT_TAKEN,
<font color='#997700'>@@ -35,8 +39,22 @@
</font> * This type defines the information kept for each range.
*/
typedef struct {
<font color='#000088'>+ /*!
+ * This member variable contains the low address for the
+ * trace range.
+ */
</font> uint32_t lowAddress;
<font color='#000088'>+
+ /*!
+ * This member variable contains the length of the trace
+ * range.
+ */
</font> uint16_t length;
<font color='#000088'>+
+ /*!
+ * This member variable contains the reason that this
+ * trace range ended.
+ */
</font> exitReason_t exitReason;
} traceRange_t;
<font color='#997700'>@@ -44,6 +62,11 @@
</font> * This member variable contains a list of CoverageRange instances.
*/
typedef std::list<traceRange_t> ranges_t;
<font color='#000088'>+
+ /*!
+ * This member variable contains a list of coverageRange
+ * instaces.
+ */
</font> ranges_t set;
/*!<span style="background-color: #FF0000"> </span>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/qemu-log.h:1.1 gcc-testing/rtems-coverage/qemu-log.h:1.2
--- gcc-testing/rtems-coverage/qemu-log.h:1.1 Thu Apr 22 14:17:01 2010
+++ gcc-testing/rtems-coverage/qemu-log.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -13,6 +13,10 @@
</font> #define QEMU_LOG_SECTION_END "----------------"
#define QEMU_LOG_IN_KEY "IN: "
<font color='#000088'>+/*!
+ * This structure breaks apart the log line information
+ * into the components address, instruction and data.
+ */
</font> typedef struct {
unsigned long address;
char instruction[10];
<font color='#006600'>diff -u gcc-testing/rtems-coverage/rtemscov_header.h:1.1 gcc-testing/rtems-coverage/rtemscov_header.h:1.2
--- gcc-testing/rtems-coverage/rtemscov_header.h:1.1 Fri Sep 18 09:28:46 2009
+++ gcc-testing/rtems-coverage/rtemscov_header.h Wed May 19 09:47:12 2010
</font><font color='#997700'>@@ -15,6 +15,11 @@
</font>
#define MAX_DESC_STR 32
<font color='#000088'>+/*!
+ *
+ * This structure contains XXX
+ */
+
</font> typedef struct prof_header_s{
/** the version of header file */
int ver;
</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-19 Jennifer Averett <Jennifer.Averett@OARcorp.com>
* Target_powerpc.cc: Added missing branch instructions to table of
branch instructions for powerpc.
</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.265&r2=text&tr2=1.266&diff_format=h">M</a></td><td width='1%'>1.266</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/Target_powerpc.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/Target_powerpc.cc</td></tr>
</table>
<pre>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ChangeLog:1.265 gcc-testing/rtems-coverage/ChangeLog:1.266
--- gcc-testing/rtems-coverage/ChangeLog:1.265 Wed May 19 09:47:12 2010
+++ gcc-testing/rtems-coverage/ChangeLog Wed May 19 10:03:43 2010
</font><font color='#997700'>@@ -1,5 +1,10 @@
</font> 2010-05-19 Jennifer Averett <Jennifer.Averett@OARcorp.com>
<font color='#000088'>+ * Target_powerpc.cc: Added missing branch instructions to table of
+ branch instructions for powerpc.
+
+2010-05-19 Jennifer Averett <Jennifer.Averett@OARcorp.com>
+
</font> * ConfigFile.h, CoverageRanges.h, DesiredSymbols.h, Doxyfile,
ObjdumpProcessor.h, ReportsBase.cc, ReportsBase.h, ReportsHtml.cc,
ReportsHtml.h, ReportsText.cc, ReportsText.h, Target_lm32.h,
<font color='#006600'>diff -u gcc-testing/rtems-coverage/Target_powerpc.cc:1.2 gcc-testing/rtems-coverage/Target_powerpc.cc:1.3
--- gcc-testing/rtems-coverage/Target_powerpc.cc:1.2 Fri Apr 30 07:43:14 2010
+++ gcc-testing/rtems-coverage/Target_powerpc.cc Wed May 19 10:03:43 2010
</font><font color='#997700'>@@ -19,12 +19,19 @@
</font> Target_powerpc::Target_powerpc( std::string targetName ):
TargetBase( targetName )
{
<font color='#000088'>+ branchInstructions.push_back("b");
+ branchInstructions.push_back("ba");
+ branchInstructions.push_back("bl");
+ branchInstructions.push_back("bla");
</font> branchInstructions.push_back("bc");
branchInstructions.push_back("bca");
branchInstructions.push_back("bcl");
branchInstructions.push_back("bcla");
branchInstructions.push_back("bcctr");
branchInstructions.push_back("bcctrl");
<font color='#000088'>+ branchInstructions.push_back("bclr");
+ branchInstructions.push_back("bclrl");
+
</font>
branchInstructions.sort();<span style="background-color: #FF0000"> </span>
}
</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>