[gem5-dev] changeset in gem5: arm, dev: Fix flash model serialization code ...

[Geoffrey Blake]

changeset 7b317ee691fb in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=7b317ee691fb
description:
        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.

diffstat:

 src/dev/arm/flash_device.cc |  55 +++++++++++++-------------------------------
 1 files changed, 16 insertions(+), 39 deletions(-)

diffs (81 lines):

diff -r 9bc552f9e4b0 -r 7b317ee691fb src/dev/arm/flash_device.cc
--- a/src/dev/arm/flash_device.cc       Sun Nov 22 05:10:19 2015 -0500
+++ b/src/dev/arm/flash_device.cc       Sun Nov 22 05:10:19 2015 -0500
@@ -522,28 +522,18 @@
 {
     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 @@
 {
     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);
+    }
 };
 
 /**
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev