derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sim: Move BitUnion overloading to show/parseParams

Browse Source 
This patch is moving template overloading for BitUnions into the
showParam, parseParams functions. Henceforth BitUnion types will use the
common param wrapper.
This patch implicitly implements (UN)SERIALIZE_CONTAINER for BitUnions.

Change-Id: I0e1faadb4afd4dc9de5dc5fca40041e349c9ba73
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/13636
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
This commit is contained in:
Giacomo Travaglini
2018-10-17 18:08:30 +01:00
parent 16bf103ad8
commit e8e92a12af
1 changed files with 23 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/sim/serialize.hh
View File

@@ -285,6 +285,29 @@ showParam(CheckpointOut &os, const T &value)
os << value;
}
template <class T>
bool
parseParam(const std::string &s, BitUnionType<T> &value)
{
auto storage = static_cast<BitUnionBaseType<T>>(value);
auto res = to_number(s, storage);
value = storage;
return res;
}
template <class T>
void
showParam(CheckpointOut &os, const BitUnionType<T> &value)
{
auto storage = static_cast<BitUnionBaseType<T>>(value);
// For a BitUnion8, the storage type is an unsigned char.
// Since we want to serialize a number we need to cast to
// unsigned int
os << ((sizeof(storage) == 1) ?
static_cast<unsigned int>(storage) : storage);
}
// Treat 8-bit ints (chars) as ints on output, not as chars
template <>
inline void
@@ -354,13 +377,6 @@ paramOut(CheckpointOut &os, const std::string &name, const T &param)
os << "\n";
}
template <typename T>
void
paramOut(CheckpointOut &cp, const std::string &name, const BitUnionType<T> &p)
{
paramOut(cp, name, static_cast<BitUnionBaseType<T> >(p));
}
template <class T>
void
paramIn(CheckpointIn &cp, const std::string &name, T &param)
@@ -372,15 +388,6 @@ paramIn(CheckpointIn &cp, const std::string &name, T &param)
}
}
template <typename T>
void
paramIn(CheckpointIn &cp, const std::string &name, BitUnionType<T> &p)
{
BitUnionBaseType<T> b;
paramIn(cp, name, b);
p = b;
}
template <class T>
bool
optParamIn(CheckpointIn &cp, const std::string &name,
@@ -397,20 +404,6 @@ optParamIn(CheckpointIn &cp, const std::string &name,
}
}
template <typename T>
bool
optParamIn(CheckpointIn &cp, const std::string &name,
BitUnionType<T> &p, bool warn = true)
{
BitUnionBaseType<T> b;
if (optParamIn(cp, name, b, warn)) {
p = b;
return true;
} else {
return false;
}
}
template <class T>
void
arrayParamOut(CheckpointOut &os, const std::string &name,
@@ -628,31 +621,6 @@ arrayParamIn(CheckpointIn &cp, const std::string &name, std::set<T> &param)
}
}
template <class T>
static void
arrayParamOut(CheckpointOut &cp, const std::string &name,
const BitUnionType<T> *param, unsigned size)
{
// We copy the array into a vector. This is needed since we cannot
// directly typecast a pointer to BitUnionType<T> into a pointer
// of BitUnionBaseType<T> but we can typecast BitUnionType<T>
// to BitUnionBaseType<T> since we overloaded the typecast operator
std::vector<BitUnionBaseType<T>> bitunion_vec(param, param + size);
arrayParamOut(cp, name, bitunion_vec);
}
template <class T>
static void
arrayParamIn(CheckpointIn &cp, const std::string &name,
BitUnionType<T> *param, unsigned size)
{
std::vector<BitUnionBaseType<T>> bitunion_vec(size);
arrayParamIn(cp, name, bitunion_vec);
std::copy(bitunion_vec.begin(), bitunion_vec.end(), param);
}
void
debug_serialize(const std::string &cpt_dir);