From: Tom Musta <tommusta@gmail.com>
Date: Tue, 12 Aug 2014 13:45:10 +0000 (-0500)
Subject: target-ppc: Bug Fix: srad
X-Git-Tag: qemu-xen-4.6.0-rc1~212^2~19
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4bc02e230d1e0fd41d2a892d81dcad56e3b3702d;p=qemu-upstream-4.6-testing.git

target-ppc: Bug Fix: srad

Fix the check for carry in the srad helper to properly construct
the mask -- a "1ULL" must be used (instead of "1") in order to
get the desired result.

Example:

R3 8000000000000000
R4 F3511AD4A2CD4C38
srad 3,3,4

Should *not* set XER[CA] but does without this patch.

Signed-off-by: Tom Musta <tommusta@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/target-ppc/int_helper.c b/target-ppc/int_helper.c
index e83a25d05..e5b103b0e 100644
--- a/target-ppc/int_helper.c
+++ b/target-ppc/int_helper.c
@@ -248,7 +248,7 @@ target_ulong helper_srad(CPUPPCState *env, target_ulong value,
         if (likely((uint64_t)shift != 0)) {
             shift &= 0x3f;
             ret = (int64_t)value >> shift;
-            if (likely(ret >= 0 || (value & ((1 << shift) - 1)) == 0)) {
+            if (likely(ret >= 0 || (value & ((1ULL << shift) - 1)) == 0)) {
                 env->ca = 0;
             } else {
                 env->ca = 1;