From: Mark Wielaard <mark@klomp.org>
Date: Wed, 27 Mar 2019 14:51:34 +0000 (+0100)
Subject: Use ULong instead of unsigned long in s390_irgen_EX_SS.
X-Git-Tag: VALGRIND_3_15_0~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ed9b61432848dc23890375e425cdf1c37582bf5;p=thirdparty%2Fvalgrind.git

Use ULong instead of unsigned long in s390_irgen_EX_SS.

ovl was defined as an unsigned long. This would cause warnings from gcc:

  guest_s390_toIR.c:195:30: warning: right shift count >= width of type
  [-Wshift-count-overflow]

when building on 32bit arches, or building a 32bit secondary arch.

Fix this by defining ovl as ULong which is always guaranteed 64bit.
---

diff --git a/VEX/priv/guest_s390_toIR.c b/VEX/priv/guest_s390_toIR.c
index b4b8e3d412..acff370832 100644
--- a/VEX/priv/guest_s390_toIR.c
+++ b/VEX/priv/guest_s390_toIR.c
@@ -12745,7 +12745,7 @@ s390_irgen_EX_SS(UChar r, IRTemp addr2,
    IRTemp cond;
    IRDirty *d;
    IRTemp torun;
-   unsigned long ovl;
+   ULong ovl;
 
    IRTemp start1 = newTemp(Ity_I64);
    IRTemp start2 = newTemp(Ity_I64);