summaryrefslogtreecommitdiff
path: root/rtems-coverage
diff options
context:
space:
mode:
authorJennifer Averett <Jennifer.Averett@OARcorp.com>2010-05-13 15:01:07 +0000
committerJennifer Averett <Jennifer.Averett@OARcorp.com>2010-05-13 15:01:07 +0000
commite2fcf9b887daa5ee9022d79385f9ccc3a013a8da (patch)
tree2eb35abdab7bd56e2cda8762ad0e05e9e3b3a047 /rtems-coverage
parentd0689b542a082fe6f8c86d4c5876341e769ba9f1 (diff)
2010-05-13 Jennifer Averett <Jennifer.Averett@OARcorp.com>
* DesiredSymbols.cc, DesiredSymbols.h, covoar.cc: Changed Symbol
Diffstat (limited to 'rtems-coverage')
-rw-r--r--rtems-coverage/ChangeLog4
-rw-r--r--rtems-coverage/DesiredSymbols.cc8
-rw-r--r--rtems-coverage/DesiredSymbols.h4
-rw-r--r--rtems-coverage/covoar.cc2
4 files changed, 11 insertions, 7 deletions
diff --git a/rtems-coverage/ChangeLog b/rtems-coverage/ChangeLog
index 8826007..ea7460b 100644
--- a/rtems-coverage/ChangeLog
+++ b/rtems-coverage/ChangeLog
@@ -1,5 +1,9 @@
2010-05-13 Jennifer Averett <Jennifer.Averett@OARcorp.com>
+ * DesiredSymbols.cc, DesiredSymbols.h, covoar.cc: Changed Symbol
+
+2010-05-13 Jennifer Averett <Jennifer.Averett@OARcorp.com>
+
* ReportsBase.cc, ReportsHtml.cc: Added correct table structure for
Summary table.
diff --git a/rtems-coverage/DesiredSymbols.cc b/rtems-coverage/DesiredSymbols.cc
index 3149b99..da9048f 100644
--- a/rtems-coverage/DesiredSymbols.cc
+++ b/rtems-coverage/DesiredSymbols.cc
@@ -163,7 +163,7 @@ namespace Coverage {
sitr->second.uncoveredBranches = theBranches;
// Now scan through the coverage map of this symbol.
- endAddress = sitr->second.size - 1;
+ endAddress = sitr->second.sizeInBytes - 1;
a = 0;
while (a <= endAddress) {
@@ -265,7 +265,7 @@ namespace Coverage {
if (itr->second.unifiedCoverageMap) {
// ensure that the specified size matches the existing size.
- if (itr->second.size != size) {
+ if (itr->second.sizeInBytes != size) {
fprintf(
stderr,
@@ -301,7 +301,7 @@ namespace Coverage {
symbolName.c_str(), 0, highAddress
);
itr->second.unifiedCoverageMap = aCoverageMap;
- itr->second.size = size;
+ itr->second.sizeInBytes = size;
}
}
@@ -540,7 +540,7 @@ namespace Coverage {
// Ensure that the source and destination coverage maps
// are the same size.
- dMapSize = itr->second.size;
+ dMapSize = itr->second.sizeInBytes;
sBaseAddress = sourceCoverageMap->getLowAddress();
sMapSize = sourceCoverageMap->getHighAddress() - sBaseAddress + 1;
if (dMapSize != sMapSize) {
diff --git a/rtems-coverage/DesiredSymbols.h b/rtems-coverage/DesiredSymbols.h
index 6666168..90b659a 100644
--- a/rtems-coverage/DesiredSymbols.h
+++ b/rtems-coverage/DesiredSymbols.h
@@ -39,7 +39,7 @@ namespace Coverage {
/*!
* This member contains the size of the symbol.
*/
- uint32_t size;
+ uint32_t sizeInBytes;
/*!
* This member contains the disassembly associated with a symbol.
@@ -75,7 +75,7 @@ namespace Coverage {
*/
SymbolInformation() :
baseAddress( 0 ),
- size( 0 ),
+ sizeInBytes( 0 ),
uncoveredBranches( NULL ),
uncoveredRanges( NULL ),
unifiedCoverageMap( NULL )
diff --git a/rtems-coverage/covoar.cc b/rtems-coverage/covoar.cc
index c6db3e6..9ee231d 100644
--- a/rtems-coverage/covoar.cc
+++ b/rtems-coverage/covoar.cc
@@ -395,7 +395,7 @@ int main(
theCoverageMap = itr->second.unifiedCoverageMap;
if (theCoverageMap) {
- endAddress = itr->second.size - 1;
+ endAddress = itr->second.sizeInBytes - 1;
for (a = 0; a <= endAddress; a++) {
totalBytes++;