tester/covoar: Remove all exit() calls and throw an rld::error exception.

Add a suitable catch to covoar's main.

1 files changed, 25 insertions, 26 deletions

diff --git a/tester/covoar/CoverageWriterTSIM.cc b/tester/covoar/CoverageWriterTSIM.cc
index ec7c5b4..a4731a9 100644
--- a/tester/covoar/CoverageWriterTSIM.cc
+++ b/tester/covoar/CoverageWriterTSIM.cc
@@ -8,10 +8,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <iostream>
+#include <iomanip>
+
+#include <rld.h>
+
 #include "CoverageWriterTSIM.h"
 
 namespace Coverage {
-  
+
   CoverageWriterTSIM::CoverageWriterTSIM()
   {
   }
@@ -20,7 +25,7 @@ namespace Coverage {
   {
   }
 
-  
+
   void CoverageWriterTSIM::writeFile(
     const char* const file,
     CoverageMapBase*  coverage,
@@ -37,42 +42,36 @@ namespace Coverage {
     /*
      *  read the file and update the coverage map passed in
      */
-    coverageFile = fopen( file, "w" );
+    coverageFile = ::fopen( file, "w" );
     if ( !coverageFile ) {
-      fprintf(
-        stderr,
-        "ERROR: CoverageWriterTSIM::writeFile - unable to open %s\n",
-        file
-      );
-      exit(-1);
+      std::ostringstream what;
+      what << "Unable to open " << file;
+      throw rld::error( what, "CoverageWriterTSIM::writeFile" );
     }
 
-    for ( a=lowAddress ; a < highAddress ; a+= 0x80 ) {
+    for ( a = lowAddress; a < highAddress; a += 0x80 ) {
       status = fprintf( coverageFile, "%x : ", a );
       if ( status == EOF || status == 0 ) {
         break;
       }
-      // fprintf( stderr, "%08x : ", baseAddress );
-      for ( i=0 ; i < 0x80 ; i+=4 ) {
+      for ( i = 0; i < 0x80; i += 4 ) {
         cover = ((coverage->wasExecuted( a + i )) ? 1 : 0);
-        status = fprintf( coverageFile, "%d ", cover );
+        status = ::fprintf( coverageFile, "%d ", cover );
 	if ( status == EOF || status == 0 ) {
-          fprintf(
-            stderr,
-            "ERROR: CoverageWriterTSIM:writeFile - write to %s "
-            "at address 0x%08x failed\n",
-            file,
-            a
-          );
-	  exit( -1 );
+          ::fclose( coverageFile );
+          std::ostringstream what;
+          what << "write to " << file
+               << " at address 0x"
+               << std::hex << std::setfill('0')
+               << std::setw(8) << a
+               << std::setfill(' ') << std::dec
+               << "failed";
+          throw rld::error( what, "CoverageWriterTSIM::writeFile" );
 	}
-        // fprintf( stderr, "%d ", cover );
       }
-      fprintf( coverageFile, "\n" );
-      // fprintf( stderr, "\n" );
-  
+      ::fprintf( coverageFile, "\n" );
     }
 
-    fclose( coverageFile );
+    ::fclose( coverageFile );
   }
 }