<!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-01-24)</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-01-24 Joel Sherrill <joel.sherrilL@OARcorp.com>
* CoverageReaderQEMU.cc: Finetune debug.
</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.16&r2=text&tr2=1.17&diff_format=h">M</a></td><td width='1%'>1.17</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/CoverageReaderQEMU.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/CoverageReaderQEMU.cc</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems-testing/covoar/ChangeLog:1.16 rtems-testing/covoar/ChangeLog:1.17
--- rtems-testing/covoar/ChangeLog:1.16 Mon Jan 24 14:29:23 2011
+++ rtems-testing/covoar/ChangeLog Mon Jan 24 15:11:25 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-01-24 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * CoverageReaderQEMU.cc: Finetune debug.
+
</font> 2011-01-24 Joel Sherrill <joel.sherrill@oarcorp.com>
* CoverageReaderQEMU.cc: Add debug for trace block having a bad address
<font color='#006600'>diff -u rtems-testing/covoar/CoverageReaderQEMU.cc:1.2 rtems-testing/covoar/CoverageReaderQEMU.cc:1.3
--- rtems-testing/covoar/CoverageReaderQEMU.cc:1.2 Mon Jan 24 14:29:23 2011
+++ rtems-testing/covoar/CoverageReaderQEMU.cc Mon Jan 24 15:11:25 2011
</font><font color='#997700'>@@ -139,28 +139,37 @@
</font> }
}
<font color='#880000'>- // Determine if additional branch information is available.
- if ( (entry->op & branchInfo) != 0 ) {
</font><font color='#000088'>+ // Determine if additional branch information is available.
+ if ( (entry->op & branchInfo) != 0 ) {
</font> unsigned int a = entry->pc + entry->size - 1;
<font color='#880000'>-if ( (entry->pc < aCoverageMap->getLowAddress()) ||
- (entry->pc > aCoverageMap->getHighAddress()) )
- fprintf( stderr, "*** entry PC of trace block is too low\n" );
-
-if ( (a < aCoverageMap->getLowAddress()) ||
- (a > aCoverageMap->getHighAddress()) )
- fprintf( stderr, "*** last byte of trace block is too high\n" );
-
- while (!aCoverageMap->isStartOfInstruction(a))
- a--;
- if (entry->op & taken) {
- aCoverageMap->setWasTaken( a );
- } else if (entry->op & notTaken) {
- aCoverageMap->setWasNotTaken( a );
</font><font color='#000088'>+ if ( (entry->pc < aCoverageMap->getLowAddress()) ||
+ (entry->pc > aCoverageMap->getHighAddress()) ||
+ (a < aCoverageMap->getLowAddress()) ||
+ (a > aCoverageMap->getHighAddress()) ) {
+ fprintf(
+ stderr,
+ "*** Trace block is inconsistent with coverage map\n"
+ "*** Trace block (0x%08x - 0x%08x) for %d bytes\n"
+ "*** Coverage map (0x%08x - 0x%08x) for %d bytes\n",
+ entry->pc,
+ a,
+ entry->size,
+ aCoverageMap->getLowAddress(),
+ aCoverageMap->getHighAddress(),
+ aCoverageMap->getHighAddress() - aCoverageMap->getLowAddress()
+ );
+ } else {
+ while (!aCoverageMap->isStartOfInstruction(a))
+ a--;
+ if (entry->op & taken) {
+ aCoverageMap->setWasTaken( a );
+ } else if (entry->op & notTaken) {
+ aCoverageMap->setWasNotTaken( a );
+ }
</font> }
<font color='#880000'>- }
</font><font color='#000088'>+ }
</font> }
}
<font color='#880000'>-
</font> fclose( traceFile );
}
}
</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>