<!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 rtems-testing (2011-08-31)</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>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* check_submission: Check for tabs in source files.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/merge-helpers/ChangeLog.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>merge-helpers/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/merge-helpers/check_submission.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>merge-helpers/check_submission</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems-testing/merge-helpers/ChangeLog:1.14 rtems-testing/merge-helpers/ChangeLog:1.15
--- rtems-testing/merge-helpers/ChangeLog:1.14 Mon Aug 1 17:21:40 2011
+++ rtems-testing/merge-helpers/ChangeLog Wed Aug 31 15:43:11 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * check_submission: Check for tabs in source files.
+
</font> 2011-08-01 Joel Sherrill <joel.sherrill@oarcorp.com>
* check_submission: Check for spaces at end of lines.
<font color='#006600'>diff -u rtems-testing/merge-helpers/check_submission:1.5 rtems-testing/merge-helpers/check_submission:1.6
--- rtems-testing/merge-helpers/check_submission:1.5 Mon Aug 1 17:21:40 2011
+++ rtems-testing/merge-helpers/check_submission Wed Aug 31 15:43:11 2011
</font><font color='#997700'>@@ -179,6 +179,17 @@
</font> test $? -eq 0 && echo "$f has spaces at the end of one or more lines."
done
<font color='#000088'>+# We do not want tabs in source files
+echo "=== Checking for tabs in source files"
+find_source | while read f
+do
+ grep -P '\t' $f >/dev/null
+ if [ $? -eq 0 ]; then
+ echo "*** ${basedir}/${f} has the following lines with tabs"
+ grep -P '\t' $f
+ fi
+done
+
</font> # We do not want GPL code
echo "=== Checking for hints of GPL code"
find_source -m -c -C | while read f
</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>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* gdb-sim.in: Default bspDoTrace variable to no.
* qemuppc.in: Update arguments to match newer qemu.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/sim-scripts/ChangeLog.diff?r1=text&tr1=1.100&r2=text&tr2=1.101&diff_format=h">M</a></td><td width='1%'>1.101</td><td width='100%'>sim-scripts/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/sim-scripts/gdb-sim.in.diff?r1=text&tr1=1.19&r2=text&tr2=1.20&diff_format=h">M</a></td><td width='1%'>1.20</td><td width='100%'>sim-scripts/gdb-sim.in</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/sim-scripts/qemuppc.in.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>sim-scripts/qemuppc.in</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems-testing/sim-scripts/ChangeLog:1.100 rtems-testing/sim-scripts/ChangeLog:1.101
--- rtems-testing/sim-scripts/ChangeLog:1.100 Sun Aug 21 15:17:04 2011
+++ rtems-testing/sim-scripts/ChangeLog Wed Aug 31 15:43:57 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2011-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * gdb-sim.in: Default bspDoTrace variable to no.
+ * qemuppc.in: Update arguments to match newer qemu.
+
</font> 2011-08-21 Joel Sherrill <joel.sherrill@oarcorp.com>
* gdb-sim.in: Initialize doTrace variable.
<font color='#006600'>diff -u rtems-testing/sim-scripts/gdb-sim.in:1.19 rtems-testing/sim-scripts/gdb-sim.in:1.20
--- rtems-testing/sim-scripts/gdb-sim.in:1.19 Sun Aug 21 15:17:04 2011
+++ rtems-testing/sim-scripts/gdb-sim.in Wed Aug 31 15:43:57 2011
</font><font color='#997700'>@@ -96,6 +96,7 @@
</font> bspGeneratesDeviceTree="no"
bspSupportsLCD="no"
bspSupportsTCPIP="no"
<font color='#000088'>+bspDoTrace="no"
</font>
###################################################################
###################################################################
<font color='#006600'>diff -u rtems-testing/sim-scripts/qemuppc.in:1.8 rtems-testing/sim-scripts/qemuppc.in:1.9
--- rtems-testing/sim-scripts/qemuppc.in:1.8 Thu Mar 11 09:58:38 2010
+++ rtems-testing/sim-scripts/qemuppc.in Wed Aug 31 15:43:57 2011
</font><font color='#997700'>@@ -1,5 +1,5 @@
</font> #
<font color='#880000'>-# m68k/uc5282 Qemu Support<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+# PowerPC/QemuPPC BSP Qemu Support<span style="background-color: #FF0000"> </span>
</font> #
# $Id$
#
<font color='#997700'>@@ -16,7 +16,7 @@
</font> runARGS()
{
if [ ${coverage} = yes ] ; then
<font color='#880000'>- COVERAGE_ARG="-trace ${1}.cov"
</font><font color='#000088'>+ COVERAGE_ARG="--exec-trace ${1}.cov"
</font> fi
echo "-nographic -M prep -boot n -no-reboot ${COVERAGE_ARG} \
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>*** empty log message ***
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/covoar/ChangeLog.diff?r1=text&tr1=1.22&r2=text&tr2=1.23&diff_format=h">M</a></td><td width='1%'>1.23</td><td width='100%'>covoar/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/covoar/CoverageMapBase.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%'>covoar/CoverageMapBase.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/covoar/CoverageMapBase.cc.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>covoar/CoverageMapBase.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/covoar/DesiredSymbols.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%'>covoar/DesiredSymbols.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/covoar/DesiredSymbols.cc.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>covoar/DesiredSymbols.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/covoar/app_common.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%'>covoar/app_common.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/covoar/app_common.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%'>covoar/app_common.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/rtems-coverage/do_coverage.diff?r1=text&tr1=1.75&r2=text&tr2=1.76&diff_format=h">M</a></td><td width='1%'>1.76</td><td width='100%'>rtems-coverage/do_coverage</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems-testing/covoar/ChangeLog:1.22 rtems-testing/covoar/ChangeLog:1.23
--- rtems-testing/covoar/ChangeLog:1.22 Sun Aug 21 11:00:07 2011
+++ rtems-testing/covoar/ChangeLog Wed Aug 31 15:44:25 2011
</font><font color='#997700'>@@ -1,3 +1,15 @@
</font><font color='#000088'>+2011-08-31 Pawel Zagorski <pzagor@agh.edu.pl>
+
+ * covoar/CoverageMapBase.cc, covoar/CoverageMapBase.h,
+ covoar/DesiredSymbols.cc, covoar/DesiredSymbols.h,
+ covoar/app_common.cc, covoar/app_common.h,
+ rtems-coverage/do_coverage:
+ Modified do_coverage script and source code to gather information<span style="background-color: #FF0000"> </span>
+ about object files from which symbols originate. Changed tracking<span style="background-color: #FF0000"> </span>
+ of "branch was taken" and "branch was not taken" from booleans to
+ counters. Change propagated and new helper methods added:<span style="background-color: #FF0000"> </span>
+ (getWasTaken, getWasNotTaken, sumWasTaken, sumWasNotTaken)
+
</font> 2011-08-21 Pawel Zagorski <pzagor@agh.edu.pl>
PR 1900/testing
<font color='#006600'>diff -u rtems-testing/covoar/CoverageMapBase.h:1.4 rtems-testing/covoar/CoverageMapBase.h:1.5
--- rtems-testing/covoar/CoverageMapBase.h:1.4 Sun Aug 21 11:00:07 2011
+++ rtems-testing/covoar/CoverageMapBase.h Wed Aug 31 15:44:25 2011
</font><font color='#997700'>@@ -253,22 +253,65 @@
</font> bool isBranch( uint32_t address ) const;
/*!
<font color='#880000'>- * This method sets the boolean which indicates if the branch
- * at the specified address was taken.
</font><font color='#000088'>+ * This method increments the counter which indicates how many times
+ * the branch at the specified address was taken.
</font> *
* @param[in] address specifies the address of the branch instruction
*/
void setWasTaken( uint32_t address );
/*!
<font color='#880000'>- * This method sets the boolean which indicates if the branch
- * at the specified address was NOT taken.
</font><font color='#000088'>+ * This method increases the counter which indicates how many times
+ * the branch at the specified address was taken. It is used
+ * for merging coverage maps.
+ *
+ * @param[in] address specifies the address which was executed
+ * @param[in] address specifies the execution count that should be
+ * added
+ */
+ virtual void sumWasTaken( uint32_t address, uint32_t addition );
+
+ /*!
+ * This method returns an unsigned integer which indicates how often
+ * the branch at the specified address was taken.
+ *
+ * @param[in] address specifies the address to check
+ *
+ * @return Returns number of executins
+ */
+ uint32_t getWasTaken( uint32_t address ) const;
+
+ /*!
+ * This method increments the counter which indicates how many times
+ * the branch at the specified address was not taken.
</font> *
* @param[in] address specifies the address of the branch instruction
*/
void setWasNotTaken( uint32_t address );
/*!
<font color='#000088'>+ * This method increases the counter which indicates how many times
+ * the branch at the specified address was not taken. It is used
+ * for merging coverage maps.
+ *
+ * @param[in] address specifies the address which was executed
+ * @param[in] address specifies the execution count that should be
+ * added
+ */
+ virtual void sumWasNotTaken( uint32_t address, uint32_t addition );
+
+ /*!
+ * This method returns an unsigned integer which indicates how often
+ * the branch at the specified address was not taken.
+ *
+ * @param[in] address specifies the address to check
+ *
+ * @return Returns number of executins
+ */
+ uint32_t getWasNotTaken( uint32_t address ) const;
+
+
+ /*!
</font> * This method returns a boolean which indicates if the branch
* instruction at the specified address is ALWAYS taken.
*
<font color='#997700'>@@ -340,12 +383,12 @@
</font> * When isBranch is TRUE, this member indicates that the branch
* instruction at the address was taken.
*/
<font color='#880000'>- bool wasTaken;
</font><font color='#000088'>+ uint32_t wasTaken;
</font> /*!
* When isBranch is TRUE, this member indicates that the branch
* instruction at the address was NOT taken.
*/
<font color='#880000'>- bool wasNotTaken;
</font><font color='#000088'>+ uint32_t wasNotTaken;
</font> } perAddressInfo_t;
/*!
<font color='#006600'>diff -u rtems-testing/covoar/CoverageMapBase.cc:1.5 rtems-testing/covoar/CoverageMapBase.cc:1.6
--- rtems-testing/covoar/CoverageMapBase.cc:1.5 Sun Aug 21 11:00:07 2011
+++ rtems-testing/covoar/CoverageMapBase.cc Wed Aug 31 15:44:25 2011
</font><font color='#997700'>@@ -43,8 +43,8 @@
</font> i->wasExecuted = 0;
i->isBranch = false;
i->isNop = false;
<font color='#880000'>- i->wasTaken = false;
- i->wasNotTaken = false;
</font><font color='#000088'>+ i->wasTaken = 0;
+ i->wasNotTaken = 0;
</font> }
}
<font color='#997700'>@@ -292,7 +292,7 @@
</font> if (determineOffset( address, &offset ) != true)
return;
<font color='#880000'>- Info[ offset ].wasTaken = true;
</font><font color='#000088'>+ Info[ offset ].wasTaken += 1;
</font> }
void CoverageMapBase::setWasNotTaken(
<font color='#997700'>@@ -304,7 +304,7 @@
</font> if (determineOffset( address, &offset ) != true)
return;
<font color='#880000'>- Info[ offset ].wasNotTaken = true;
</font><font color='#000088'>+ Info[ offset ].wasNotTaken += 1;
</font> }
bool CoverageMapBase::wasAlwaysTaken( uint32_t address ) const
<font color='#997700'>@@ -331,10 +331,36 @@
</font>
bool CoverageMapBase::wasNotTaken( uint32_t address ) const
{
<font color='#000088'>+ uint32_t offset;
+ bool result;
+
+ result = true;
+
+ if (determineOffset( address, &offset ) != true)
+ result = false;
+
+ if (Info[ offset ].wasNotTaken <= 0)
+ result = false;
+
+ return result;
+ }
+
+ void CoverageMapBase::sumWasNotTaken( uint32_t address, uint32_t addition)
+ {
</font> uint32_t offset;
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> if (determineOffset( address, &offset ) != true)
<font color='#880000'>- return false;
</font><font color='#000088'>+ return;
+
+ Info[ offset ].wasNotTaken += addition;
+ }
+
+ uint32_t CoverageMapBase::getWasNotTaken( uint32_t address ) const
+ {
+ uint32_t offset;
+
+ if (determineOffset( address, &offset ) != true)
+ return 0;
</font>
return Info[ offset ].wasNotTaken;
}
<font color='#997700'>@@ -342,9 +368,35 @@
</font> bool CoverageMapBase::wasTaken( uint32_t address ) const
{
uint32_t offset;
<font color='#000088'>+ bool result;
+
+ result = true;
</font>
if (determineOffset( address, &offset ) != true)
<font color='#880000'>- return false;
</font><font color='#000088'>+ result = false;
+
+ if (Info[ offset ].wasTaken <= 0)
+ result = false;
+
+ return result;
+ }
+
+ void CoverageMapBase::sumWasTaken( uint32_t address, uint32_t addition)
+ {
+ uint32_t offset;
+
+ if (determineOffset( address, &offset ) != true)
+ return;
+
+ Info[ offset ].wasTaken += addition;
+ }
+
+ uint32_t CoverageMapBase::getWasTaken( uint32_t address ) const
+ {
+ uint32_t offset;
+
+ if (determineOffset( address, &offset ) != true)
+ return 0;
</font>
return Info[ offset ].wasTaken;
}
<font color='#006600'>diff -u rtems-testing/covoar/DesiredSymbols.h:1.2 rtems-testing/covoar/DesiredSymbols.h:1.3
--- rtems-testing/covoar/DesiredSymbols.h:1.2 Tue Mar 8 12:27:39 2011
+++ rtems-testing/covoar/DesiredSymbols.h Wed Aug 31 15:44:25 2011
</font><font color='#997700'>@@ -190,7 +190,7 @@
</font> typedef std::map<std::string, SymbolInformation> symbolSet_t;
/*!
<font color='#880000'>- * This variable contains a map of ymbol sets for each<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ * This variable contains a map of symbol sets for each<span style="background-color: #FF0000"> </span>
</font> * symbol in the system keyed on the symbol name.
*/
symbolSet_t set;
<font color='#006600'>diff -u rtems-testing/covoar/DesiredSymbols.cc:1.8 rtems-testing/covoar/DesiredSymbols.cc:1.9
--- rtems-testing/covoar/DesiredSymbols.cc:1.8 Sun Aug 21 11:00:07 2011
+++ rtems-testing/covoar/DesiredSymbols.cc Wed Aug 31 15:44:25 2011
</font><font color='#997700'>@@ -34,7 +34,7 @@
</font> const char* const symbolsFile
)
{
<font color='#880000'>- char* cStatus;
</font><font color='#000088'>+ int cStatus;
</font> bool done = false;
FILE* sFile;
SymbolInformation* symInfo;
<font color='#997700'>@@ -69,12 +69,14 @@
</font> // Skip blank lines between symbols
do {<span style="background-color: #FF0000"> </span>
inputBuffer[0] = '\0';
<font color='#880000'>- cStatus = fgets( inputBuffer, MAX_LINE_LENGTH, sFile );
- if ( cStatus == NULL ) {
</font><font color='#000088'>+ inputBuffer2[0] = '\0';
+ cStatus = fscanf( sFile, "%s %s", inputBuffer, inputBuffer2 );
+ //TODO: Store inputBuffer2 value containing symbol source file
+ if ( cStatus == EOF ) {
</font> done = true;
}
else {
<font color='#880000'>- inputBuffer[ strlen(inputBuffer) - 1] = '\0';
</font><font color='#000088'>+ //inputBuffer[ strlen(inputBuffer) - 1] = '\0';
</font> line++;
}
} while ( !done && (inputBuffer[0] == '\0') );
<font color='#997700'>@@ -678,11 +680,11 @@
</font> destinationCoverageMap->sumWasExecuted( dAddress, executionCount );
// Merge the branch data.
<font color='#880000'>- if (sourceCoverageMap->wasTaken( sAddress ))
- destinationCoverageMap->setWasTaken( dAddress );
</font><font color='#000088'>+ executionCount = sourceCoverageMap->getWasTaken( sAddress );
+ destinationCoverageMap->sumWasTaken( dAddress, executionCount );
</font>
<font color='#880000'>- if (sourceCoverageMap->wasNotTaken( sAddress ))
- destinationCoverageMap->setWasNotTaken( dAddress );
</font><font color='#000088'>+ executionCount = sourceCoverageMap->getWasNotTaken( sAddress );
+ destinationCoverageMap->sumWasNotTaken( dAddress, executionCount );
</font> }
}
<font color='#006600'>diff -u rtems-testing/covoar/app_common.h:1.2 rtems-testing/covoar/app_common.h:1.3
--- rtems-testing/covoar/app_common.h:1.2 Tue May 25 14:14:48 2010
+++ rtems-testing/covoar/app_common.h Wed Aug 31 15:44:25 2011
</font><font color='#997700'>@@ -23,6 +23,7 @@
</font>
#define MAX_LINE_LENGTH 512
extern char inputBuffer[MAX_LINE_LENGTH];
<font color='#000088'>+extern char inputBuffer2[MAX_LINE_LENGTH];
</font>
bool FileIsNewer( const char *f1, const char *f2 );<span style="background-color: #FF0000"> </span>
<font color='#006600'>diff -u rtems-testing/covoar/app_common.cc:1.2 rtems-testing/covoar/app_common.cc:1.3
--- rtems-testing/covoar/app_common.cc:1.2 Tue May 25 14:14:48 2010
+++ rtems-testing/covoar/app_common.cc Wed Aug 31 15:44:25 2011
</font><font color='#997700'>@@ -35,6 +35,7 @@
</font> const char* dynamicLibrary = NULL;
const char* projectName = NULL;
char inputBuffer[MAX_LINE_LENGTH];
<font color='#000088'>+char inputBuffer2[MAX_LINE_LENGTH];
</font>
bool FileIsNewer(
<font color='#006600'>diff -u rtems-testing/rtems-coverage/do_coverage:1.75 rtems-testing/rtems-coverage/do_coverage:1.76
--- rtems-testing/rtems-coverage/do_coverage:1.75 Mon Jul 25 13:38:30 2011
+++ rtems-testing/rtems-coverage/do_coverage Wed Aug 31 15:44:25 2011
</font><font color='#997700'>@@ -463,7 +463,8 @@
</font> test ${verbose} = "yes" && echo Generating symbols from ${l} >&2
# echo "========= START $l"
${TARGET}-nm --format=sysv $l | grep "FUNC|" | \
<font color='#880000'>- cut -d'|' -f1 | sed -e 's/ *$//'
</font><font color='#000088'>+ cut -d'|' -f1 | sed -e 's/ *$//' -e "s,$, ${l},"
+
</font> # echo "========= END $l"
# no else
</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>