commit 417b22d7801ef57dd764db9040354da9517ef0d1
author florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Fri Jul 13 13:41:41 2012 +0000
committer florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Fri Jul 13 13:41:41 2012 +0000
tree 352b8745280b980e7ee058e99da81a7a49032464
parent 7fa635440e059941779d4c4ee0e1c97311d7a5c0

Use a proper type for sign_mask.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2427 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/guest_s390_toIR.c

diff --git a/priv/guest_s390_toIR.c b/priv/guest_s390_toIR.c
index 96d632e..50d948d 100644
--- a/priv/guest_s390_toIR.c
+++ b/priv/guest_s390_toIR.c
@@ -6847,7 +6847,7 @@
    IRTemp p2 = newTemp(Ity_I64);
    IRTemp op = newTemp(Ity_I64);
    IRTemp result = newTemp(Ity_I64);
-   Long sign_mask;
+   ULong sign_mask;
    IRTemp shift_amount = newTemp(Ity_I64);
 
    assign(p1, unop(Iop_32Uto64, get_gpr_w1(r1)));
@@ -6857,8 +6857,8 @@
    sign_mask = 1ULL << 63;
    assign(shift_amount, binop(Iop_And64, mkexpr(op2addr), mkU64(63)));
    assign(result, binop(Iop_Or64, binop(Iop_And64, binop(Iop_Shl64, mkexpr(op),
-          unop(Iop_64to8, mkexpr(shift_amount))), mkU64((ULong)(~sign_mask))),
-          binop(Iop_And64, mkexpr(op), mkU64((ULong)sign_mask))));
+          unop(Iop_64to8, mkexpr(shift_amount))), mkU64(~sign_mask)),
+          binop(Iop_And64, mkexpr(op), mkU64(sign_mask))));
    put_gpr_w1(r1, unop(Iop_64HIto32, mkexpr(result)));
    put_gpr_w1(r1 + 1, unop(Iop_64to32, mkexpr(result)));
    s390_cc_thunk_putZZ(S390_CC_OP_SHIFT_LEFT_64, op, shift_amount);