Changeset 273aec4 in rtems-testing


Ignore:
Timestamp:
May 26, 2010, 11:19:52 PM (9 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, 8895273c193787f84c4585a10f6d6aceb3b25dc4
Children:
45cee38
Parents:
7aa2c250
Message:

2010-05-26 Joel Sherrill <joel.sherrilL@…>

  • CoverageReaderTSIM.cc: Branch coverage works now.
  • DesiredSymbols?.cc: Do not fatal on size mismatch. Just patch it up and continue.
Location:
covoar
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • covoar/ChangeLog

    r7aa2c250 r273aec4  
     12010-05-26      Joel Sherrill <joel.sherrilL@OARcorp.com>
     2
     3        * CoverageReaderTSIM.cc: Branch coverage works now.
     4        * DesiredSymbols.cc: Do not fatal on size mismatch.  Just patch it
     5        up and continue.
     6
    172010-05-26      Jennifer.Averett<Jennifer.Averett@OARcorp.com>
    28
  • covoar/CoverageReaderTSIM.cc

    r7aa2c250 r273aec4  
    8383        a = baseAddress + i;
    8484        aCoverageMap = executableInformation->getCoverageMap( a );
    85         if (!aCoverageMap)
     85        if ( !aCoverageMap )
    8686          continue;
    87         if (cover & 1) {
     87        if ( cover & 0x01 ) {
    8888          aCoverageMap->setWasExecuted( a );
    8989          aCoverageMap->setWasExecuted( a + 1 );
    9090          aCoverageMap->setWasExecuted( a + 2 );
    9191          aCoverageMap->setWasExecuted( a + 3 );
    92           if ( cover & 0x10 ) {
     92          if ( cover & 0x08 ) {
    9393            aCoverageMap->setWasTaken( a );
    9494            BranchInfoAvailable = true;
    95           } else if ( cover & 0x20 ) {
     95          }
     96          if ( cover & 0x10 ) {
    9697            aCoverageMap->setWasNotTaken( a );
    9798            BranchInfoAvailable = true;
  • covoar/DesiredSymbols.cc

    r7aa2c250 r273aec4  
    336336          stderr,
    337337          "ERROR: DesiredSymbols::createCoverageMap - Attempt to create "
    338           "unified coverage maps for %s with different sizes\n",
    339           symbolName.c_str()
    340         );
    341         exit( -1 );
     338          "unified coverage maps for %s with different sizes (%d != %d)\n",
     339          symbolName.c_str(),
     340          itr->second.stats.sizeInBytes,
     341          size
     342        );
     343        if ( itr->second.stats.sizeInBytes < size )
     344          itr->second.stats.sizeInBytes = size;
     345        else
     346          size = itr->second.stats.sizeInBytes;
     347        // exit( -1 );
    342348      }
    343349    }
     
    623629        symbolName.c_str()
    624630      );
    625       exit( -1 );
     631      return;
     632      // exit( -1 );
    626633    }
    627634
Note: See TracChangeset for help on using the changeset viewer.