From: Andreas Hansson <andreas.hansson@arm.com>
Date: Wed, 3 Sep 2014 11:42:19 +0000 (-0400)
Subject: arm: Fix ExtMachInst hash operator underlying type
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1046b8d6e5303fa4fede2d7c0712ef0719c82eb7;p=gem5.git

arm: Fix ExtMachInst hash operator underlying type

This patch fixes the hash operator used for ARM ExtMachInst, which
incorrectly was still using uint32_t. Instead of changing it to
uint64_t it is not using the underlying data type of the BitUnion.
---

diff --git a/src/arch/arm/types.hh b/src/arch/arm/types.hh
index 7b736492b..14cce8294 100644
--- a/src/arch/arm/types.hh
+++ b/src/arch/arm/types.hh
@@ -727,12 +727,17 @@ namespace ArmISA
 } // namespace ArmISA
 
 __hash_namespace_begin
-    template<>
-    struct hash<ArmISA::ExtMachInst> : public hash<uint32_t> {
-        size_t operator()(const ArmISA::ExtMachInst &emi) const {
-            return hash<uint32_t>::operator()((uint32_t)emi);
-        };
-    };
+
+template<>
+struct hash<ArmISA::ExtMachInst> :
+        public hash<ArmISA::ExtMachInst::__DataType> {
+
+    size_t operator()(const ArmISA::ExtMachInst &emi) const {
+        return hash<ArmISA::ExtMachInst::__DataType>::operator()(emi);
+    }
+
+};
+
 __hash_namespace_end
 
 #endif