Giacomo Travaglini has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/12924 )
Change subject: sim: Extend (UN)SERIALIZE_ARRAY to BitUnions
......................................................................
sim: Extend (UN)SERIALIZE_ARRAY to BitUnions
This patch is making it possible to use SERIALIZE_ARRAY and UNSERIALIZE
array for serializing arrays of BitUnions.
Change-Id: I682766b472585f70a89338f373fb94dff5db53c3
Signed-off-by: Giacomo Travaglini <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/12924
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/sim/serialize.hh
1 file changed, 27 insertions(+), 1 deletion(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh
index 024d29c..b3081ad 100644
--- a/src/sim/serialize.hh
+++ b/src/sim/serialize.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015 ARM Limited
+ * Copyright (c) 2015, 2018 ARM Limited
* All rights reserved
*
* The license below extends only to copyright in the software and shall
@@ -51,6 +51,7 @@
#define __SERIALIZE_HH__
+#include <algorithm>
#include <iostream>
#include <list>
#include <map>
@@ -144,6 +145,31 @@
void
objParamIn(CheckpointIn &cp, const std::string &name, SimObject * ¶m);
+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);
+}
+
//
// These macros are streamlined to use in serialize/unserialize
// functions. It's assumed that serialize() has a parameter 'os' for
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12924
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I682766b472585f70a89338f373fb94dff5db53c3
Gerrit-Change-Number: 12924
Gerrit-PatchSet: 4
Gerrit-Owner: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev