From 4ec5b85a31ded2afdf784555a7c736e61c8b594a Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Wed, 20 Feb 2019 11:05:29 +0100 Subject: [PATCH] sim: Add size to array unserialization error message Add both acquired and expected size information to array unserialization error message. Change-Id: Ic0a493c5a7860066eb992e9e91e7a4746b197579 Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/16542 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- src/sim/serialize.hh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh index a45d1bbcd..3d9f93e2f 100644 --- a/src/sim/serialize.hh +++ b/src/sim/serialize.hh @@ -474,7 +474,15 @@ arrayParamOut(CheckpointOut &os, const std::string &name, os << "\n"; } - +/** + * Extract values stored in the checkpoint, and assign them to the provided + * array container. + * + * @param cp The checkpoint to be parsed. + * @param name Name of the container. + * @param param The array container. + * @param size The expected number of entries to be extracted. + */ template void arrayParamIn(CheckpointIn &cp, const std::string &name, @@ -496,9 +504,9 @@ arrayParamIn(CheckpointIn &cp, const std::string &name, // Need this if we were doing a vector // value.resize(tokens.size()); - if (tokens.size() != size) { - fatal("Array size mismatch on %s:%s'\n", section, name); - } + fatal_if(tokens.size() != size, + "Array size mismatch on %s:%s (Got %u, expected %u)'\n", + section, name, tokens.size(), size); for (std::vector::size_type i = 0; i < tokens.size(); i++) { // need to parse into local variable to handle vector, -- 2.30.2