change log for gcc-testing (2010-05-09)

rtems-vc at rtems.org rtems-vc at rtems.org
Sun May 9 16:10:03 UTC 2010


 *joel*:
2010-05-09	Joel Sherrill <joel.sherrilL at OARcorp.com>

	* TargetBase.cc: Not a fatal error to not find instruction.

M  1.208  rtems-coverage/ChangeLog
M    1.3  rtems-coverage/TargetBase.cc

diff -u gcc-testing/rtems-coverage/ChangeLog:1.207 gcc-testing/rtems-coverage/ChangeLog:1.208
--- gcc-testing/rtems-coverage/ChangeLog:1.207	Sat May  8 09:23:50 2010
+++ gcc-testing/rtems-coverage/ChangeLog	Sun May  9 11:03:36 2010
@@ -1,3 +1,7 @@
+2010-05-09	Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+	* TargetBase.cc: Not a fatal error to not find instruction.
+
 2010-05-08	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	* do_coverage: Add ON_SIMULATOR for lm32_evr. Copy all .txt and .html

diff -u gcc-testing/rtems-coverage/TargetBase.cc:1.2 gcc-testing/rtems-coverage/TargetBase.cc:1.3
--- gcc-testing/rtems-coverage/TargetBase.cc:1.2	Thu Apr 29 14:12:31 2010
+++ gcc-testing/rtems-coverage/TargetBase.cc	Sun May  9 11:03:36 2010
@@ -30,6 +30,8 @@
       const char* const instruction
   )
   {
+    std::list <std::string>::iterator i;
+
     if (branchInstructions.empty()) {
       fprintf( 
         stderr,
@@ -38,13 +40,10 @@
        exit( -1 );    
     }
     
-    if ( find(
-           branchInstructions.begin(), 
-           branchInstructions.end(), 
-           instruction 
-        ) == branchInstructions.end()
-    )
+    i = find(branchInstructions.begin(), branchInstructions.end(), instruction);
+    if ( i  == branchInstructions.end() )
       return false;
+
     return true;
   }
 
@@ -52,6 +51,7 @@
     const char* const line
   )
   {
+    #define METHOD "ERROR: TargetBase::isBranchLine - "
     const char *ch;
     char instruction[120];
     int  result;
@@ -66,9 +66,10 @@
     if (*ch != '\t') {
       fprintf( 
         stderr,
-        "ERROR: TargetBase::isBranchLine - Unable to find instruction\n"
+        METHOD "(1) Unable to find instruction in: %s\n",
+        line
       );
-      exit( -1 );    
+      return false;
     }
     ch++;
 
@@ -78,20 +79,23 @@
     if (*ch != '\t') {
       fprintf( 
         stderr,
-        "ERROR: TargetBase::isBranchLine - Unable to find instruction\n"
+        METHOD "(2) Unable to find instruction in %s\n", 
+        line
       );
-      exit( -1 );    
+      return false;
     }
     ch++;
 
-    // Grab the instruction which is the next word in the buffer after the second tab.
+    // Grab the instruction which is the next word in the buffer
+    // after the second tab.
     result = sscanf( ch, "%s", instruction );
     if (result != 1) {
         fprintf(
           stderr,
-          "ERROR: TargetBase::isBranchLine - Unable to find instruction\n"
+          METHOD "(3) Unable to find instruction in %s\n",
+          line 
         );
-        exit( -1 );
+        return false;
     }
 
     return isBranch( instruction );



--

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/20100509/40e67d9d/attachment.html>


More information about the vc mailing list