change log for rtems-testing (2011-08-31)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed Aug 31 21:10:03 UTC 2011
*joel*:
2011-08-31 Joel Sherrill <joel.sherrill at oarcorp.com>
* check_submission: Check for tabs in source files.
M 1.15 merge-helpers/ChangeLog
M 1.6 merge-helpers/check_submission
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
@@ -1,3 +1,7 @@
+2011-08-31 Joel Sherrill <joel.sherrill at oarcorp.com>
+
+ * check_submission: Check for tabs in source files.
+
2011-08-01 Joel Sherrill <joel.sherrill at oarcorp.com>
* check_submission: Check for spaces at end of lines.
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
@@ -179,6 +179,17 @@
test $? -eq 0 && echo "$f has spaces at the end of one or more lines."
done
+# 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
+
# We do not want GPL code
echo "=== Checking for hints of GPL code"
find_source -m -c -C | while read f
*joel*:
2011-08-31 Joel Sherrill <joel.sherrill at oarcorp.com>
* gdb-sim.in: Default bspDoTrace variable to no.
* qemuppc.in: Update arguments to match newer qemu.
M 1.101 sim-scripts/ChangeLog
M 1.20 sim-scripts/gdb-sim.in
M 1.9 sim-scripts/qemuppc.in
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
@@ -1,3 +1,8 @@
+2011-08-31 Joel Sherrill <joel.sherrill at oarcorp.com>
+
+ * gdb-sim.in: Default bspDoTrace variable to no.
+ * qemuppc.in: Update arguments to match newer qemu.
+
2011-08-21 Joel Sherrill <joel.sherrill at oarcorp.com>
* gdb-sim.in: Initialize doTrace variable.
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
@@ -96,6 +96,7 @@
bspGeneratesDeviceTree="no"
bspSupportsLCD="no"
bspSupportsTCPIP="no"
+bspDoTrace="no"
###################################################################
###################################################################
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
@@ -1,5 +1,5 @@
#
-# m68k/uc5282 Qemu Support
+# PowerPC/QemuPPC BSP Qemu Support
#
# $Id$
#
@@ -16,7 +16,7 @@
runARGS()
{
if [ ${coverage} = yes ] ; then
- COVERAGE_ARG="-trace ${1}.cov"
+ COVERAGE_ARG="--exec-trace ${1}.cov"
fi
echo "-nographic -M prep -boot n -no-reboot ${COVERAGE_ARG} \
*joel*:
*** empty log message ***
M 1.23 covoar/ChangeLog
M 1.5 covoar/CoverageMapBase.h
M 1.6 covoar/CoverageMapBase.cc
M 1.3 covoar/DesiredSymbols.h
M 1.9 covoar/DesiredSymbols.cc
M 1.3 covoar/app_common.h
M 1.3 covoar/app_common.cc
M 1.76 rtems-coverage/do_coverage
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
@@ -1,3 +1,15 @@
+2011-08-31 Pawel Zagorski <pzagor at 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
+ about object files from which symbols originate. Changed tracking
+ of "branch was taken" and "branch was not taken" from booleans to
+ counters. Change propagated and new helper methods added:
+ (getWasTaken, getWasNotTaken, sumWasTaken, sumWasNotTaken)
+
2011-08-21 Pawel Zagorski <pzagor at agh.edu.pl>
PR 1900/testing
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
@@ -253,22 +253,65 @@
bool isBranch( uint32_t address ) const;
/*!
- * This method sets the boolean which indicates if the branch
- * at the specified address was taken.
+ * This method increments the counter which indicates how many times
+ * the branch at the specified address was taken.
*
* @param[in] address specifies the address of the branch instruction
*/
void setWasTaken( uint32_t address );
/*!
- * This method sets the boolean which indicates if the branch
- * at the specified address was NOT taken.
+ * 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.
*
* @param[in] address specifies the address of the branch instruction
*/
void setWasNotTaken( uint32_t address );
/*!
+ * 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;
+
+
+ /*!
* This method returns a boolean which indicates if the branch
* instruction at the specified address is ALWAYS taken.
*
@@ -340,12 +383,12 @@
* When isBranch is TRUE, this member indicates that the branch
* instruction at the address was taken.
*/
- bool wasTaken;
+ uint32_t wasTaken;
/*!
* When isBranch is TRUE, this member indicates that the branch
* instruction at the address was NOT taken.
*/
- bool wasNotTaken;
+ uint32_t wasNotTaken;
} perAddressInfo_t;
/*!
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
@@ -43,8 +43,8 @@
i->wasExecuted = 0;
i->isBranch = false;
i->isNop = false;
- i->wasTaken = false;
- i->wasNotTaken = false;
+ i->wasTaken = 0;
+ i->wasNotTaken = 0;
}
}
@@ -292,7 +292,7 @@
if (determineOffset( address, &offset ) != true)
return;
- Info[ offset ].wasTaken = true;
+ Info[ offset ].wasTaken += 1;
}
void CoverageMapBase::setWasNotTaken(
@@ -304,7 +304,7 @@
if (determineOffset( address, &offset ) != true)
return;
- Info[ offset ].wasNotTaken = true;
+ Info[ offset ].wasNotTaken += 1;
}
bool CoverageMapBase::wasAlwaysTaken( uint32_t address ) const
@@ -331,10 +331,36 @@
bool CoverageMapBase::wasNotTaken( uint32_t address ) const
{
+ 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)
+ {
uint32_t offset;
-
+
if (determineOffset( address, &offset ) != true)
- return false;
+ return;
+
+ Info[ offset ].wasNotTaken += addition;
+ }
+
+ uint32_t CoverageMapBase::getWasNotTaken( uint32_t address ) const
+ {
+ uint32_t offset;
+
+ if (determineOffset( address, &offset ) != true)
+ return 0;
return Info[ offset ].wasNotTaken;
}
@@ -342,9 +368,35 @@
bool CoverageMapBase::wasTaken( uint32_t address ) const
{
uint32_t offset;
+ bool result;
+
+ result = true;
if (determineOffset( address, &offset ) != true)
- return false;
+ 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;
return Info[ offset ].wasTaken;
}
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
@@ -190,7 +190,7 @@
typedef std::map<std::string, SymbolInformation> symbolSet_t;
/*!
- * This variable contains a map of ymbol sets for each
+ * This variable contains a map of symbol sets for each
* symbol in the system keyed on the symbol name.
*/
symbolSet_t set;
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
@@ -34,7 +34,7 @@
const char* const symbolsFile
)
{
- char* cStatus;
+ int cStatus;
bool done = false;
FILE* sFile;
SymbolInformation* symInfo;
@@ -69,12 +69,14 @@
// Skip blank lines between symbols
do {
inputBuffer[0] = '\0';
- cStatus = fgets( inputBuffer, MAX_LINE_LENGTH, sFile );
- if ( cStatus == NULL ) {
+ inputBuffer2[0] = '\0';
+ cStatus = fscanf( sFile, "%s %s", inputBuffer, inputBuffer2 );
+ //TODO: Store inputBuffer2 value containing symbol source file
+ if ( cStatus == EOF ) {
done = true;
}
else {
- inputBuffer[ strlen(inputBuffer) - 1] = '\0';
+ //inputBuffer[ strlen(inputBuffer) - 1] = '\0';
line++;
}
} while ( !done && (inputBuffer[0] == '\0') );
@@ -678,11 +680,11 @@
destinationCoverageMap->sumWasExecuted( dAddress, executionCount );
// Merge the branch data.
- if (sourceCoverageMap->wasTaken( sAddress ))
- destinationCoverageMap->setWasTaken( dAddress );
+ executionCount = sourceCoverageMap->getWasTaken( sAddress );
+ destinationCoverageMap->sumWasTaken( dAddress, executionCount );
- if (sourceCoverageMap->wasNotTaken( sAddress ))
- destinationCoverageMap->setWasNotTaken( dAddress );
+ executionCount = sourceCoverageMap->getWasNotTaken( sAddress );
+ destinationCoverageMap->sumWasNotTaken( dAddress, executionCount );
}
}
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
@@ -23,6 +23,7 @@
#define MAX_LINE_LENGTH 512
extern char inputBuffer[MAX_LINE_LENGTH];
+extern char inputBuffer2[MAX_LINE_LENGTH];
bool FileIsNewer( const char *f1, const char *f2 );
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
@@ -35,6 +35,7 @@
const char* dynamicLibrary = NULL;
const char* projectName = NULL;
char inputBuffer[MAX_LINE_LENGTH];
+char inputBuffer2[MAX_LINE_LENGTH];
bool FileIsNewer(
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
@@ -463,7 +463,8 @@
test ${verbose} = "yes" && echo Generating symbols from ${l} >&2
# echo "========= START $l"
${TARGET}-nm --format=sysv $l | grep "FUNC|" | \
- cut -d'|' -f1 | sed -e 's/ *$//'
+ cut -d'|' -f1 | sed -e 's/ *$//' -e "s,$, ${l},"
+
# echo "========= END $l"
# no else
--
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/20110831/66ccf9f7/attachment.html>
More information about the vc
mailing list