change log for rtems-testing (2011-01-24)

[rtems-vc at rtems.org]

 *joel*:
2011-01-24	Joel Sherrill <joel.sherrilL at OARcorp.com>

	* CoverageReaderQEMU.cc: Finetune debug.

M   1.17  covoar/ChangeLog
M    1.3  covoar/CoverageReaderQEMU.cc

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
@@ -1,3 +1,7 @@
+2011-01-24	Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+	* CoverageReaderQEMU.cc: Finetune debug.
+
 2011-01-24	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	* CoverageReaderQEMU.cc: Add debug for trace block having a bad address

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
@@ -139,28 +139,37 @@
           }
         }
 
-       // Determine if additional branch information is available.
-       if ( (entry->op & branchInfo) != 0 ) {
+        // Determine if additional branch information is available.
+        if ( (entry->op & branchInfo) != 0 ) {
           unsigned int a = entry->pc + entry->size - 1;
-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 );
+          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 );
+            }
           }
-	}
+        }
       }
     }
-
     fclose( traceFile );
   }
 }



--

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/20110124/a16c870a/attachment-0001.html>