From: blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 6 Aug 2008 19:50:16 +0000 (+0000)
Subject: Fix faligndata (Vince Weaver)
X-Git-Tag: 0.10.0-0maemo1~1351
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=06057e6f6ce06b92d552a851a91f9d6ca250970c;p=qemu

Fix faligndata (Vince Weaver)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4992 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c
index f8f94ac..3cc4f50 100644
--- a/target-sparc/op_helper.c
+++ b/target-sparc/op_helper.c
@@ -234,7 +234,10 @@ void helper_faligndata(void)
     uint64_t tmp;
 
     tmp = (*((uint64_t *)&DT0)) << ((env->gsr & 7) * 8);
-    tmp |= (*((uint64_t *)&DT1)) >> (64 - (env->gsr & 7) * 8);
+    /* on many architectures a shift of 64 does nothing */
+    if ((env->gsr & 7) != 0) {
+        tmp |= (*((uint64_t *)&DT1)) >> (64 - (env->gsr & 7) * 8);
+    }
     *((uint64_t *)&DT0) = tmp;
 }