From e3d8b931420200679e8119f1affe7ad156f8c726 Mon Sep 17 00:00:00 2001
From: Gabe Black <gabe.black@gmail.com>
Date: Tue, 20 Oct 2020 19:53:47 -0700
Subject: [PATCH] base,sim: Move BitUnion serialization support to bitunion.hh.

This keeps the BitUnion code centralized and out of the generic
serialization code.

Change-Id: I297638df4f8908096b7c439298fbaf03236f9011
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36283
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
---
 src/base/bitunion.hh          | 27 +++++++++++++++++++++++++++
 src/sim/serialize_handlers.hh | 27 ---------------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/base/bitunion.hh b/src/base/bitunion.hh
index bf183ae0e..aef6f6ec6 100644
--- a/src/base/bitunion.hh
+++ b/src/base/bitunion.hh
@@ -35,6 +35,7 @@
 #include <typeinfo>
 
 #include "base/bitfield.hh"
+#include "sim/serialize_handlers.hh"
 
 //      The following implements the BitUnion system of defining bitfields
 //on top of an underlying class. This is done through the pervasive use of
@@ -505,4 +506,30 @@ operator << (std::ostream &os, const BitUnionType<T> &bu)
             os, (BitUnionBaseType<T>)bu);
 }
 
+// Specialization for BitUnion types.
+template <class T>
+struct ParseParam<BitUnionType<T>>
+{
+    static bool
+    parse(const std::string &s, BitUnionType<T> &value)
+    {
+        // Zero initialize storage to avoid leaking an uninitialized value
+        BitUnionBaseType<T> storage = BitUnionBaseType<T>();
+        auto res = to_number(s, storage);
+        value = storage;
+        return res;
+    }
+};
+
+template <class T>
+struct ShowParam<BitUnionType<T>>
+{
+    static void
+    show(std::ostream &os, const BitUnionType<T> &value)
+    {
+        ShowParam<BitUnionBaseType<T>>::show(
+                os, static_cast<const BitUnionBaseType<T> &>(value));
+    }
+};
+
 #endif // __BASE_BITUNION_HH__
diff --git a/src/sim/serialize_handlers.hh b/src/sim/serialize_handlers.hh
index e09712140..8efd895ba 100644
--- a/src/sim/serialize_handlers.hh
+++ b/src/sim/serialize_handlers.hh
@@ -50,7 +50,6 @@
 #include <iterator>
 #include <type_traits>
 
-#include "base/bitunion.hh"
 #include "base/str.hh"
 
 /**
@@ -108,21 +107,6 @@ struct ParseParam<std::string>
     }
 };
 
-// Specialization for BitUnion types.
-template <class T>
-struct ParseParam<BitUnionType<T>>
-{
-    static bool
-    parse(const std::string &s, BitUnionType<T> &value)
-    {
-        // Zero initialize storage to avoid leaking an uninitialized value
-        BitUnionBaseType<T> storage = BitUnionBaseType<T>();
-        auto res = to_number(s, storage);
-        value = storage;
-        return res;
-    }
-};
-
 /*
  * A structure which should be specialized to contain a static method with the
  * signature:
@@ -168,17 +152,6 @@ struct ShowParam<bool>
     }
 };
 
-template <class T>
-struct ShowParam<BitUnionType<T>>
-{
-    static void
-    show(std::ostream &os, const BitUnionType<T> &value)
-    {
-        ShowParam<BitUnionBaseType<T>>::show(
-                os, static_cast<const BitUnionBaseType<T> &>(value));
-    }
-};
-
 /** @} */
 
 #endif // __SERIALIZE_HANDLERS_HH__
-- 
2.30.2