summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoffrey Blake <Geoffrey.Blake@arm.com>2015-11-22 05:10:19 -0500
committerGeoffrey Blake <Geoffrey.Blake@arm.com>2015-11-22 05:10:19 -0500
commit1e1cd2dc01ca2b58ee74c45835c0799c693261ba (patch)
treecc1becf37b6ff8e6adcdf869c83d13a9570c5d87
parent488128dab2b9fb728466ade9dd54f9613ee03880 (diff)
downloadgem5-1e1cd2dc01ca2b58ee74c45835c0799c693261ba.tar.xz
arm, dev: Fix flash model serialization code typos
The flash model has typos in its serialization code for unknownPages, locationTable, blockValidEntries, and blockEmptyEntries arrays where it would save each entry in the array under the same name in the checkpoint. This patch fixes these typos.
-rw-r--r--src/dev/arm/flash_device.cc55
1 files changed, 16 insertions, 39 deletions
diff --git a/src/dev/arm/flash_device.cc b/src/dev/arm/flash_device.cc
index b0b855349..09b096790 100644
--- a/src/dev/arm/flash_device.cc
+++ b/src/dev/arm/flash_device.cc
@@ -522,28 +522,18 @@ FlashDevice::serialize(CheckpointOut &cp) const
{
SERIALIZE_SCALAR(planeMask);
- int unknown_pages_size = unknownPages.size();
- SERIALIZE_SCALAR(unknown_pages_size);
- for (uint32_t count = 0; count < unknownPages.size(); count++)
- SERIALIZE_SCALAR(unknownPages[count]);
+ SERIALIZE_CONTAINER(unknownPages);
+ SERIALIZE_CONTAINER(blockValidEntries);
+ SERIALIZE_CONTAINER(blockEmptyEntries);
int location_table_size = locationTable.size();
SERIALIZE_SCALAR(location_table_size);
for (uint32_t count = 0; count < location_table_size; count++) {
- SERIALIZE_SCALAR(locationTable[count].page);
- SERIALIZE_SCALAR(locationTable[count].block);
- }
-
- int block_valid_entries_size = blockValidEntries.size();
- SERIALIZE_SCALAR(block_valid_entries_size);
- for (uint32_t count = 0; count < blockValidEntries.size(); count++)
- SERIALIZE_SCALAR(blockValidEntries[count]);
-
- int block_empty_entries_size = blockEmptyEntries.size();
- SERIALIZE_SCALAR(block_empty_entries_size);
- for (uint32_t count = 0; count < blockEmptyEntries.size(); count++)
- SERIALIZE_SCALAR(blockEmptyEntries[count]);
-
+ paramOut(cp, csprintf("locationTable[%d].page", count),
+ locationTable[count].page);
+ paramOut(cp, csprintf("locationTable[%d].block", count),
+ locationTable[count].block);
+ }
};
/**
@@ -555,32 +545,19 @@ FlashDevice::unserialize(CheckpointIn &cp)
{
UNSERIALIZE_SCALAR(planeMask);
- int unknown_pages_size;
- UNSERIALIZE_SCALAR(unknown_pages_size);
- unknownPages.resize(unknown_pages_size);
- for (uint32_t count = 0; count < unknown_pages_size; count++)
- UNSERIALIZE_SCALAR(unknownPages[count]);
+ UNSERIALIZE_CONTAINER(unknownPages);
+ UNSERIALIZE_CONTAINER(blockValidEntries);
+ UNSERIALIZE_CONTAINER(blockEmptyEntries);
int location_table_size;
UNSERIALIZE_SCALAR(location_table_size);
locationTable.resize(location_table_size);
for (uint32_t count = 0; count < location_table_size; count++) {
- UNSERIALIZE_SCALAR(locationTable[count].page);
- UNSERIALIZE_SCALAR(locationTable[count].block);
- }
-
- int block_valid_entries_size;
- UNSERIALIZE_SCALAR(block_valid_entries_size);
- blockValidEntries.resize(block_valid_entries_size);
- for (uint32_t count = 0; count < block_valid_entries_size; count++)
- UNSERIALIZE_SCALAR(blockValidEntries[count]);
-
- int block_empty_entries_size;
- UNSERIALIZE_SCALAR(block_empty_entries_size);
- blockEmptyEntries.resize(block_empty_entries_size);
- for (uint32_t count = 0; count < block_empty_entries_size; count++)
- UNSERIALIZE_SCALAR(blockEmptyEntries[count]);
-
+ paramIn(cp, csprintf("locationTable[%d].page", count),
+ locationTable[count].page);
+ paramIn(cp, csprintf("locationTable[%d].block", count),
+ locationTable[count].block);
+ }
};
/**